From af248457b02b9380c49dc09d8dd2085b9ebe7766 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 1 Jan 2020 22:49:04 +0300
Subject: [PATCH 0001/1142] Implement OverlayRulesetSelector

---
 .../TestSceneOverlayRulesetSelector.cs        | 68 +++++++++++++
 osu.Game/Overlays/OverlayRulesetSelector.cs   | 44 +++++++++
 osu.Game/Overlays/OverlayRulesetTabItem.cs    | 98 +++++++++++++++++++
 3 files changed, 210 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs
 create mode 100644 osu.Game/Overlays/OverlayRulesetSelector.cs
 create mode 100644 osu.Game/Overlays/OverlayRulesetTabItem.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs
new file mode 100644
index 0000000000..6c921b13b4
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs
@@ -0,0 +1,68 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using System;
+using System.Collections.Generic;
+using osu.Game.Rulesets.Catch;
+using osu.Game.Rulesets.Mania;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Taiko;
+using osu.Framework.Bindables;
+using osu.Game.Overlays;
+using osu.Game.Rulesets;
+using NUnit.Framework;
+using osu.Game.Graphics;
+using osu.Framework.Allocation;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneOverlayRulesetSelector : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(OverlayRulesetSelector),
+            typeof(OverlayRulesetTabItem),
+        };
+
+        private readonly OverlayRulesetSelector selector;
+        private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
+
+        public TestSceneOverlayRulesetSelector()
+        {
+            Add(selector = new OverlayRulesetSelector
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Current = ruleset,
+            });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            selector.AccentColour = colours.Lime;
+        }
+
+        [Test]
+        public void TestSelection()
+        {
+            var osuRuleset = new OsuRuleset().RulesetInfo;
+            var maniaRuleset = new ManiaRuleset().RulesetInfo;
+            var taikoRuleset = new TaikoRuleset().RulesetInfo;
+            var catchRuleset = new CatchRuleset().RulesetInfo;
+
+            AddStep("Select osu!", () => ruleset.Value = osuRuleset);
+            AddAssert("Check osu! selected", () => selector.Current.Value == osuRuleset);
+
+            AddStep("Select mania", () => ruleset.Value = maniaRuleset);
+            AddAssert("Check mania selected", () => selector.Current.Value == maniaRuleset);
+
+            AddStep("Select taiko", () => ruleset.Value = taikoRuleset);
+            AddAssert("Check taiko selected", () => selector.Current.Value == taikoRuleset);
+
+            AddStep("Select catch", () => ruleset.Value = catchRuleset);
+            AddAssert("Check catch selected", () => selector.Current.Value == catchRuleset);
+        }
+    }
+}
diff --git a/osu.Game/Overlays/OverlayRulesetSelector.cs b/osu.Game/Overlays/OverlayRulesetSelector.cs
new file mode 100644
index 0000000000..1dcfc97562
--- /dev/null
+++ b/osu.Game/Overlays/OverlayRulesetSelector.cs
@@ -0,0 +1,44 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics;
+using osu.Game.Rulesets;
+using osuTK;
+using osuTK.Graphics;
+using System.Linq;
+
+namespace osu.Game.Overlays
+{
+    public class OverlayRulesetSelector : RulesetSelector
+    {
+        private Color4 accentColour;
+
+        public Color4 AccentColour
+        {
+            get => accentColour;
+            set
+            {
+                accentColour = value;
+                foreach (var i in TabContainer.Children.OfType<IHasAccentColour>())
+                    i.AccentColour = value;
+            }
+        }
+
+        public OverlayRulesetSelector()
+        {
+            AutoSizeAxes = Axes.Both;
+        }
+
+        protected override TabItem<RulesetInfo> CreateTabItem(RulesetInfo value) => new OverlayRulesetTabItem(value);
+
+        protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
+        {
+            AutoSizeAxes = Axes.Both,
+            Direction = FillDirection.Horizontal,
+            Spacing = new Vector2(25, 0),
+        };
+    }
+}
diff --git a/osu.Game/Overlays/OverlayRulesetTabItem.cs b/osu.Game/Overlays/OverlayRulesetTabItem.cs
new file mode 100644
index 0000000000..9d6d28a81f
--- /dev/null
+++ b/osu.Game/Overlays/OverlayRulesetTabItem.cs
@@ -0,0 +1,98 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets;
+using osuTK.Graphics;
+using osuTK;
+
+namespace osu.Game.Overlays
+{
+    public class OverlayRulesetTabItem : TabItem<RulesetInfo>, IHasAccentColour
+    {
+        protected readonly OsuSpriteText Text;
+        private readonly FillFlowContainer content;
+
+        public override bool PropagatePositionalInputSubTree => Enabled.Value && !Active.Value && base.PropagatePositionalInputSubTree;
+
+        private Color4 accentColour;
+
+        public Color4 AccentColour
+        {
+            get => accentColour;
+            set
+            {
+                if (accentColour == value)
+                    return;
+
+                accentColour = value;
+
+                UpdateState();
+            }
+        }
+
+        protected override Container<Drawable> Content => content;
+
+        public OverlayRulesetTabItem(RulesetInfo value)
+            : base(value)
+        {
+            AutoSizeAxes = Axes.Both;
+
+            AddRangeInternal(new Drawable[]
+            {
+                content = new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Horizontal,
+                    Spacing = new Vector2(3, 0),
+                    Child = Text = new OsuSpriteText
+                    {
+                        Origin = Anchor.Centre,
+                        Anchor = Anchor.Centre,
+                        Text = value.Name,
+                    }
+                },
+                new HoverClickSounds()
+            });
+
+            Enabled.Value = true;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Enabled.BindValueChanged(_ => UpdateState(), true);
+        }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            base.OnHover(e);
+            UpdateState();
+            return true;
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            base.OnHoverLost(e);
+            UpdateState();
+        }
+
+        protected override void OnActivated() => UpdateState();
+
+        protected override void OnDeactivated() => UpdateState();
+
+        protected virtual void UpdateState()
+        {
+            Text.Font = Text.Font.With(weight: Active.Value ? FontWeight.Bold : FontWeight.Medium);
+            Text.FadeColour(GetColour(), 120, Easing.OutQuint);
+        }
+
+        protected Color4 GetColour() => IsHovered || Active.Value ? Color4.White : Enabled.Value ? AccentColour : Color4.DimGray;
+    }
+}

From b016238c16f8ac0d8e2c6e97d1e2559c6c58930e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 1 Jan 2020 22:55:28 +0300
Subject: [PATCH 0002/1142] Make ProfileRulesetSelector inherit from
 OverlayRulesetSelector

---
 .../Online/TestSceneProfileRulesetSelector.cs |  2 +-
 .../Components/ProfileRulesetSelector.cs      | 33 +------
 .../Components/ProfileRulesetTabItem.cs       | 97 +++----------------
 3 files changed, 20 insertions(+), 112 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneProfileRulesetSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneProfileRulesetSelector.cs
index 1f5ba67e03..a36b6880d2 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneProfileRulesetSelector.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneProfileRulesetSelector.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Tests.Visual.Online
         public TestSceneProfileRulesetSelector()
         {
             ProfileRulesetSelector selector;
-            Bindable<User> user = new Bindable<User>();
+            var user = new Bindable<User>();
 
             Child = selector = new ProfileRulesetSelector
             {
diff --git a/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetSelector.cs b/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetSelector.cs
index 2c9a3dd5f9..e63102f989 100644
--- a/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetSelector.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetSelector.cs
@@ -3,37 +3,21 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics;
 using osu.Game.Rulesets;
 using osu.Game.Users;
-using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Profile.Header.Components
 {
-    public class ProfileRulesetSelector : RulesetSelector
+    public class ProfileRulesetSelector : OverlayRulesetSelector
     {
-        private Color4 accentColour = Color4.White;
-
         public readonly Bindable<User> User = new Bindable<User>();
 
-        public ProfileRulesetSelector()
-        {
-            TabContainer.Masking = false;
-            TabContainer.Spacing = new Vector2(10, 0);
-            AutoSizeAxes = Axes.Both;
-        }
-
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            accentColour = colours.Seafoam;
-
-            foreach (TabItem<RulesetInfo> tabItem in TabContainer)
-                ((ProfileRulesetTabItem)tabItem).AccentColour = accentColour;
+            AccentColour = colours.Seafoam;
         }
 
         protected override void LoadComplete()
@@ -45,19 +29,10 @@ namespace osu.Game.Overlays.Profile.Header.Components
 
         public void SetDefaultRuleset(RulesetInfo ruleset)
         {
-            foreach (TabItem<RulesetInfo> tabItem in TabContainer)
+            foreach (var tabItem in TabContainer)
                 ((ProfileRulesetTabItem)tabItem).IsDefault = ((ProfileRulesetTabItem)tabItem).Value.ID == ruleset.ID;
         }
 
-        protected override TabItem<RulesetInfo> CreateTabItem(RulesetInfo value) => new ProfileRulesetTabItem(value)
-        {
-            AccentColour = accentColour
-        };
-
-        protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
-        {
-            Direction = FillDirection.Horizontal,
-            AutoSizeAxes = Axes.Both,
-        };
+        protected override TabItem<RulesetInfo> CreateTabItem(RulesetInfo value) => new ProfileRulesetTabItem(value);
     }
 }
diff --git a/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetTabItem.cs b/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetTabItem.cs
index b5170ea3a2..adf324b259 100644
--- a/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetTabItem.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetTabItem.cs
@@ -2,38 +2,21 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Input.Events;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Profile.Header.Components
 {
-    public class ProfileRulesetTabItem : TabItem<RulesetInfo>, IHasAccentColour
+    public class ProfileRulesetTabItem : OverlayRulesetTabItem
     {
-        private readonly OsuSpriteText text;
         private readonly SpriteIcon icon;
 
-        private Color4 accentColour;
-
-        public Color4 AccentColour
+        public new Color4 AccentColour
         {
-            get => accentColour;
-            set
-            {
-                if (accentColour == value)
-                    return;
-
-                accentColour = value;
-
-                updateState();
-            }
+            get => base.AccentColour;
+            set => base.AccentColour = icon.Colour = value;
         }
 
         private bool isDefault;
@@ -55,71 +38,21 @@ namespace osu.Game.Overlays.Profile.Header.Components
         public ProfileRulesetTabItem(RulesetInfo value)
             : base(value)
         {
-            AutoSizeAxes = Axes.Both;
-
-            Children = new Drawable[]
+            Add(icon = new SpriteIcon
             {
-                new FillFlowContainer
-                {
-                    AutoSizeAxes = Axes.Both,
-                    Origin = Anchor.BottomLeft,
-                    Anchor = Anchor.BottomLeft,
-                    Direction = FillDirection.Horizontal,
-                    Spacing = new Vector2(3, 0),
-                    Children = new Drawable[]
-                    {
-                        text = new OsuSpriteText
-                        {
-                            Origin = Anchor.Centre,
-                            Anchor = Anchor.Centre,
-                            Text = value.Name,
-                        },
-                        icon = new SpriteIcon
-                        {
-                            Origin = Anchor.Centre,
-                            Anchor = Anchor.Centre,
-                            Alpha = 0,
-                            AlwaysPresent = true,
-                            Icon = FontAwesome.Solid.Star,
-                            Size = new Vector2(12),
-                        },
-                    }
-                },
-                new HoverClickSounds()
-            };
+                Origin = Anchor.Centre,
+                Anchor = Anchor.Centre,
+                Alpha = 0,
+                AlwaysPresent = true,
+                Icon = FontAwesome.Solid.Star,
+                Size = new Vector2(12),
+            });
         }
 
-        protected override bool OnHover(HoverEvent e)
+        protected override void UpdateState()
         {
-            base.OnHover(e);
-            updateState();
-            return true;
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            base.OnHoverLost(e);
-            updateState();
-        }
-
-        protected override void OnActivated() => updateState();
-
-        protected override void OnDeactivated() => updateState();
-
-        private void updateState()
-        {
-            text.Font = text.Font.With(weight: Active.Value ? FontWeight.Bold : FontWeight.Medium);
-
-            if (IsHovered || Active.Value)
-            {
-                text.FadeColour(Color4.White, 120, Easing.InQuad);
-                icon.FadeColour(Color4.White, 120, Easing.InQuad);
-            }
-            else
-            {
-                text.FadeColour(AccentColour, 120, Easing.InQuad);
-                icon.FadeColour(AccentColour, 120, Easing.InQuad);
-            }
+            base.UpdateState();
+            icon.FadeColour(GetColour(), 120, Easing.OutQuint);
         }
     }
 }

From 2d6a07e970420893feea193e778f1ff3cc28e4f9 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 1 Jan 2020 23:14:26 +0300
Subject: [PATCH 0003/1142] Fix OverlayRulesetSelector don't have default
 colour

---
 .../TestSceneOverlayRulesetSelector.cs        | 35 +++++++++----------
 osu.Game/Overlays/OverlayRulesetSelector.cs   |  8 +++++
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs
index 6c921b13b4..93aa414c94 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs
@@ -25,6 +25,9 @@ namespace osu.Game.Tests.Visual.UserInterface
             typeof(OverlayRulesetTabItem),
         };
 
+        [Resolved]
+        private OsuColour colours { get; set; }
+
         private readonly OverlayRulesetSelector selector;
         private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
 
@@ -38,31 +41,27 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            selector.AccentColour = colours.Lime;
-        }
-
         [Test]
         public void TestSelection()
         {
-            var osuRuleset = new OsuRuleset().RulesetInfo;
-            var maniaRuleset = new ManiaRuleset().RulesetInfo;
-            var taikoRuleset = new TaikoRuleset().RulesetInfo;
-            var catchRuleset = new CatchRuleset().RulesetInfo;
+            AddStep("Select osu!", () => ruleset.Value = new OsuRuleset().RulesetInfo);
+            AddAssert("Check osu! selected", () => selector.Current.Value.Equals(new OsuRuleset().RulesetInfo));
 
-            AddStep("Select osu!", () => ruleset.Value = osuRuleset);
-            AddAssert("Check osu! selected", () => selector.Current.Value == osuRuleset);
+            AddStep("Select mania", () => ruleset.Value = new ManiaRuleset().RulesetInfo);
+            AddAssert("Check mania selected", () => selector.Current.Value.Equals(new ManiaRuleset().RulesetInfo));
 
-            AddStep("Select mania", () => ruleset.Value = maniaRuleset);
-            AddAssert("Check mania selected", () => selector.Current.Value == maniaRuleset);
+            AddStep("Select taiko", () => ruleset.Value = new TaikoRuleset().RulesetInfo);
+            AddAssert("Check taiko selected", () => selector.Current.Value.Equals(new TaikoRuleset().RulesetInfo));
 
-            AddStep("Select taiko", () => ruleset.Value = taikoRuleset);
-            AddAssert("Check taiko selected", () => selector.Current.Value == taikoRuleset);
+            AddStep("Select catch", () => ruleset.Value = new CatchRuleset().RulesetInfo);
+            AddAssert("Check catch selected", () => selector.Current.Value.Equals(new CatchRuleset().RulesetInfo));
+        }
 
-            AddStep("Select catch", () => ruleset.Value = catchRuleset);
-            AddAssert("Check catch selected", () => selector.Current.Value == catchRuleset);
+        [Test]
+        public void TestColours()
+        {
+            AddStep("Set colour to blue", () => selector.AccentColour = colours.Blue);
+            AddAssert("Check colour is blue", () => selector.AccentColour == colours.Blue);
         }
     }
 }
diff --git a/osu.Game/Overlays/OverlayRulesetSelector.cs b/osu.Game/Overlays/OverlayRulesetSelector.cs
index 1dcfc97562..da49335250 100644
--- a/osu.Game/Overlays/OverlayRulesetSelector.cs
+++ b/osu.Game/Overlays/OverlayRulesetSelector.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
@@ -32,6 +33,13 @@ namespace osu.Game.Overlays
             AutoSizeAxes = Axes.Both;
         }
 
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            if (accentColour == default)
+                AccentColour = colours.Pink;
+        }
+
         protected override TabItem<RulesetInfo> CreateTabItem(RulesetInfo value) => new OverlayRulesetTabItem(value);
 
         protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer

From 904b068a15c5bb55629d70c8bb5ca035a1d65649 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 2 Jan 2020 13:18:18 +0300
Subject: [PATCH 0004/1142] Simplify colour setting for additional elements in
 OverlayRulesetTabItem

---
 osu.Game/Overlays/OverlayRulesetTabItem.cs    | 23 +++++++++++--------
 .../Components/ProfileRulesetTabItem.cs       | 13 +----------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Overlays/OverlayRulesetTabItem.cs b/osu.Game/Overlays/OverlayRulesetTabItem.cs
index 9d6d28a81f..e1cc1de8de 100644
--- a/osu.Game/Overlays/OverlayRulesetTabItem.cs
+++ b/osu.Game/Overlays/OverlayRulesetTabItem.cs
@@ -11,6 +11,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 using osuTK.Graphics;
 using osuTK;
+using System;
 
 namespace osu.Game.Overlays
 {
@@ -33,10 +34,12 @@ namespace osu.Game.Overlays
 
                 accentColour = value;
 
-                UpdateState();
+                updateState();
             }
         }
 
+        protected Action<Color4> OnStateUpdated;
+
         protected override Container<Drawable> Content => content;
 
         public OverlayRulesetTabItem(RulesetInfo value)
@@ -67,32 +70,32 @@ namespace osu.Game.Overlays
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            Enabled.BindValueChanged(_ => UpdateState(), true);
+            Enabled.BindValueChanged(_ => updateState(), true);
         }
 
         protected override bool OnHover(HoverEvent e)
         {
             base.OnHover(e);
-            UpdateState();
+            updateState();
             return true;
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
             base.OnHoverLost(e);
-            UpdateState();
+            updateState();
         }
 
-        protected override void OnActivated() => UpdateState();
+        protected override void OnActivated() => updateState();
 
-        protected override void OnDeactivated() => UpdateState();
+        protected override void OnDeactivated() => updateState();
 
-        protected virtual void UpdateState()
+        private void updateState()
         {
+            var updatedColour = IsHovered || Active.Value ? Color4.White : Enabled.Value ? AccentColour : Color4.DimGray;
             Text.Font = Text.Font.With(weight: Active.Value ? FontWeight.Bold : FontWeight.Medium);
-            Text.FadeColour(GetColour(), 120, Easing.OutQuint);
+            Text.FadeColour(updatedColour, 120, Easing.OutQuint);
+            OnStateUpdated?.Invoke(updatedColour);
         }
-
-        protected Color4 GetColour() => IsHovered || Active.Value ? Color4.White : Enabled.Value ? AccentColour : Color4.DimGray;
     }
 }
diff --git a/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetTabItem.cs b/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetTabItem.cs
index adf324b259..d416e98b31 100644
--- a/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetTabItem.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetTabItem.cs
@@ -5,7 +5,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Profile.Header.Components
 {
@@ -13,12 +12,6 @@ namespace osu.Game.Overlays.Profile.Header.Components
     {
         private readonly SpriteIcon icon;
 
-        public new Color4 AccentColour
-        {
-            get => base.AccentColour;
-            set => base.AccentColour = icon.Colour = value;
-        }
-
         private bool isDefault;
 
         public bool IsDefault
@@ -47,12 +40,8 @@ namespace osu.Game.Overlays.Profile.Header.Components
                 Icon = FontAwesome.Solid.Star,
                 Size = new Vector2(12),
             });
-        }
 
-        protected override void UpdateState()
-        {
-            base.UpdateState();
-            icon.FadeColour(GetColour(), 120, Easing.OutQuint);
+            OnStateUpdated += colour => icon.FadeColour(colour, 120, Easing.OutQuint);
         }
     }
 }

From 79a6655e1f6d64cb4246fc197560e607cccbbe87 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 3 Jan 2020 21:02:56 +0300
Subject: [PATCH 0005/1142] Use bindables for colour updates

---
 osu.Game/Overlays/OverlayRulesetTabItem.cs    | 31 +++++++++----------
 .../Components/ProfileRulesetTabItem.cs       | 12 +++++--
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Overlays/OverlayRulesetTabItem.cs b/osu.Game/Overlays/OverlayRulesetTabItem.cs
index e1cc1de8de..bf24895306 100644
--- a/osu.Game/Overlays/OverlayRulesetTabItem.cs
+++ b/osu.Game/Overlays/OverlayRulesetTabItem.cs
@@ -11,7 +11,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 using osuTK.Graphics;
 using osuTK;
-using System;
+using osu.Framework.Bindables;
 
 namespace osu.Game.Overlays
 {
@@ -22,24 +22,15 @@ namespace osu.Game.Overlays
 
         public override bool PropagatePositionalInputSubTree => Enabled.Value && !Active.Value && base.PropagatePositionalInputSubTree;
 
-        private Color4 accentColour;
+        private readonly Bindable<Color4> accentColour = new Bindable<Color4>();
+        private readonly Bindable<Color4> currentColour = new Bindable<Color4>();
 
         public Color4 AccentColour
         {
-            get => accentColour;
-            set
-            {
-                if (accentColour == value)
-                    return;
-
-                accentColour = value;
-
-                updateState();
-            }
+            get => accentColour.Value;
+            set => accentColour.Value = value;
         }
 
-        protected Action<Color4> OnStateUpdated;
-
         protected override Container<Drawable> Content => content;
 
         public OverlayRulesetTabItem(RulesetInfo value)
@@ -70,6 +61,9 @@ namespace osu.Game.Overlays
         protected override void LoadComplete()
         {
             base.LoadComplete();
+
+            currentColour.BindValueChanged(OnCurrentColourChanged);
+            accentColour.BindValueChanged(_ => updateState());
             Enabled.BindValueChanged(_ => updateState(), true);
         }
 
@@ -92,10 +86,13 @@ namespace osu.Game.Overlays
 
         private void updateState()
         {
-            var updatedColour = IsHovered || Active.Value ? Color4.White : Enabled.Value ? AccentColour : Color4.DimGray;
             Text.Font = Text.Font.With(weight: Active.Value ? FontWeight.Bold : FontWeight.Medium);
-            Text.FadeColour(updatedColour, 120, Easing.OutQuint);
-            OnStateUpdated?.Invoke(updatedColour);
+
+            currentColour.Value = IsHovered || Active.Value
+                ? Color4.White
+                : Enabled.Value ? AccentColour : Color4.DimGray;
         }
+
+        protected virtual void OnCurrentColourChanged(ValueChangedEvent<Color4> colour) => Text.FadeColour(colour.NewValue, 120, Easing.OutQuint);
     }
 }
diff --git a/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetTabItem.cs b/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetTabItem.cs
index d416e98b31..038509d371 100644
--- a/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetTabItem.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetTabItem.cs
@@ -1,17 +1,17 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Profile.Header.Components
 {
     public class ProfileRulesetTabItem : OverlayRulesetTabItem
     {
-        private readonly SpriteIcon icon;
-
         private bool isDefault;
 
         public bool IsDefault
@@ -28,6 +28,8 @@ namespace osu.Game.Overlays.Profile.Header.Components
             }
         }
 
+        private readonly SpriteIcon icon;
+
         public ProfileRulesetTabItem(RulesetInfo value)
             : base(value)
         {
@@ -40,8 +42,12 @@ namespace osu.Game.Overlays.Profile.Header.Components
                 Icon = FontAwesome.Solid.Star,
                 Size = new Vector2(12),
             });
+        }
 
-            OnStateUpdated += colour => icon.FadeColour(colour, 120, Easing.OutQuint);
+        protected override void OnCurrentColourChanged(ValueChangedEvent<Color4> colour)
+        {
+            base.OnCurrentColourChanged(colour);
+            icon.FadeColour(colour.NewValue, 120, Easing.OutQuint);
         }
     }
 }

From bd5140c3fa72b79d8f03b6e1eda6ccbd919e12f8 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 3 Jan 2020 21:20:31 +0300
Subject: [PATCH 0006/1142] Add missing line breaks

---
 osu.Game/Overlays/OverlayRulesetTabItem.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/OverlayRulesetTabItem.cs b/osu.Game/Overlays/OverlayRulesetTabItem.cs
index bf24895306..91cf2d6b96 100644
--- a/osu.Game/Overlays/OverlayRulesetTabItem.cs
+++ b/osu.Game/Overlays/OverlayRulesetTabItem.cs
@@ -90,7 +90,9 @@ namespace osu.Game.Overlays
 
             currentColour.Value = IsHovered || Active.Value
                 ? Color4.White
-                : Enabled.Value ? AccentColour : Color4.DimGray;
+                : Enabled.Value
+                    ? AccentColour
+                    : Color4.DimGray;
         }
 
         protected virtual void OnCurrentColourChanged(ValueChangedEvent<Color4> colour) => Text.FadeColour(colour.NewValue, 120, Easing.OutQuint);

From f65f030e79ff6756fe11156311e1bceaf95720f0 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 10 Jan 2020 15:48:54 +0300
Subject: [PATCH 0007/1142] Implement GetSpotlightsRequest

---
 .../API/Requests/GetSpotlightsRequest.cs      | 13 +++++++
 .../API/Requests/Responses/APISpotlight.cs    | 34 +++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 osu.Game/Online/API/Requests/GetSpotlightsRequest.cs
 create mode 100644 osu.Game/Online/API/Requests/Responses/APISpotlight.cs

diff --git a/osu.Game/Online/API/Requests/GetSpotlightsRequest.cs b/osu.Game/Online/API/Requests/GetSpotlightsRequest.cs
new file mode 100644
index 0000000000..7a6a988c09
--- /dev/null
+++ b/osu.Game/Online/API/Requests/GetSpotlightsRequest.cs
@@ -0,0 +1,13 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using osu.Game.Online.API.Requests.Responses;
+
+namespace osu.Game.Online.API.Requests
+{
+    public class GetSpotlightsRequest : APIRequest<List<APISpotlight>>
+    {
+        protected override string Target => "spotlights";
+    }
+}
diff --git a/osu.Game/Online/API/Requests/Responses/APISpotlight.cs b/osu.Game/Online/API/Requests/Responses/APISpotlight.cs
new file mode 100644
index 0000000000..210ef04dac
--- /dev/null
+++ b/osu.Game/Online/API/Requests/Responses/APISpotlight.cs
@@ -0,0 +1,34 @@
+// 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 Newtonsoft.Json;
+
+namespace osu.Game.Online.API.Requests.Responses
+{
+    public class APISpotlight
+    {
+        [JsonProperty("id")]
+        public int Id;
+
+        [JsonProperty("name")]
+        public string Name;
+
+        [JsonProperty("type")]
+        public string Type;
+
+        [JsonProperty("mode_specific")]
+        public bool ModeSpecific;
+
+        [JsonProperty(@"start_date")]
+        public DateTimeOffset StartDate;
+
+        [JsonProperty(@"end_date")]
+        public DateTimeOffset EndDate;
+
+        [JsonProperty(@"participant_count")]
+        public int? ParticipiantCount;
+
+        public override string ToString() => Name;
+    }
+}

From 08fb68ddfeddb891b2ddc9972544a0bf6f2bff68 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 10 Jan 2020 16:28:52 +0300
Subject: [PATCH 0008/1142] Fix incorrect return type for spotlight request

---
 osu.Game/Online/API/Requests/GetSpotlightsRequest.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/Requests/GetSpotlightsRequest.cs b/osu.Game/Online/API/Requests/GetSpotlightsRequest.cs
index 7a6a988c09..d5b03e52e2 100644
--- a/osu.Game/Online/API/Requests/GetSpotlightsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetSpotlightsRequest.cs
@@ -2,12 +2,19 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using Newtonsoft.Json;
 using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Online.API.Requests
 {
-    public class GetSpotlightsRequest : APIRequest<List<APISpotlight>>
+    public class GetSpotlightsRequest : APIRequest<SpotlightsArray>
     {
         protected override string Target => "spotlights";
     }
+
+    public class SpotlightsArray
+    {
+        [JsonProperty("spotlights")]
+        public List<APISpotlight> Spotlights;
+    }
 }

From d48b161662ec0058d8f1aed526bb5fa1d9d1af50 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 10 Jan 2020 16:33:00 +0300
Subject: [PATCH 0009/1142] Implement basic SpotlightSelector component

---
 .../TestSceneRankingsSpotlightSelector.cs     | 28 ++++++++
 .../Overlays/Rankings/SpotlightSelector.cs    | 67 +++++++++++++++++++
 2 files changed, 95 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
 create mode 100644 osu.Game/Overlays/Rankings/SpotlightSelector.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
new file mode 100644
index 0000000000..9320213844
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
@@ -0,0 +1,28 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using osu.Game.Overlays.Rankings;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneRankingsSpotlightSelector : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(SpotlightSelector),
+        };
+
+        protected override bool UseOnlineAPI => true;
+
+        public TestSceneRankingsSpotlightSelector()
+        {
+            SpotlightSelector selector;
+
+            Add(selector = new SpotlightSelector());
+
+            AddStep("Fetch spotlights", selector.FetchSpotlights);
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Rankings/SpotlightSelector.cs b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
new file mode 100644
index 0000000000..95bcc10631
--- /dev/null
+++ b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
@@ -0,0 +1,67 @@
+// 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.UserInterface;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Online.API.Requests.Responses;
+
+namespace osu.Game.Overlays.Rankings
+{
+    public class SpotlightSelector : Container
+    {
+        private readonly Box background;
+        private readonly OsuDropdown<APISpotlight> dropdown;
+        private readonly DimmedLoadingLayer loading;
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        public SpotlightSelector()
+        {
+            RelativeSizeAxes = Axes.X;
+            Height = 200;
+            Children = new Drawable[]
+            {
+                background = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                },
+                dropdown = new OsuDropdown<APISpotlight>
+                {
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
+                    RelativeSizeAxes = Axes.X,
+                    Width = 0.8f,
+                    Margin = new MarginPadding { Top = 10 }
+                },
+                loading = new DimmedLoadingLayer(),
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            background.Colour = colours.GreySeafoam;
+            dropdown.AccentColour = colours.GreySeafoamDarker;
+        }
+
+        public void FetchSpotlights()
+        {
+            loading.Show();
+
+            var request = new GetSpotlightsRequest();
+            request.Success += response =>
+            {
+                dropdown.Items = response.Spotlights;
+                loading.Hide();
+            };
+            api.Queue(request);
+        }
+    }
+}

From 474d7e92d92ef7a20dc07ee4a75cb2e62b5bd2e2 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 10 Jan 2020 16:41:17 +0300
Subject: [PATCH 0010/1142] Fix incorrect dropdown menu height

---
 osu.Game/Overlays/Rankings/SpotlightSelector.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Rankings/SpotlightSelector.cs b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
index 95bcc10631..482db10796 100644
--- a/osu.Game/Overlays/Rankings/SpotlightSelector.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Rankings
     public class SpotlightSelector : Container
     {
         private readonly Box background;
-        private readonly OsuDropdown<APISpotlight> dropdown;
+        private readonly SpotlightsDropdown dropdown;
         private readonly DimmedLoadingLayer loading;
 
         [Resolved]
@@ -32,7 +32,7 @@ namespace osu.Game.Overlays.Rankings
                 {
                     RelativeSizeAxes = Axes.Both,
                 },
-                dropdown = new OsuDropdown<APISpotlight>
+                dropdown = new SpotlightsDropdown
                 {
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
@@ -63,5 +63,10 @@ namespace osu.Game.Overlays.Rankings
             };
             api.Queue(request);
         }
+
+        private class SpotlightsDropdown : OsuDropdown<APISpotlight>
+        {
+            protected override DropdownMenu CreateMenu() => base.CreateMenu().With(menu => menu.MaxHeight = 400);
+        }
     }
 }

From 2e627f4b7c4f52d827941399cf67fce87087ebc3 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 10 Jan 2020 17:30:51 +0300
Subject: [PATCH 0011/1142] Implement InfoColumn component

---
 .../Overlays/Rankings/SpotlightSelector.cs    | 111 ++++++++++++++++--
 1 file changed, 102 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Rankings/SpotlightSelector.cs b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
index 482db10796..66c5f37917 100644
--- a/osu.Game/Overlays/Rankings/SpotlightSelector.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
@@ -2,14 +2,18 @@
 // 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 osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
+using osuTK;
+using System;
 
 namespace osu.Game.Overlays.Rankings
 {
@@ -22,23 +26,49 @@ namespace osu.Game.Overlays.Rankings
         [Resolved]
         private IAPIProvider api { get; set; }
 
+        public readonly Bindable<APISpotlight> SelectedSpotlight = new Bindable<APISpotlight>();
+
+        private readonly InfoCoulmn startDateColumn;
+        private readonly InfoCoulmn endDateColumn;
+
         public SpotlightSelector()
         {
             RelativeSizeAxes = Axes.X;
-            Height = 200;
+            Height = 100;
             Children = new Drawable[]
             {
                 background = new Box
                 {
                     RelativeSizeAxes = Axes.Both,
                 },
-                dropdown = new SpotlightsDropdown
+                new Container
                 {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
-                    RelativeSizeAxes = Axes.X,
-                    Width = 0.8f,
-                    Margin = new MarginPadding { Top = 10 }
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding { Horizontal = UserProfileOverlay.CONTENT_X_MARGIN, Vertical = 10 },
+                    Children = new Drawable[]
+                    {
+                        dropdown = new SpotlightsDropdown
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            RelativeSizeAxes = Axes.X,
+                            Current = SelectedSpotlight,
+                            Depth = -float.MaxValue
+                        },
+                        new FillFlowContainer
+                        {
+                            Anchor = Anchor.BottomRight,
+                            Origin = Anchor.BottomRight,
+                            AutoSizeAxes = Axes.Both,
+                            Direction = FillDirection.Horizontal,
+                            Spacing = new Vector2(15, 0),
+                            Children = new Drawable[]
+                            {
+                                startDateColumn = new InfoCoulmn(@"Start Date"),
+                                endDateColumn = new InfoCoulmn(@"End Date"),
+                            }
+                        }
+                    }
                 },
                 loading = new DimmedLoadingLayer(),
             };
@@ -48,7 +78,12 @@ namespace osu.Game.Overlays.Rankings
         private void load(OsuColour colours)
         {
             background.Colour = colours.GreySeafoam;
-            dropdown.AccentColour = colours.GreySeafoamDarker;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            SelectedSpotlight.BindValueChanged(onSelectionChanged);
         }
 
         public void FetchSpotlights()
@@ -64,9 +99,67 @@ namespace osu.Game.Overlays.Rankings
             api.Queue(request);
         }
 
+        private void onSelectionChanged(ValueChangedEvent<APISpotlight> spotlight)
+        {
+            startDateColumn.Value = dateToString(spotlight.NewValue.StartDate);
+            endDateColumn.Value = dateToString(spotlight.NewValue.EndDate);
+        }
+
+        private string dateToString(DateTimeOffset date) => $"{date.Year}-{date.Month:D2}-{date.Day:D2}";
+
+        private class InfoCoulmn : FillFlowContainer
+        {
+            public string Value
+            {
+                set => valueText.Text = value;
+            }
+
+            private readonly OsuSpriteText valueText;
+
+            public InfoCoulmn(string name)
+            {
+                AutoSizeAxes = Axes.Both;
+                Direction = FillDirection.Vertical;
+                Children = new Drawable[]
+                {
+                    new OsuSpriteText
+                    {
+                        Text = name,
+                        Font = OsuFont.GetFont(size: 10),
+                    },
+                    new Container
+                    {
+                        AutoSizeAxes = Axes.X,
+                        Height = 20,
+                        Child = valueText = new OsuSpriteText
+                        {
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft,
+                            Font = OsuFont.GetFont(size: 18, weight: FontWeight.Light),
+                        }
+                    }
+                };
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                valueText.Colour = colours.GreySeafoamLighter;
+            }
+        }
+
         private class SpotlightsDropdown : OsuDropdown<APISpotlight>
         {
-            protected override DropdownMenu CreateMenu() => base.CreateMenu().With(menu => menu.MaxHeight = 400);
+            private DropdownMenu menu;
+
+            protected override DropdownMenu CreateMenu() => menu = base.CreateMenu().With(m => m.MaxHeight = 400);
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                menu.BackgroundColour = colours.Gray1;
+                AccentColour = colours.GreySeafoamDarker;
+            }
         }
     }
 }

From 9260ea91955fdcf56e4edbbb3770e39ac0eb21a0 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 10 Jan 2020 20:46:35 +0300
Subject: [PATCH 0012/1142] Apply suggestions

---
 .../Online/API/Requests/GetSpotlightsRequest.cs    |  4 ++--
 .../Online/API/Requests/Responses/APISpotlight.cs  |  2 +-
 osu.Game/Overlays/Rankings/SpotlightSelector.cs    | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Online/API/Requests/GetSpotlightsRequest.cs b/osu.Game/Online/API/Requests/GetSpotlightsRequest.cs
index d5b03e52e2..6fafb3933c 100644
--- a/osu.Game/Online/API/Requests/GetSpotlightsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetSpotlightsRequest.cs
@@ -7,12 +7,12 @@ using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Online.API.Requests
 {
-    public class GetSpotlightsRequest : APIRequest<SpotlightsArray>
+    public class GetSpotlightsRequest : APIRequest<SpotlightsCollection>
     {
         protected override string Target => "spotlights";
     }
 
-    public class SpotlightsArray
+    public class SpotlightsCollection
     {
         [JsonProperty("spotlights")]
         public List<APISpotlight> Spotlights;
diff --git a/osu.Game/Online/API/Requests/Responses/APISpotlight.cs b/osu.Game/Online/API/Requests/Responses/APISpotlight.cs
index 210ef04dac..63c47e7812 100644
--- a/osu.Game/Online/API/Requests/Responses/APISpotlight.cs
+++ b/osu.Game/Online/API/Requests/Responses/APISpotlight.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Online.API.Requests.Responses
         public DateTimeOffset EndDate;
 
         [JsonProperty(@"participant_count")]
-        public int? ParticipiantCount;
+        public int? ParticipantCount;
 
         public override string ToString() => Name;
     }
diff --git a/osu.Game/Overlays/Rankings/SpotlightSelector.cs b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
index 66c5f37917..fb61555c20 100644
--- a/osu.Game/Overlays/Rankings/SpotlightSelector.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
@@ -28,8 +28,8 @@ namespace osu.Game.Overlays.Rankings
 
         public readonly Bindable<APISpotlight> SelectedSpotlight = new Bindable<APISpotlight>();
 
-        private readonly InfoCoulmn startDateColumn;
-        private readonly InfoCoulmn endDateColumn;
+        private readonly InfoColumn startDateColumn;
+        private readonly InfoColumn endDateColumn;
 
         public SpotlightSelector()
         {
@@ -64,8 +64,8 @@ namespace osu.Game.Overlays.Rankings
                             Spacing = new Vector2(15, 0),
                             Children = new Drawable[]
                             {
-                                startDateColumn = new InfoCoulmn(@"Start Date"),
-                                endDateColumn = new InfoCoulmn(@"End Date"),
+                                startDateColumn = new InfoColumn(@"Start Date"),
+                                endDateColumn = new InfoColumn(@"End Date"),
                             }
                         }
                     }
@@ -105,9 +105,9 @@ namespace osu.Game.Overlays.Rankings
             endDateColumn.Value = dateToString(spotlight.NewValue.EndDate);
         }
 
-        private string dateToString(DateTimeOffset date) => $"{date.Year}-{date.Month:D2}-{date.Day:D2}";
+        private string dateToString(DateTimeOffset date) => date.ToString("yyyy-MM-dd");
 
-        private class InfoCoulmn : FillFlowContainer
+        private class InfoColumn : FillFlowContainer
         {
             public string Value
             {
@@ -116,7 +116,7 @@ namespace osu.Game.Overlays.Rankings
 
             private readonly OsuSpriteText valueText;
 
-            public InfoCoulmn(string name)
+            public InfoColumn(string name)
             {
                 AutoSizeAxes = Axes.Both;
                 Direction = FillDirection.Vertical;

From e1eda89ea69234164ae055d1f129626d8fc970f7 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 8 Jan 2020 17:41:44 +0100
Subject: [PATCH 0013/1142] Implement OnlineContainer

---
 osu.Game/Online/OnlineContainer.cs | 76 ++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 osu.Game/Online/OnlineContainer.cs

diff --git a/osu.Game/Online/OnlineContainer.cs b/osu.Game/Online/OnlineContainer.cs
new file mode 100644
index 0000000000..6ab5203fe6
--- /dev/null
+++ b/osu.Game/Online/OnlineContainer.cs
@@ -0,0 +1,76 @@
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Online.API;
+using osu.Game.Online.Placeholders;
+
+namespace osu.Game.Online
+{
+    /// <summary>
+    /// A <see cref="Container"/> for dislaying online content who require a local user to be logged in.
+    /// Shows its children only when the local user is logged in and supports displaying a placeholder if not.
+    /// </summary>
+    public class OnlineViewContainer : Container, IOnlineComponent
+    {
+        private readonly Container content;
+        private readonly Container placeholderContainer;
+        private readonly Placeholder placeholder;
+
+        private const int transform_time = 300;
+
+        protected override Container<Drawable> Content => content;
+
+        public OnlineViewContainer(string placeholder_message)
+        {
+            InternalChildren = new Drawable[]
+            {
+                content = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                },
+                placeholderContainer = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Alpha = 0,
+                    Child = placeholder = new LoginPlaceholder()
+                },
+            };
+        }
+
+        public void APIStateChanged(IAPIProvider api, APIState state)
+        {
+            switch (state)
+            {
+                case APIState.Offline:
+                case APIState.Connecting:
+                    Schedule(() =>updatePlaceholderVisibility(true));
+                    break;
+
+                default:
+                    Schedule(() => updatePlaceholderVisibility(false));
+                    break;
+            }
+        }
+
+        private void updatePlaceholderVisibility(bool show_placeholder)
+        {
+            if (show_placeholder)
+            {
+                    content.FadeOut(transform_time / 2, Easing.OutQuint);
+                    placeholder.ScaleTo(0.8f).Then().ScaleTo(1, 3 * transform_time, Easing.OutQuint);
+                    placeholderContainer.FadeInFromZero(2 * transform_time, Easing.OutQuint);
+            }
+            else
+            {
+                    placeholderContainer.FadeOut(transform_time / 2, Easing.OutQuint);
+                    content.FadeIn(transform_time, Easing.OutQuint);
+            }
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(IAPIProvider api)
+        {
+            api.Register(this);
+        }
+    }
+}

From e9a52984845e9a39cab5a5dd09081aa7045d6436 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 12 Jan 2020 15:50:35 +0100
Subject: [PATCH 0014/1142] Allow setting the displayed text on
 LoginPlaceholder

---
 osu.Game/Online/Leaderboards/Leaderboard.cs      | 2 +-
 osu.Game/Online/OnlineContainer.cs               | 2 +-
 osu.Game/Online/Placeholders/LoginPlaceholder.cs | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/Leaderboard.cs b/osu.Game/Online/Leaderboards/Leaderboard.cs
index 55233bef6e..095e552ddd 100644
--- a/osu.Game/Online/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Online/Leaderboards/Leaderboard.cs
@@ -151,7 +151,7 @@ namespace osu.Game.Online.Leaderboards
                         break;
 
                     case PlaceholderState.NotLoggedIn:
-                        replacePlaceholder(new LoginPlaceholder());
+                        replacePlaceholder(new LoginPlaceholder(@"Please sign in to view online leaderboards!"));
                         break;
 
                     case PlaceholderState.NotSupporter:
diff --git a/osu.Game/Online/OnlineContainer.cs b/osu.Game/Online/OnlineContainer.cs
index 6ab5203fe6..6a8963599f 100644
--- a/osu.Game/Online/OnlineContainer.cs
+++ b/osu.Game/Online/OnlineContainer.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Online
                 {
                     RelativeSizeAxes = Axes.Both,
                     Alpha = 0,
-                    Child = placeholder = new LoginPlaceholder()
+                    Child = placeholder = new LoginPlaceholder(placeholder_message)
                 },
             };
         }
diff --git a/osu.Game/Online/Placeholders/LoginPlaceholder.cs b/osu.Game/Online/Placeholders/LoginPlaceholder.cs
index ffc6623229..f3b5a86785 100644
--- a/osu.Game/Online/Placeholders/LoginPlaceholder.cs
+++ b/osu.Game/Online/Placeholders/LoginPlaceholder.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Online.Placeholders
         [Resolved(CanBeNull = true)]
         private LoginOverlay login { get; set; }
 
-        public LoginPlaceholder()
+        public LoginPlaceholder(string actionMessage)
         {
             AddIcon(FontAwesome.Solid.UserLock, cp =>
             {
@@ -22,7 +22,7 @@ namespace osu.Game.Online.Placeholders
                 cp.Padding = new MarginPadding { Right = 10 };
             });
 
-            AddText(@"Please sign in to view online leaderboards!");
+            AddText(actionMessage);
         }
 
         protected override bool OnMouseDown(MouseDownEvent e)

From 8f6c6ad77a6198c8954195e656099b6fc4450732 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 12 Jan 2020 17:43:44 +0100
Subject: [PATCH 0015/1142] Fix class name not corresponding to filename

---
 osu.Game/Online/{OnlineContainer.cs => OnlineViewContainer.cs} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game/Online/{OnlineContainer.cs => OnlineViewContainer.cs} (100%)

diff --git a/osu.Game/Online/OnlineContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
similarity index 100%
rename from osu.Game/Online/OnlineContainer.cs
rename to osu.Game/Online/OnlineViewContainer.cs

From 90e4def4bd0d782f24b4d987639f33a1388fe621 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 14 Jan 2020 07:07:21 +0300
Subject: [PATCH 0016/1142] Remove online stuff out of the selector

---
 .../TestSceneRankingsSpotlightSelector.cs     | 18 ++++++--
 .../Overlays/Rankings/SpotlightSelector.cs    | 45 +++++++------------
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
index 9320213844..0862b3251a 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays.Rankings;
 
 namespace osu.Game.Tests.Visual.Online
@@ -14,15 +15,26 @@ namespace osu.Game.Tests.Visual.Online
             typeof(SpotlightSelector),
         };
 
-        protected override bool UseOnlineAPI => true;
-
         public TestSceneRankingsSpotlightSelector()
         {
             SpotlightSelector selector;
 
             Add(selector = new SpotlightSelector());
 
-            AddStep("Fetch spotlights", selector.FetchSpotlights);
+            var spotlights = new APISpotlight[]
+            {
+                new APISpotlight { Name = "Spotlight 1" },
+                new APISpotlight { Name = "Spotlight 2" },
+                new APISpotlight { Name = "Spotlight 3" },
+            };
+
+            AddStep("Load spotlights", () => selector.Spotlights = spotlights);
+            AddStep("Load info", () => selector.UpdateInfo(new APISpotlight
+            {
+                StartDate = DateTimeOffset.Now,
+                EndDate = DateTimeOffset.Now,
+                ParticipantCount = 15155151,
+            }, 18));
         }
     }
 }
diff --git a/osu.Game/Overlays/Rankings/SpotlightSelector.cs b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
index fb61555c20..a275f4ed50 100644
--- a/osu.Game/Overlays/Rankings/SpotlightSelector.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
@@ -9,11 +9,10 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osuTK;
 using System;
+using System.Collections.Generic;
 
 namespace osu.Game.Overlays.Rankings
 {
@@ -21,15 +20,19 @@ namespace osu.Game.Overlays.Rankings
     {
         private readonly Box background;
         private readonly SpotlightsDropdown dropdown;
-        private readonly DimmedLoadingLayer loading;
-
-        [Resolved]
-        private IAPIProvider api { get; set; }
 
         public readonly Bindable<APISpotlight> SelectedSpotlight = new Bindable<APISpotlight>();
 
+        public IEnumerable<APISpotlight> Spotlights
+        {
+            get => dropdown.Items;
+            set => dropdown.Items = value;
+        }
+
         private readonly InfoColumn startDateColumn;
         private readonly InfoColumn endDateColumn;
+        private readonly InfoColumn mapCountColumn;
+        private readonly InfoColumn participants;
 
         public SpotlightSelector()
         {
@@ -66,11 +69,12 @@ namespace osu.Game.Overlays.Rankings
                             {
                                 startDateColumn = new InfoColumn(@"Start Date"),
                                 endDateColumn = new InfoColumn(@"End Date"),
+                                mapCountColumn = new InfoColumn(@"Map Count"),
+                                participants = new InfoColumn(@"Participants"),
                             }
                         }
                     }
                 },
-                loading = new DimmedLoadingLayer(),
             };
         }
 
@@ -80,29 +84,12 @@ namespace osu.Game.Overlays.Rankings
             background.Colour = colours.GreySeafoam;
         }
 
-        protected override void LoadComplete()
+        public void UpdateInfo(APISpotlight spotlight, int mapCount)
         {
-            base.LoadComplete();
-            SelectedSpotlight.BindValueChanged(onSelectionChanged);
-        }
-
-        public void FetchSpotlights()
-        {
-            loading.Show();
-
-            var request = new GetSpotlightsRequest();
-            request.Success += response =>
-            {
-                dropdown.Items = response.Spotlights;
-                loading.Hide();
-            };
-            api.Queue(request);
-        }
-
-        private void onSelectionChanged(ValueChangedEvent<APISpotlight> spotlight)
-        {
-            startDateColumn.Value = dateToString(spotlight.NewValue.StartDate);
-            endDateColumn.Value = dateToString(spotlight.NewValue.EndDate);
+            startDateColumn.Value = dateToString(spotlight.StartDate);
+            endDateColumn.Value = dateToString(spotlight.EndDate);
+            mapCountColumn.Value = mapCount.ToString();
+            participants.Value = spotlight.ParticipantCount?.ToString("N0");
         }
 
         private string dateToString(DateTimeOffset date) => date.ToString("yyyy-MM-dd");

From 18ebd309788124c12ae3d5bf8388f97e4822939c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 14 Jan 2020 07:20:03 +0300
Subject: [PATCH 0017/1142] CI fix

---
 .../Visual/Online/TestSceneRankingsSpotlightSelector.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
index 0862b3251a..1a62cb6dad 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Tests.Visual.Online
 
             Add(selector = new SpotlightSelector());
 
-            var spotlights = new APISpotlight[]
+            var spotlights = new[]
             {
                 new APISpotlight { Name = "Spotlight 1" },
                 new APISpotlight { Name = "Spotlight 2" },

From 7349c023d1b9696559d5190469024544d064204a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 14 Jan 2020 14:01:51 +0900
Subject: [PATCH 0018/1142] Cleanup spotlight selection

---
 .../TestSceneRankingsSpotlightSelector.cs     |  4 +--
 .../API/Requests/Responses/APISpotlight.cs    |  2 +-
 .../Overlays/Rankings/SpotlightSelector.cs    | 30 ++++++++++++++-----
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
index 1a62cb6dad..d714d5fb7d 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
@@ -29,12 +29,12 @@ namespace osu.Game.Tests.Visual.Online
             };
 
             AddStep("Load spotlights", () => selector.Spotlights = spotlights);
-            AddStep("Load info", () => selector.UpdateInfo(new APISpotlight
+            AddStep("Load info", () => selector.Current.Value = new APISpotlight
             {
                 StartDate = DateTimeOffset.Now,
                 EndDate = DateTimeOffset.Now,
                 ParticipantCount = 15155151,
-            }, 18));
+            });
         }
     }
 }
diff --git a/osu.Game/Online/API/Requests/Responses/APISpotlight.cs b/osu.Game/Online/API/Requests/Responses/APISpotlight.cs
index 63c47e7812..2191ed4743 100644
--- a/osu.Game/Online/API/Requests/Responses/APISpotlight.cs
+++ b/osu.Game/Online/API/Requests/Responses/APISpotlight.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Online.API.Requests.Responses
         public DateTimeOffset EndDate;
 
         [JsonProperty(@"participant_count")]
-        public int? ParticipantCount;
+        public int ParticipantCount;
 
         public override string ToString() => Name;
     }
diff --git a/osu.Game/Overlays/Rankings/SpotlightSelector.cs b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
index a275f4ed50..def7469b16 100644
--- a/osu.Game/Overlays/Rankings/SpotlightSelector.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
@@ -13,15 +13,22 @@ using osu.Game.Online.API.Requests.Responses;
 using osuTK;
 using System;
 using System.Collections.Generic;
+using osu.Framework.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Rankings
 {
-    public class SpotlightSelector : Container
+    public class SpotlightSelector : Container, IHasCurrentValue<APISpotlight>
     {
         private readonly Box background;
         private readonly SpotlightsDropdown dropdown;
 
-        public readonly Bindable<APISpotlight> SelectedSpotlight = new Bindable<APISpotlight>();
+        private readonly BindableWithCurrent<APISpotlight> current = new BindableWithCurrent<APISpotlight>();
+
+        public Bindable<APISpotlight> Current
+        {
+            get => current.Current;
+            set => current.Current = value;
+        }
 
         public IEnumerable<APISpotlight> Spotlights
         {
@@ -55,7 +62,7 @@ namespace osu.Game.Overlays.Rankings
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.TopCentre,
                             RelativeSizeAxes = Axes.X,
-                            Current = SelectedSpotlight,
+                            Current = Current,
                             Depth = -float.MaxValue
                         },
                         new FillFlowContainer
@@ -84,12 +91,19 @@ namespace osu.Game.Overlays.Rankings
             background.Colour = colours.GreySeafoam;
         }
 
-        public void UpdateInfo(APISpotlight spotlight, int mapCount)
+        protected override void LoadComplete()
         {
-            startDateColumn.Value = dateToString(spotlight.StartDate);
-            endDateColumn.Value = dateToString(spotlight.EndDate);
-            mapCountColumn.Value = mapCount.ToString();
-            participants.Value = spotlight.ParticipantCount?.ToString("N0");
+            base.LoadComplete();
+
+            Current.BindValueChanged(onCurrentChanged);
+        }
+
+        private void onCurrentChanged(ValueChangedEvent<APISpotlight> spotlight)
+        {
+            startDateColumn.Value = dateToString(spotlight.NewValue.StartDate);
+            endDateColumn.Value = dateToString(spotlight.NewValue.EndDate);
+            // mapCountColumn.Value = spotlight.NewValue.ParticipantCount.ToString();
+            participants.Value = spotlight.NewValue.ParticipantCount.ToString();
         }
 
         private string dateToString(DateTimeOffset date) => date.ToString("yyyy-MM-dd");

From cb1984a3c3f7b23b0c76465be334b89596edbd41 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 14 Jan 2020 14:37:14 +0900
Subject: [PATCH 0019/1142] Improve test scene data

---
 .../TestSceneRankingsSpotlightSelector.cs     | 66 ++++++++++++++++---
 1 file changed, 56 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
index d714d5fb7d..c3df1f055b 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
@@ -3,6 +3,10 @@
 
 using System;
 using System.Collections.Generic;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays.Rankings;
 
@@ -15,25 +19,67 @@ namespace osu.Game.Tests.Visual.Online
             typeof(SpotlightSelector),
         };
 
+        protected override bool UseOnlineAPI => true;
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        private readonly SpotlightSelector selector;
+
         public TestSceneRankingsSpotlightSelector()
         {
-            SpotlightSelector selector;
-
             Add(selector = new SpotlightSelector());
+        }
 
+        [Test]
+        public void TestLocalSpotlights()
+        {
             var spotlights = new[]
             {
-                new APISpotlight { Name = "Spotlight 1" },
-                new APISpotlight { Name = "Spotlight 2" },
-                new APISpotlight { Name = "Spotlight 3" },
+                new APISpotlight
+                {
+                    Name = "Spotlight 1",
+                    StartDate = DateTimeOffset.Now,
+                    EndDate = DateTimeOffset.Now,
+                    ParticipantCount = 100
+                },
+                new APISpotlight
+                {
+                    Name = "Spotlight 2",
+                    StartDate = DateTimeOffset.Now,
+                    EndDate = DateTimeOffset.Now,
+                    ParticipantCount = 200
+                },
+                new APISpotlight
+                {
+                    Name = "Spotlight 3",
+                    StartDate = DateTimeOffset.Now,
+                    EndDate = DateTimeOffset.Now,
+                    ParticipantCount = 300
+                },
             };
 
-            AddStep("Load spotlights", () => selector.Spotlights = spotlights);
-            AddStep("Load info", () => selector.Current.Value = new APISpotlight
+            AddStep("load spotlights", () => selector.Spotlights = spotlights);
+            AddStep("change to spotlight 3", () => selector.Current.Value = spotlights[2]);
+        }
+
+        [Test]
+        public void TestOnlineSpotlights()
+        {
+            List<APISpotlight> spotlights = null;
+
+            AddStep("retrieve spotlights", () =>
             {
-                StartDate = DateTimeOffset.Now,
-                EndDate = DateTimeOffset.Now,
-                ParticipantCount = 15155151,
+                var req = new GetSpotlightsRequest();
+                req.Success += res => spotlights = res.Spotlights;
+
+                api.Perform(req);
+            });
+
+            AddStep("set spotlights", () =>
+            {
+                if (spotlights != null)
+                    selector.Spotlights = spotlights;
             });
         }
     }

From 05702af9054797578deebf03f3ab654d653035d4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 14 Jan 2020 14:37:24 +0900
Subject: [PATCH 0020/1142] Remove map count (not returned by API)

---
 osu.Game/Overlays/Rankings/SpotlightSelector.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Overlays/Rankings/SpotlightSelector.cs b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
index def7469b16..d6efff626d 100644
--- a/osu.Game/Overlays/Rankings/SpotlightSelector.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
@@ -38,7 +38,6 @@ namespace osu.Game.Overlays.Rankings
 
         private readonly InfoColumn startDateColumn;
         private readonly InfoColumn endDateColumn;
-        private readonly InfoColumn mapCountColumn;
         private readonly InfoColumn participants;
 
         public SpotlightSelector()
@@ -76,7 +75,6 @@ namespace osu.Game.Overlays.Rankings
                             {
                                 startDateColumn = new InfoColumn(@"Start Date"),
                                 endDateColumn = new InfoColumn(@"End Date"),
-                                mapCountColumn = new InfoColumn(@"Map Count"),
                                 participants = new InfoColumn(@"Participants"),
                             }
                         }
@@ -102,7 +100,6 @@ namespace osu.Game.Overlays.Rankings
         {
             startDateColumn.Value = dateToString(spotlight.NewValue.StartDate);
             endDateColumn.Value = dateToString(spotlight.NewValue.EndDate);
-            // mapCountColumn.Value = spotlight.NewValue.ParticipantCount.ToString();
             participants.Value = spotlight.NewValue.ParticipantCount.ToString();
         }
 

From 33993837b7f175421c0b34cbdff0ac0e36d962d2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 14 Jan 2020 14:41:38 +0900
Subject: [PATCH 0021/1142] Remove participant count (not returned by API)

---
 .../Visual/Online/TestSceneRankingsSpotlightSelector.cs        | 3 ---
 osu.Game/Online/API/Requests/Responses/APISpotlight.cs         | 3 ---
 osu.Game/Overlays/Rankings/SpotlightSelector.cs                | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
index c3df1f055b..009fe7cc8c 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
@@ -41,21 +41,18 @@ namespace osu.Game.Tests.Visual.Online
                     Name = "Spotlight 1",
                     StartDate = DateTimeOffset.Now,
                     EndDate = DateTimeOffset.Now,
-                    ParticipantCount = 100
                 },
                 new APISpotlight
                 {
                     Name = "Spotlight 2",
                     StartDate = DateTimeOffset.Now,
                     EndDate = DateTimeOffset.Now,
-                    ParticipantCount = 200
                 },
                 new APISpotlight
                 {
                     Name = "Spotlight 3",
                     StartDate = DateTimeOffset.Now,
                     EndDate = DateTimeOffset.Now,
-                    ParticipantCount = 300
                 },
             };
 
diff --git a/osu.Game/Online/API/Requests/Responses/APISpotlight.cs b/osu.Game/Online/API/Requests/Responses/APISpotlight.cs
index 2191ed4743..3a002e57b2 100644
--- a/osu.Game/Online/API/Requests/Responses/APISpotlight.cs
+++ b/osu.Game/Online/API/Requests/Responses/APISpotlight.cs
@@ -26,9 +26,6 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty(@"end_date")]
         public DateTimeOffset EndDate;
 
-        [JsonProperty(@"participant_count")]
-        public int ParticipantCount;
-
         public override string ToString() => Name;
     }
 }
diff --git a/osu.Game/Overlays/Rankings/SpotlightSelector.cs b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
index d6efff626d..c538a80786 100644
--- a/osu.Game/Overlays/Rankings/SpotlightSelector.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
@@ -38,7 +38,6 @@ namespace osu.Game.Overlays.Rankings
 
         private readonly InfoColumn startDateColumn;
         private readonly InfoColumn endDateColumn;
-        private readonly InfoColumn participants;
 
         public SpotlightSelector()
         {
@@ -75,7 +74,6 @@ namespace osu.Game.Overlays.Rankings
                             {
                                 startDateColumn = new InfoColumn(@"Start Date"),
                                 endDateColumn = new InfoColumn(@"End Date"),
-                                participants = new InfoColumn(@"Participants"),
                             }
                         }
                     }
@@ -100,7 +98,6 @@ namespace osu.Game.Overlays.Rankings
         {
             startDateColumn.Value = dateToString(spotlight.NewValue.StartDate);
             endDateColumn.Value = dateToString(spotlight.NewValue.EndDate);
-            participants.Value = spotlight.NewValue.ParticipantCount.ToString();
         }
 
         private string dateToString(DateTimeOffset date) => date.ToString("yyyy-MM-dd");

From d6bd0b7106b215441348b1192979d9611677abf7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 14 Jan 2020 14:43:57 +0900
Subject: [PATCH 0022/1142] Container -> CompositeDrawable

---
 osu.Game/Overlays/Rankings/SpotlightSelector.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Rankings/SpotlightSelector.cs b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
index c538a80786..4da3daa62a 100644
--- a/osu.Game/Overlays/Rankings/SpotlightSelector.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
@@ -17,7 +17,7 @@ using osu.Framework.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Rankings
 {
-    public class SpotlightSelector : Container, IHasCurrentValue<APISpotlight>
+    public class SpotlightSelector : CompositeDrawable, IHasCurrentValue<APISpotlight>
     {
         private readonly Box background;
         private readonly SpotlightsDropdown dropdown;
@@ -43,7 +43,8 @@ namespace osu.Game.Overlays.Rankings
         {
             RelativeSizeAxes = Axes.X;
             Height = 100;
-            Children = new Drawable[]
+
+            InternalChildren = new Drawable[]
             {
                 background = new Box
                 {

From 0422b326ad3faa719ba34852a4d80e3b22ce273d Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Mon, 13 Jan 2020 21:12:19 +0100
Subject: [PATCH 0023/1142] Add visual tests

---
 .../Online/TestSceneOnlineViewContainer.cs    | 75 +++++++++++++++++++
 osu.Game/Online/API/DummyAPIAccess.cs         |  2 +-
 osu.Game/Online/OnlineViewContainer.cs        | 25 ++++---
 3 files changed, 90 insertions(+), 12 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
new file mode 100644
index 0000000000..a8c50a37e7
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
@@ -0,0 +1,75 @@
+// 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.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Online;
+using osu.Game.Online.API;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    [TestFixture]
+    public class TestSceneOnlineViewContainer : OsuTestScene
+    {
+        private OnlineViewContainer onlineView;
+        private Box box;
+
+        public TestSceneOnlineViewContainer()
+        {
+            Child = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Child = onlineView = new OnlineViewContainer(@"Please login to view dummy test content")
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        box = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = Color4.Blue.Opacity(0.8f),
+                        },
+                        new OsuSpriteText
+                        {
+                            Text = "dummy online content",
+                            RelativeSizeAxes = Axes.Both,
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        }
+                    }
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddStep("set status to offline", () =>
+            {
+                (API as DummyAPIAccess).State = APIState.Offline;
+            });
+
+            AddAssert("children are hidden", () =>
+            {
+                return !onlineView.Children.First().Parent.IsPresent;
+            });
+
+            AddStep("set status to online", () =>
+            {
+                (API as DummyAPIAccess).State = APIState.Online;
+            });
+
+            AddAssert("children are visible", () =>
+            {
+                return onlineView.Children.First().Parent.IsPresent;
+            });
+        }
+    }
+}
diff --git a/osu.Game/Online/API/DummyAPIAccess.cs b/osu.Game/Online/API/DummyAPIAccess.cs
index 7f23f9b5d5..a1c3475fd9 100644
--- a/osu.Game/Online/API/DummyAPIAccess.cs
+++ b/osu.Game/Online/API/DummyAPIAccess.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Online.API
         public APIState State
         {
             get => state;
-            private set
+            set
             {
                 if (state == value)
                     return;
diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
index 6a8963599f..a7f81b4776 100644
--- a/osu.Game/Online/OnlineViewContainer.cs
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -1,4 +1,7 @@
-using osu.Framework.Allocation;
+// 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.Game.Online.API;
@@ -20,7 +23,7 @@ namespace osu.Game.Online
 
         protected override Container<Drawable> Content => content;
 
-        public OnlineViewContainer(string placeholder_message)
+        public OnlineViewContainer(string placeholderMessage)
         {
             InternalChildren = new Drawable[]
             {
@@ -32,7 +35,7 @@ namespace osu.Game.Online
                 {
                     RelativeSizeAxes = Axes.Both,
                     Alpha = 0,
-                    Child = placeholder = new LoginPlaceholder(placeholder_message)
+                    Child = placeholder = new LoginPlaceholder(placeholderMessage)
                 },
             };
         }
@@ -43,7 +46,7 @@ namespace osu.Game.Online
             {
                 case APIState.Offline:
                 case APIState.Connecting:
-                    Schedule(() =>updatePlaceholderVisibility(true));
+                    Schedule(() => updatePlaceholderVisibility(true));
                     break;
 
                 default:
@@ -52,18 +55,18 @@ namespace osu.Game.Online
             }
         }
 
-        private void updatePlaceholderVisibility(bool show_placeholder)
+        private void updatePlaceholderVisibility(bool showPlaceholder)
         {
-            if (show_placeholder)
+            if (showPlaceholder)
             {
-                    content.FadeOut(transform_time / 2, Easing.OutQuint);
-                    placeholder.ScaleTo(0.8f).Then().ScaleTo(1, 3 * transform_time, Easing.OutQuint);
-                    placeholderContainer.FadeInFromZero(2 * transform_time, Easing.OutQuint);
+                content.FadeOut(transform_time / 2, Easing.OutQuint);
+                placeholder.ScaleTo(0.8f).Then().ScaleTo(1, 3 * transform_time, Easing.OutQuint);
+                placeholderContainer.FadeInFromZero(2 * transform_time, Easing.OutQuint);
             }
             else
             {
-                    placeholderContainer.FadeOut(transform_time / 2, Easing.OutQuint);
-                    content.FadeIn(transform_time, Easing.OutQuint);
+                placeholderContainer.FadeOut(transform_time / 2, Easing.OutQuint);
+                content.FadeIn(transform_time, Easing.OutQuint);
             }
         }
 

From f00938971eda2ba95c451792a6ce56234f073532 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 17 Jan 2020 18:53:17 +0100
Subject: [PATCH 0024/1142] Apply review suggestions

---
 .../Online/TestSceneOnlineViewContainer.cs    |  2 +-
 osu.Game/Online/OnlineViewContainer.cs        | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
index a8c50a37e7..9b7de2b7f4 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.Online
             Child = new Container
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = onlineView = new OnlineViewContainer(@"Please login to view dummy test content")
+                Child = onlineView = new OnlineViewContainer(@"view dummy test content")
                 {
                     RelativeSizeAxes = Axes.Both,
                     Children = new Drawable[]
diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
index a7f81b4776..ac3a3edd67 100644
--- a/osu.Game/Online/OnlineViewContainer.cs
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -23,6 +23,9 @@ namespace osu.Game.Online
 
         protected override Container<Drawable> Content => content;
 
+        [Resolved]
+        protected IAPIProvider API { get; private set; }
+
         public OnlineViewContainer(string placeholderMessage)
         {
             InternalChildren = new Drawable[]
@@ -35,12 +38,12 @@ namespace osu.Game.Online
                 {
                     RelativeSizeAxes = Axes.Both,
                     Alpha = 0,
-                    Child = placeholder = new LoginPlaceholder(placeholderMessage)
+                    Child = placeholder = new LoginPlaceholder($@"Please sign in to {placeholderMessage}")
                 },
             };
         }
 
-        public void APIStateChanged(IAPIProvider api, APIState state)
+        public virtual void APIStateChanged(IAPIProvider api, APIState state)
         {
             switch (state)
             {
@@ -70,10 +73,16 @@ namespace osu.Game.Online
             }
         }
 
-        [BackgroundDependencyLoader]
-        private void load(IAPIProvider api)
+        protected override void LoadComplete()
         {
-            api.Register(this);
+            API?.Register(this);
+            base.LoadComplete();
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            API?.Unregister(this);
+            base.Dispose(isDisposing);
         }
     }
 }

From e1f172e3f820c88b481f546b49752a71a1b754bc Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 17 Jan 2020 19:29:42 +0100
Subject: [PATCH 0025/1142] Fix CI issues

---
 .../Online/TestSceneOnlineViewContainer.cs    | 25 +++++--------------
 osu.Game/Online/OnlineViewContainer.cs        |  4 +--
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
index 9b7de2b7f4..4579e4f428 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
@@ -18,8 +18,7 @@ namespace osu.Game.Tests.Visual.Online
     [TestFixture]
     public class TestSceneOnlineViewContainer : OsuTestScene
     {
-        private OnlineViewContainer onlineView;
-        private Box box;
+        private readonly OnlineViewContainer onlineView;
 
         public TestSceneOnlineViewContainer()
         {
@@ -31,7 +30,7 @@ namespace osu.Game.Tests.Visual.Online
                     RelativeSizeAxes = Axes.Both,
                     Children = new Drawable[]
                     {
-                        box = new Box
+                        new Box
                         {
                             RelativeSizeAxes = Axes.Both,
                             Colour = Color4.Blue.Opacity(0.8f),
@@ -51,25 +50,13 @@ namespace osu.Game.Tests.Visual.Online
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddStep("set status to offline", () =>
-            {
-                (API as DummyAPIAccess).State = APIState.Offline;
-            });
+            AddStep("set status to offline", () => ((DummyAPIAccess)API).State = APIState.Offline);
 
-            AddAssert("children are hidden", () =>
-            {
-                return !onlineView.Children.First().Parent.IsPresent;
-            });
+            AddAssert("children are hidden", () => !onlineView.Children.First().Parent.IsPresent);
 
-            AddStep("set status to online", () =>
-            {
-                (API as DummyAPIAccess).State = APIState.Online;
-            });
+            AddStep("set status to online", () => ((DummyAPIAccess)API).State = APIState.Online);
 
-            AddAssert("children are visible", () =>
-            {
-                return onlineView.Children.First().Parent.IsPresent;
-            });
+            AddAssert("children are visible", () => onlineView.Children.First().Parent.IsPresent);
         }
     }
 }
diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
index ac3a3edd67..0a8432ee12 100644
--- a/osu.Game/Online/OnlineViewContainer.cs
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -62,13 +62,13 @@ namespace osu.Game.Online
         {
             if (showPlaceholder)
             {
-                content.FadeOut(transform_time / 2, Easing.OutQuint);
+                content.FadeOut(150, Easing.OutQuint);
                 placeholder.ScaleTo(0.8f).Then().ScaleTo(1, 3 * transform_time, Easing.OutQuint);
                 placeholderContainer.FadeInFromZero(2 * transform_time, Easing.OutQuint);
             }
             else
             {
-                placeholderContainer.FadeOut(transform_time / 2, Easing.OutQuint);
+                placeholderContainer.FadeOut(150, Easing.OutQuint);
                 content.FadeIn(transform_time, Easing.OutQuint);
             }
         }

From 11e7c8be3f3f3da461a65a22d1be2b5ec8017a7d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 20 Jan 2020 08:34:46 +0300
Subject: [PATCH 0026/1142] Use colour schemes for OverlayRulesetSelector

---
 .../Online/TestSceneProfileRulesetSelector.cs |  3 +-
 .../TestSceneOverlayRulesetSelector.cs        | 28 ++++++++++---------
 osu.Game/Overlays/OverlayRulesetSelector.cs   |  9 ++++--
 .../Components/ProfileRulesetSelector.cs      |  7 ++---
 4 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneProfileRulesetSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneProfileRulesetSelector.cs
index a36b6880d2..1a9dca51c9 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneProfileRulesetSelector.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneProfileRulesetSelector.cs
@@ -11,6 +11,7 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Taiko;
 using osu.Game.Users;
 using osu.Framework.Bindables;
+using osu.Game.Graphics;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -27,7 +28,7 @@ namespace osu.Game.Tests.Visual.Online
             ProfileRulesetSelector selector;
             var user = new Bindable<User>();
 
-            Child = selector = new ProfileRulesetSelector
+            Child = selector = new ProfileRulesetSelector(OverlayColourScheme.Green)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs
index 93aa414c94..bc5f66da0b 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs
@@ -13,7 +13,8 @@ using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using NUnit.Framework;
 using osu.Game.Graphics;
-using osu.Framework.Allocation;
+using osu.Framework.Graphics.Containers;
+using osuTK;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
@@ -25,19 +26,27 @@ namespace osu.Game.Tests.Visual.UserInterface
             typeof(OverlayRulesetTabItem),
         };
 
-        [Resolved]
-        private OsuColour colours { get; set; }
-
         private readonly OverlayRulesetSelector selector;
         private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
 
         public TestSceneOverlayRulesetSelector()
         {
-            Add(selector = new OverlayRulesetSelector
+            Add(new FillFlowContainer
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                Current = ruleset,
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 5),
+                Children = new[]
+                {
+                    selector = new OverlayRulesetSelector(OverlayColourScheme.Green) { Current = ruleset },
+                    new OverlayRulesetSelector(OverlayColourScheme.Blue) { Current = ruleset },
+                    new OverlayRulesetSelector(OverlayColourScheme.Orange) { Current = ruleset },
+                    new OverlayRulesetSelector(OverlayColourScheme.Pink) { Current = ruleset },
+                    new OverlayRulesetSelector(OverlayColourScheme.Purple) { Current = ruleset },
+                    new OverlayRulesetSelector(OverlayColourScheme.Red) { Current = ruleset }
+                }
             });
         }
 
@@ -56,12 +65,5 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("Select catch", () => ruleset.Value = new CatchRuleset().RulesetInfo);
             AddAssert("Check catch selected", () => selector.Current.Value.Equals(new CatchRuleset().RulesetInfo));
         }
-
-        [Test]
-        public void TestColours()
-        {
-            AddStep("Set colour to blue", () => selector.AccentColour = colours.Blue);
-            AddAssert("Check colour is blue", () => selector.AccentColour == colours.Blue);
-        }
     }
 }
diff --git a/osu.Game/Overlays/OverlayRulesetSelector.cs b/osu.Game/Overlays/OverlayRulesetSelector.cs
index da49335250..b70d6a08f2 100644
--- a/osu.Game/Overlays/OverlayRulesetSelector.cs
+++ b/osu.Game/Overlays/OverlayRulesetSelector.cs
@@ -28,16 +28,19 @@ namespace osu.Game.Overlays
             }
         }
 
-        public OverlayRulesetSelector()
+        protected OverlayColourScheme ColourScheme { get; }
+
+        public OverlayRulesetSelector(OverlayColourScheme colourScheme)
         {
+            ColourScheme = colourScheme;
+
             AutoSizeAxes = Axes.Both;
         }
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            if (accentColour == default)
-                AccentColour = colours.Pink;
+            AccentColour = colours.ForOverlayElement(ColourScheme, 1, 0.7f);
         }
 
         protected override TabItem<RulesetInfo> CreateTabItem(RulesetInfo value) => new OverlayRulesetTabItem(value);
diff --git a/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetSelector.cs b/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetSelector.cs
index e63102f989..f7e8d4b1f5 100644
--- a/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetSelector.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetSelector.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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics;
@@ -14,16 +13,14 @@ namespace osu.Game.Overlays.Profile.Header.Components
     {
         public readonly Bindable<User> User = new Bindable<User>();
 
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        public ProfileRulesetSelector(OverlayColourScheme colourScheme)
+            : base(colourScheme)
         {
-            AccentColour = colours.Seafoam;
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
-
             User.BindValueChanged(u => SetDefaultRuleset(Rulesets.GetRuleset(u.NewValue?.PlayMode ?? "osu")), true);
         }
 

From 7cd60e3193a615c4ce71311693762ec6c01aa57e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 26 Jan 2020 17:07:17 +0300
Subject: [PATCH 0027/1142] Make OverlayRulesetSelector use colour provider

---
 .../Online/TestSceneProfileRulesetSelector.cs |  8 ++++--
 .../TestSceneOverlayRulesetSelector.cs        | 27 ++++++++++++++-----
 osu.Game/Overlays/OverlayRulesetSelector.cs   | 10 +++----
 .../Components/ProfileRulesetSelector.cs      |  6 -----
 4 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneProfileRulesetSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneProfileRulesetSelector.cs
index 1a9dca51c9..826624f686 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneProfileRulesetSelector.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneProfileRulesetSelector.cs
@@ -11,7 +11,8 @@ using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Taiko;
 using osu.Game.Users;
 using osu.Framework.Bindables;
-using osu.Game.Graphics;
+using osu.Game.Overlays;
+using osu.Framework.Allocation;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -23,12 +24,15 @@ namespace osu.Game.Tests.Visual.Online
             typeof(ProfileRulesetTabItem),
         };
 
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
+
         public TestSceneProfileRulesetSelector()
         {
             ProfileRulesetSelector selector;
             var user = new Bindable<User>();
 
-            Child = selector = new ProfileRulesetSelector(OverlayColourScheme.Green)
+            Child = selector = new ProfileRulesetSelector
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs
index bc5f66da0b..8a98127793 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayRulesetSelector.cs
@@ -12,9 +12,9 @@ using osu.Framework.Bindables;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using NUnit.Framework;
-using osu.Game.Graphics;
 using osu.Framework.Graphics.Containers;
 using osuTK;
+using osu.Framework.Allocation;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
@@ -40,16 +40,29 @@ namespace osu.Game.Tests.Visual.UserInterface
                 Spacing = new Vector2(0, 5),
                 Children = new[]
                 {
-                    selector = new OverlayRulesetSelector(OverlayColourScheme.Green) { Current = ruleset },
-                    new OverlayRulesetSelector(OverlayColourScheme.Blue) { Current = ruleset },
-                    new OverlayRulesetSelector(OverlayColourScheme.Orange) { Current = ruleset },
-                    new OverlayRulesetSelector(OverlayColourScheme.Pink) { Current = ruleset },
-                    new OverlayRulesetSelector(OverlayColourScheme.Purple) { Current = ruleset },
-                    new OverlayRulesetSelector(OverlayColourScheme.Red) { Current = ruleset }
+                    new ColourProvidedContainer(OverlayColourScheme.Green, selector = new OverlayRulesetSelector { Current = ruleset }),
+                    new ColourProvidedContainer(OverlayColourScheme.Blue, new OverlayRulesetSelector { Current = ruleset }),
+                    new ColourProvidedContainer(OverlayColourScheme.Orange, new OverlayRulesetSelector { Current = ruleset }),
+                    new ColourProvidedContainer(OverlayColourScheme.Pink, new OverlayRulesetSelector { Current = ruleset }),
+                    new ColourProvidedContainer(OverlayColourScheme.Purple, new OverlayRulesetSelector { Current = ruleset }),
+                    new ColourProvidedContainer(OverlayColourScheme.Red, new OverlayRulesetSelector { Current = ruleset }),
                 }
             });
         }
 
+        private class ColourProvidedContainer : Container
+        {
+            [Cached]
+            private readonly OverlayColourProvider colourProvider;
+
+            public ColourProvidedContainer(OverlayColourScheme colourScheme, OverlayRulesetSelector rulesetSelector)
+            {
+                colourProvider = new OverlayColourProvider(colourScheme);
+                AutoSizeAxes = Axes.Both;
+                Add(rulesetSelector);
+            }
+        }
+
         [Test]
         public void TestSelection()
         {
diff --git a/osu.Game/Overlays/OverlayRulesetSelector.cs b/osu.Game/Overlays/OverlayRulesetSelector.cs
index b70d6a08f2..0c87686f6f 100644
--- a/osu.Game/Overlays/OverlayRulesetSelector.cs
+++ b/osu.Game/Overlays/OverlayRulesetSelector.cs
@@ -28,19 +28,15 @@ namespace osu.Game.Overlays
             }
         }
 
-        protected OverlayColourScheme ColourScheme { get; }
-
-        public OverlayRulesetSelector(OverlayColourScheme colourScheme)
+        public OverlayRulesetSelector()
         {
-            ColourScheme = colourScheme;
-
             AutoSizeAxes = Axes.Both;
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colourProvider)
         {
-            AccentColour = colours.ForOverlayElement(ColourScheme, 1, 0.7f);
+            AccentColour = colourProvider.Highlight1;
         }
 
         protected override TabItem<RulesetInfo> CreateTabItem(RulesetInfo value) => new OverlayRulesetTabItem(value);
diff --git a/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetSelector.cs b/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetSelector.cs
index f7e8d4b1f5..41a3ee8ad6 100644
--- a/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetSelector.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetSelector.cs
@@ -3,7 +3,6 @@
 
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.UserInterface;
-using osu.Game.Graphics;
 using osu.Game.Rulesets;
 using osu.Game.Users;
 
@@ -13,11 +12,6 @@ namespace osu.Game.Overlays.Profile.Header.Components
     {
         public readonly Bindable<User> User = new Bindable<User>();
 
-        public ProfileRulesetSelector(OverlayColourScheme colourScheme)
-            : base(colourScheme)
-        {
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();

From 2b2cfd91a6a48b7804870f4dfb19753372b54e9a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 28 Jan 2020 17:59:14 +0900
Subject: [PATCH 0028/1142] Initial re-implementation using rearrangeable list

---
 .../UserInterface/TestScenePlaylistOverlay.cs |  59 ++++
 osu.Game/Overlays/Music/PlaylistList.cs       | 301 ++++--------------
 osu.Game/Overlays/Music/PlaylistOverlay.cs    |  12 +-
 3 files changed, 135 insertions(+), 237 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs
new file mode 100644
index 0000000000..a470244f53
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs
@@ -0,0 +1,59 @@
+// 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 NUnit.Framework;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Overlays.Music;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestScenePlaylistOverlay : OsuTestScene
+    {
+        private readonly BindableList<BeatmapSetInfo> beatmapSets = new BindableList<BeatmapSetInfo>();
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            PlaylistOverlay overlay;
+
+            Child = new Container
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(300, 500),
+                Child = overlay = new PlaylistOverlay
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.X,
+                    State = { Value = Visibility.Visible }
+                }
+            };
+
+            beatmapSets.Clear();
+
+            for (int i = 0; i < 100; i++)
+            {
+                beatmapSets.Add(new BeatmapSetInfo
+                {
+                    Metadata = new BeatmapMetadata
+                    {
+                        // Create random metadata, then we can check if sorting works based on these
+                        Artist = "Some Artist " + RNG.Next(0, 9),
+                        Title = $"Some Song {i + 1}",
+                        AuthorString = "Some Guy " + RNG.Next(0, 9),
+                    },
+                    DateAdded = DateTimeOffset.UtcNow,
+                });
+            }
+
+            overlay.BeatmapSets.BindTo(beatmapSets);
+        });
+    }
+}
diff --git a/osu.Game/Overlays/Music/PlaylistList.cs b/osu.Game/Overlays/Music/PlaylistList.cs
index 7bdcab6dff..5c091a21db 100644
--- a/osu.Game/Overlays/Music/PlaylistList.cs
+++ b/osu.Game/Overlays/Music/PlaylistList.cs
@@ -6,30 +6,16 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Input.Events;
+using osu.Framework.Graphics.UserInterface;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics.Containers;
-using osuTK;
 
 namespace osu.Game.Overlays.Music
 {
-    public class PlaylistList : CompositeDrawable
+    public class PlaylistList2 : BasicRearrangeableListContainer<PlaylistListItem>
     {
-        public Action<BeatmapSetInfo> Selected;
-
-        private readonly ItemsScrollContainer items;
-
-        public PlaylistList()
-        {
-            InternalChild = items = new ItemsScrollContainer
-            {
-                RelativeSizeAxes = Axes.Both,
-                Selected = set => Selected?.Invoke(set),
-            };
-        }
+        public readonly BindableList<BeatmapSetInfo> BeatmapSets = new BindableList<BeatmapSetInfo>();
 
         public new MarginPadding Padding
         {
@@ -37,232 +23,81 @@ namespace osu.Game.Overlays.Music
             set => base.Padding = value;
         }
 
-        public BeatmapSetInfo FirstVisibleSet => items.FirstVisibleSet;
-
-        public void Filter(string searchTerm) => items.SearchTerm = searchTerm;
-
-        private class ItemsScrollContainer : OsuScrollContainer
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            public Action<BeatmapSetInfo> Selected;
+            BeatmapSets.ItemsAdded += addBeatmapSets;
+            BeatmapSets.ItemsRemoved += removeBeatmapSets;
+        }
 
-            private readonly SearchContainer search;
-            private readonly FillFlowContainer<PlaylistItem> items;
+        public void Filter(string searchTerm) => ((PlaylistListFlowContainer)ListContainer).SearchTerm = searchTerm;
 
-            private readonly IBindable<WorkingBeatmap> beatmapBacking = new Bindable<WorkingBeatmap>();
+        public BeatmapSetInfo FirstVisibleSet => ListContainer.FlowingChildren.Cast<DrawablePlaylistListItem>().FirstOrDefault(i => i.MatchingFilter)?.Model.BeatmapSetInfo;
 
-            private IBindableList<BeatmapSetInfo> beatmaps;
+        private void addBeatmapSets(IEnumerable<BeatmapSetInfo> sets) => Schedule(() =>
+        {
+            foreach (var item in sets)
+                AddItem(new PlaylistListItem(item));
+        });
 
-            [Resolved]
-            private MusicController musicController { get; set; }
+        private void removeBeatmapSets(IEnumerable<BeatmapSetInfo> sets) => Schedule(() =>
+        {
+            foreach (var item in sets)
+                RemoveItem(ListContainer.Children.Select(d => d.Model).FirstOrDefault(m => m.BeatmapSetInfo == item));
+        });
 
-            public ItemsScrollContainer()
+        protected override BasicDrawableRearrangeableListItem CreateBasicItem(PlaylistListItem item) => new DrawablePlaylistListItem(item);
+
+        protected override FillFlowContainer<DrawableRearrangeableListItem> CreateListFillFlowContainer() => new PlaylistListFlowContainer
+        {
+            LayoutDuration = 200,
+            LayoutEasing = Easing.OutQuint
+        };
+    }
+
+    public class PlaylistListFlowContainer : SearchContainer<RearrangeableListContainer<PlaylistListItem>.DrawableRearrangeableListItem>
+    {
+    }
+
+    public class PlaylistListItem : IEquatable<PlaylistListItem>
+    {
+        public readonly BeatmapSetInfo BeatmapSetInfo;
+
+        public PlaylistListItem(BeatmapSetInfo beatmapSetInfo)
+        {
+            BeatmapSetInfo = beatmapSetInfo;
+        }
+
+        public override string ToString() => BeatmapSetInfo.ToString();
+
+        public bool Equals(PlaylistListItem other) => BeatmapSetInfo.Equals(other?.BeatmapSetInfo);
+    }
+
+    public class DrawablePlaylistListItem : BasicRearrangeableListContainer<PlaylistListItem>.BasicDrawableRearrangeableListItem, IFilterable
+    {
+        public DrawablePlaylistListItem(PlaylistListItem item)
+            : base(item)
+        {
+            FilterTerms = item.BeatmapSetInfo.Metadata.SearchableTerms;
+        }
+
+        public IEnumerable<string> FilterTerms { get; }
+
+        private bool matching = true;
+
+        public bool MatchingFilter
+        {
+            get => matching;
+            set
             {
-                Children = new Drawable[]
-                {
-                    search = new SearchContainer
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Children = new Drawable[]
-                        {
-                            items = new ItemSearchContainer
-                            {
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                            },
-                        }
-                    }
-                };
-            }
+                if (matching == value) return;
 
-            [BackgroundDependencyLoader]
-            private void load(IBindable<WorkingBeatmap> beatmap)
-            {
-                beatmaps = musicController.BeatmapSets.GetBoundCopy();
-                beatmaps.ItemsAdded += i => i.ForEach(addBeatmapSet);
-                beatmaps.ItemsRemoved += i => i.ForEach(removeBeatmapSet);
-                beatmaps.ForEach(addBeatmapSet);
+                matching = value;
 
-                beatmapBacking.BindTo(beatmap);
-                beatmapBacking.ValueChanged += _ => Scheduler.AddOnce(updateSelectedSet);
-            }
-
-            private void addBeatmapSet(BeatmapSetInfo obj)
-            {
-                if (obj == draggedItem?.BeatmapSetInfo) return;
-
-                Schedule(() => items.Insert(items.Count - 1, new PlaylistItem(obj) { OnSelect = set => Selected?.Invoke(set) }));
-            }
-
-            private void removeBeatmapSet(BeatmapSetInfo obj)
-            {
-                if (obj == draggedItem?.BeatmapSetInfo) return;
-
-                Schedule(() =>
-                {
-                    var itemToRemove = items.FirstOrDefault(i => i.BeatmapSetInfo.ID == obj.ID);
-                    if (itemToRemove != null)
-                        items.Remove(itemToRemove);
-                });
-            }
-
-            private void updateSelectedSet()
-            {
-                foreach (PlaylistItem s in items.Children)
-                {
-                    s.Selected = s.BeatmapSetInfo.ID == beatmapBacking.Value.BeatmapSetInfo?.ID;
-                    if (s.Selected)
-                        ScrollIntoView(s);
-                }
-            }
-
-            public string SearchTerm
-            {
-                get => search.SearchTerm;
-                set => search.SearchTerm = value;
-            }
-
-            public BeatmapSetInfo FirstVisibleSet => items.FirstOrDefault(i => i.MatchingFilter)?.BeatmapSetInfo;
-
-            private Vector2 nativeDragPosition;
-            private PlaylistItem draggedItem;
-
-            private int? dragDestination;
-
-            protected override bool OnDragStart(DragStartEvent e)
-            {
-                nativeDragPosition = e.ScreenSpaceMousePosition;
-                draggedItem = items.FirstOrDefault(d => d.IsDraggable);
-                return draggedItem != null || base.OnDragStart(e);
-            }
-
-            protected override void OnDrag(DragEvent e)
-            {
-                nativeDragPosition = e.ScreenSpaceMousePosition;
-
-                if (draggedItem == null)
-                    base.OnDrag(e);
-            }
-
-            protected override void OnDragEnd(DragEndEvent e)
-            {
-                nativeDragPosition = e.ScreenSpaceMousePosition;
-
-                if (draggedItem == null)
-                {
-                    base.OnDragEnd(e);
-                    return;
-                }
-
-                if (dragDestination != null)
-                    musicController.ChangeBeatmapSetPosition(draggedItem.BeatmapSetInfo, dragDestination.Value);
-
-                draggedItem = null;
-                dragDestination = null;
-            }
-
-            protected override void Update()
-            {
-                base.Update();
-
-                if (draggedItem == null)
-                    return;
-
-                updateScrollPosition();
-                updateDragPosition();
-            }
-
-            private void updateScrollPosition()
-            {
-                const float start_offset = 10;
-                const double max_power = 50;
-                const double exp_base = 1.05;
-
-                var localPos = ToLocalSpace(nativeDragPosition);
-
-                if (localPos.Y < start_offset)
-                {
-                    if (Current <= 0)
-                        return;
-
-                    var power = Math.Min(max_power, Math.Abs(start_offset - localPos.Y));
-                    ScrollBy(-(float)Math.Pow(exp_base, power));
-                }
-                else if (localPos.Y > DrawHeight - start_offset)
-                {
-                    if (IsScrolledToEnd())
-                        return;
-
-                    var power = Math.Min(max_power, Math.Abs(DrawHeight - start_offset - localPos.Y));
-                    ScrollBy((float)Math.Pow(exp_base, power));
-                }
-            }
-
-            private void updateDragPosition()
-            {
-                var itemsPos = items.ToLocalSpace(nativeDragPosition);
-
-                int srcIndex = (int)items.GetLayoutPosition(draggedItem);
-
-                // Find the last item with position < mouse position. Note we can't directly use
-                // the item positions as they are being transformed
-                float heightAccumulator = 0;
-                int dstIndex = 0;
-
-                for (; dstIndex < items.Count; dstIndex++)
-                {
-                    // Using BoundingBox here takes care of scale, paddings, etc...
-                    heightAccumulator += items[dstIndex].BoundingBox.Height;
-                    if (heightAccumulator > itemsPos.Y)
-                        break;
-                }
-
-                dstIndex = Math.Clamp(dstIndex, 0, items.Count - 1);
-
-                if (srcIndex == dstIndex)
-                    return;
-
-                if (srcIndex < dstIndex)
-                {
-                    for (int i = srcIndex + 1; i <= dstIndex; i++)
-                        items.SetLayoutPosition(items[i], i - 1);
-                }
-                else
-                {
-                    for (int i = dstIndex; i < srcIndex; i++)
-                        items.SetLayoutPosition(items[i], i + 1);
-                }
-
-                items.SetLayoutPosition(draggedItem, dstIndex);
-                dragDestination = dstIndex;
-            }
-
-            private class ItemSearchContainer : FillFlowContainer<PlaylistItem>, IHasFilterableChildren
-            {
-                public IEnumerable<string> FilterTerms => Array.Empty<string>();
-
-                public bool MatchingFilter
-                {
-                    set
-                    {
-                        if (value)
-                            InvalidateLayout();
-                    }
-                }
-
-                public bool FilteringActive
-                {
-                    set { }
-                }
-
-                public IEnumerable<IFilterable> FilterableChildren => Children;
-
-                public ItemSearchContainer()
-                {
-                    LayoutDuration = 200;
-                    LayoutEasing = Easing.OutQuint;
-                }
+                this.FadeTo(matching ? 1 : 0, 200);
             }
         }
+
+        public bool FilteringActive { get; set; }
     }
 }
diff --git a/osu.Game/Overlays/Music/PlaylistOverlay.cs b/osu.Game/Overlays/Music/PlaylistOverlay.cs
index b89a577282..ff1b26e335 100644
--- a/osu.Game/Overlays/Music/PlaylistOverlay.cs
+++ b/osu.Game/Overlays/Music/PlaylistOverlay.cs
@@ -21,12 +21,14 @@ namespace osu.Game.Overlays.Music
         private const float transition_duration = 600;
         private const float playlist_height = 510;
 
+        public readonly BindableList<BeatmapSetInfo> BeatmapSets = new BindableList<BeatmapSetInfo>();
+
         private readonly Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
         private BeatmapManager beatmaps;
 
         private FilterControl filter;
-        private PlaylistList list;
-
+        private PlaylistList2 list;
+        
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, Bindable<WorkingBeatmap> beatmap, BeatmapManager beatmaps)
         {
@@ -53,11 +55,11 @@ namespace osu.Game.Overlays.Music
                             Colour = colours.Gray3,
                             RelativeSizeAxes = Axes.Both,
                         },
-                        list = new PlaylistList
+                        list = new PlaylistList2
                         {
                             RelativeSizeAxes = Axes.Both,
                             Padding = new MarginPadding { Top = 95, Bottom = 10, Right = 10 },
-                            Selected = itemSelected,
+                            // Selected = itemSelected,
                         },
                         filter = new FilterControl
                         {
@@ -70,6 +72,8 @@ namespace osu.Game.Overlays.Music
                 },
             };
 
+            list.BeatmapSets.BindTo(BeatmapSets);
+
             filter.Search.OnCommit = (sender, newText) =>
             {
                 BeatmapInfo toSelect = list.FirstVisibleSet?.Beatmaps?.FirstOrDefault();

From b947e89a6b11946110ec66709657fc70bfbe73ec Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 28 Jan 2020 16:53:22 +0300
Subject: [PATCH 0029/1142] Add placeholder for no comments case in
 CommentsContainer

---
 .../Online/TestSceneCommentsContainer.cs      |  1 +
 .../Overlays/Comments/CommentsContainer.cs    | 33 +++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
index 3d63e2b07e..2af191945c 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
@@ -48,6 +48,7 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Airman comments", () => comments.ShowComments(CommentableType.Beatmapset, 24313));
             AddStep("Lazer build comments", () => comments.ShowComments(CommentableType.Build, 4772));
             AddStep("News comments", () => comments.ShowComments(CommentableType.NewsPost, 715));
+            AddStep("Beatmap with no comments", () => comments.ShowComments(CommentableType.Beatmapset, 1291));
             AddStep("Idle state", () =>
             {
                 scroll.Clear();
diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index 78df73eb0d..fd5c390f0f 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -12,6 +12,7 @@ using osu.Game.Online.API.Requests.Responses;
 using System.Threading;
 using System.Linq;
 using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Overlays.Comments
 {
@@ -34,6 +35,7 @@ namespace osu.Game.Overlays.Comments
         private DeletedChildrenPlaceholder deletedChildrenPlaceholder;
         private CommentsShowMoreButton moreButton;
         private TotalCommentsCounter commentCounter;
+        private Container noCommentsPlaceholder;
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
@@ -60,6 +62,27 @@ namespace osu.Game.Overlays.Comments
                             Sort = { BindTarget = Sort },
                             ShowDeleted = { BindTarget = ShowDeleted }
                         },
+                        noCommentsPlaceholder = new Container
+                        {
+                            Height = 80,
+                            RelativeSizeAxes = Axes.X,
+                            Alpha = 0,
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = colourProvider.Background4
+                                },
+                                new OsuSpriteText
+                                {
+                                    Anchor = Anchor.CentreLeft,
+                                    Origin = Anchor.CentreLeft,
+                                    Margin = new MarginPadding { Left = 50 },
+                                    Text = @"No comments yet."
+                                }
+                            }
+                        },
                         content = new FillFlowContainer
                         {
                             RelativeSizeAxes = Axes.X,
@@ -68,6 +91,7 @@ namespace osu.Game.Overlays.Comments
                         },
                         new Container
                         {
+                            Name = @"Footer",
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
                             Children = new Drawable[]
@@ -154,12 +178,21 @@ namespace osu.Game.Overlays.Comments
         {
             currentPage = 1;
             deletedChildrenPlaceholder.DeletedCount.Value = 0;
+            moreButton.Show();
             moreButton.IsLoading = true;
             content.Clear();
+            noCommentsPlaceholder.Hide();
         }
 
         private void onSuccess(CommentBundle response)
         {
+            if (!response.Comments.Any())
+            {
+                noCommentsPlaceholder.Show();
+                moreButton.Hide();
+                return;
+            }
+
             loadCancellation = new CancellationTokenSource();
 
             var page = new FillFlowContainer

From c5e0c77bcadb98cd252684dcb5adbb6c4fff9886 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 29 Jan 2020 06:08:11 +0300
Subject: [PATCH 0030/1142] Refactor NoCommentsPlaceholder

---
 .../Online/TestSceneCommentsContainer.cs      |  2 +-
 .../Overlays/Comments/CommentsContainer.cs    | 50 ++++++++++---------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
index 2af191945c..c81e850cc9 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Airman comments", () => comments.ShowComments(CommentableType.Beatmapset, 24313));
             AddStep("Lazer build comments", () => comments.ShowComments(CommentableType.Build, 4772));
             AddStep("News comments", () => comments.ShowComments(CommentableType.NewsPost, 715));
-            AddStep("Beatmap with no comments", () => comments.ShowComments(CommentableType.Beatmapset, 1291));
+            AddStep("Beatmap with no comments", () => comments.ShowComments(CommentableType.Beatmapset, 1288));
             AddStep("Idle state", () =>
             {
                 scroll.Clear();
diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index fd5c390f0f..6abb85088f 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -35,7 +35,6 @@ namespace osu.Game.Overlays.Comments
         private DeletedChildrenPlaceholder deletedChildrenPlaceholder;
         private CommentsShowMoreButton moreButton;
         private TotalCommentsCounter commentCounter;
-        private Container noCommentsPlaceholder;
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
@@ -62,27 +61,6 @@ namespace osu.Game.Overlays.Comments
                             Sort = { BindTarget = Sort },
                             ShowDeleted = { BindTarget = ShowDeleted }
                         },
-                        noCommentsPlaceholder = new Container
-                        {
-                            Height = 80,
-                            RelativeSizeAxes = Axes.X,
-                            Alpha = 0,
-                            Children = new Drawable[]
-                            {
-                                new Box
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Colour = colourProvider.Background4
-                                },
-                                new OsuSpriteText
-                                {
-                                    Anchor = Anchor.CentreLeft,
-                                    Origin = Anchor.CentreLeft,
-                                    Margin = new MarginPadding { Left = 50 },
-                                    Text = @"No comments yet."
-                                }
-                            }
-                        },
                         content = new FillFlowContainer
                         {
                             RelativeSizeAxes = Axes.X,
@@ -181,14 +159,13 @@ namespace osu.Game.Overlays.Comments
             moreButton.Show();
             moreButton.IsLoading = true;
             content.Clear();
-            noCommentsPlaceholder.Hide();
         }
 
         private void onSuccess(CommentBundle response)
         {
             if (!response.Comments.Any())
             {
-                noCommentsPlaceholder.Show();
+                content.Add(new NoCommentsPlaceholder());
                 moreButton.Hide();
                 return;
             }
@@ -240,5 +217,30 @@ namespace osu.Game.Overlays.Comments
             loadCancellation?.Cancel();
             base.Dispose(isDisposing);
         }
+
+        private class NoCommentsPlaceholder : CompositeDrawable
+        {
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                Height = 80;
+                RelativeSizeAxes = Axes.X;
+                AddRangeInternal(new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = colourProvider.Background4
+                    },
+                    new OsuSpriteText
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Margin = new MarginPadding { Left = 50 },
+                        Text = @"No comments yet."
+                    }
+                });
+            }
+        }
     }
 }

From ebf15c6a1ceacb45aae17b8c384eb7daf2236581 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 29 Jan 2020 12:17:03 +0900
Subject: [PATCH 0031/1142] General work towards completion + framework updates

---
 .../UserInterface/TestScenePlaylistOverlay.cs |   7 +
 osu.Game/Overlays/Music/PlaylistList.cs       | 197 ++++++++++++++++--
 osu.Game/Overlays/Music/PlaylistOverlay.cs    |  12 +-
 osu.Game/Overlays/NowPlayingOverlay.cs        |   1 +
 4 files changed, 200 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs
index a470244f53..986cf458ab 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -15,6 +16,12 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestScenePlaylistOverlay : OsuTestScene
     {
+        public override IReadOnlyList<Type> RequiredTypes => new Type[]
+        {
+            typeof(PlaylistOverlay),
+            typeof(PlaylistList)
+        };
+
         private readonly BindableList<BeatmapSetInfo> beatmapSets = new BindableList<BeatmapSetInfo>();
 
         [SetUp]
diff --git a/osu.Game/Overlays/Music/PlaylistList.cs b/osu.Game/Overlays/Music/PlaylistList.cs
index 5c091a21db..f7be69e1f2 100644
--- a/osu.Game/Overlays/Music/PlaylistList.cs
+++ b/osu.Game/Overlays/Music/PlaylistList.cs
@@ -8,14 +8,23 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Events;
+using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Music
 {
-    public class PlaylistList2 : BasicRearrangeableListContainer<PlaylistListItem>
+    public class PlaylistList : RearrangeableListContainer<PlaylistListItem>
     {
-        public readonly BindableList<BeatmapSetInfo> BeatmapSets = new BindableList<BeatmapSetInfo>();
+        public Action<BeatmapSetInfo> RequestSelection;
+
+        public readonly Bindable<BeatmapSetInfo> SelectedSet = new Bindable<BeatmapSetInfo>();
+        public readonly IBindableList<BeatmapSetInfo> BeatmapSets = new BindableList<BeatmapSetInfo>();
 
         public new MarginPadding Padding
         {
@@ -23,21 +32,35 @@ namespace osu.Game.Overlays.Music
             set => base.Padding = value;
         }
 
+        private readonly HashSet<BeatmapSetInfo> existingItems = new HashSet<BeatmapSetInfo>();
+
         [BackgroundDependencyLoader]
         private void load()
         {
             BeatmapSets.ItemsAdded += addBeatmapSets;
             BeatmapSets.ItemsRemoved += removeBeatmapSets;
+
+            foreach (var item in BeatmapSets)
+                addBeatmapSet(item);
         }
 
         public void Filter(string searchTerm) => ((PlaylistListFlowContainer)ListContainer).SearchTerm = searchTerm;
 
         public BeatmapSetInfo FirstVisibleSet => ListContainer.FlowingChildren.Cast<DrawablePlaylistListItem>().FirstOrDefault(i => i.MatchingFilter)?.Model.BeatmapSetInfo;
 
-        private void addBeatmapSets(IEnumerable<BeatmapSetInfo> sets) => Schedule(() =>
+        private void addBeatmapSets(IEnumerable<BeatmapSetInfo> sets)
         {
-            foreach (var item in sets)
-                AddItem(new PlaylistListItem(item));
+            foreach (var set in sets)
+                addBeatmapSet(set);
+        }
+
+        private void addBeatmapSet(BeatmapSetInfo set) => Schedule(() =>
+        {
+            if (existingItems.Contains(set))
+                return;
+
+            AddItem(new PlaylistListItem(set));
+            existingItems.Add(set);
         });
 
         private void removeBeatmapSets(IEnumerable<BeatmapSetInfo> sets) => Schedule(() =>
@@ -46,16 +69,23 @@ namespace osu.Game.Overlays.Music
                 RemoveItem(ListContainer.Children.Select(d => d.Model).FirstOrDefault(m => m.BeatmapSetInfo == item));
         });
 
-        protected override BasicDrawableRearrangeableListItem CreateBasicItem(PlaylistListItem item) => new DrawablePlaylistListItem(item);
-
-        protected override FillFlowContainer<DrawableRearrangeableListItem> CreateListFillFlowContainer() => new PlaylistListFlowContainer
+        protected override DrawableRearrangeableListItem<PlaylistListItem> CreateDrawable(PlaylistListItem item) => new DrawablePlaylistListItem(item)
         {
+            SelectedSet = { BindTarget = SelectedSet },
+            RequestSelection = set => RequestSelection?.Invoke(set)
+        };
+
+        protected override ScrollContainer<Drawable> CreateScrollContainer() => new OsuScrollContainer();
+
+        protected override FillFlowContainer<DrawableRearrangeableListItem<PlaylistListItem>> CreateListFillFlowContainer() => new PlaylistListFlowContainer
+        {
+            Spacing = new Vector2(0, 3),
             LayoutDuration = 200,
-            LayoutEasing = Easing.OutQuint
+            LayoutEasing = Easing.OutQuint,
         };
     }
 
-    public class PlaylistListFlowContainer : SearchContainer<RearrangeableListContainer<PlaylistListItem>.DrawableRearrangeableListItem>
+    public class PlaylistListFlowContainer : SearchContainer<DrawableRearrangeableListItem<PlaylistListItem>>
     {
     }
 
@@ -73,14 +103,118 @@ namespace osu.Game.Overlays.Music
         public bool Equals(PlaylistListItem other) => BeatmapSetInfo.Equals(other?.BeatmapSetInfo);
     }
 
-    public class DrawablePlaylistListItem : BasicRearrangeableListContainer<PlaylistListItem>.BasicDrawableRearrangeableListItem, IFilterable
+    public class DrawablePlaylistListItem : DrawableRearrangeableListItem<PlaylistListItem>, IFilterable
     {
+        private const float fade_duration = 100;
+
+        public readonly Bindable<BeatmapSetInfo> SelectedSet = new Bindable<BeatmapSetInfo>();
+        public Action<BeatmapSetInfo> RequestSelection;
+
+        private PlaylistItemHandle handle;
+        private TextFlowContainer text;
+        private IEnumerable<Drawable> titleSprites;
+        private ILocalisedBindableString titleBind;
+        private ILocalisedBindableString artistBind;
+
+        private Color4 hoverColour;
+        private Color4 artistColour;
+
         public DrawablePlaylistListItem(PlaylistListItem item)
             : base(item)
         {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+
+            Padding = new MarginPadding { Left = 5 };
+
             FilterTerms = item.BeatmapSetInfo.Metadata.SearchableTerms;
         }
 
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours, LocalisationManager localisation)
+        {
+            hoverColour = colours.Yellow;
+            artistColour = colours.Gray9;
+
+            InternalChild = new GridContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Content = new[]
+                {
+                    new Drawable[]
+                    {
+                        handle = new PlaylistItemHandle
+                        {
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            Size = new Vector2(12),
+                            Colour = colours.Gray5,
+                            Alpha = 0
+                        },
+                        text = new OsuTextFlowContainer
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Padding = new MarginPadding { Left = 5 },
+                        },
+                    }
+                },
+                ColumnDimensions = new[] { new Dimension(GridSizeMode.AutoSize) },
+                RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
+            };
+
+            titleBind = localisation.GetLocalisedString(new LocalisedString((Model.BeatmapSetInfo.Metadata.TitleUnicode, Model.BeatmapSetInfo.Metadata.Title)));
+            artistBind = localisation.GetLocalisedString(new LocalisedString((Model.BeatmapSetInfo.Metadata.ArtistUnicode, Model.BeatmapSetInfo.Metadata.Artist)));
+
+            artistBind.BindValueChanged(_ => recreateText(), true);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            SelectedSet.BindValueChanged(set =>
+            {
+                if (set.OldValue != Model.BeatmapSetInfo && set.NewValue != Model.BeatmapSetInfo)
+                    return;
+
+                foreach (Drawable s in titleSprites)
+                    s.FadeColour(set.NewValue == Model.BeatmapSetInfo ? hoverColour : Color4.White, fade_duration);
+            }, true);
+        }
+
+        private void recreateText()
+        {
+            text.Clear();
+
+            //space after the title to put a space between the title and artist
+            titleSprites = text.AddText(titleBind.Value + @"  ", sprite => sprite.Font = OsuFont.GetFont(weight: FontWeight.Regular)).OfType<SpriteText>();
+
+            text.AddText(artistBind.Value, sprite =>
+            {
+                sprite.Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold);
+                sprite.Colour = artistColour;
+                sprite.Padding = new MarginPadding { Top = 1 };
+            });
+        }
+
+        protected override bool OnClick(ClickEvent e)
+        {
+            RequestSelection?.Invoke(Model.BeatmapSetInfo);
+            return true;
+        }
+
+        protected override bool IsDraggableAt(Vector2 screenSpacePos) => handle.HandlingDrag;
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            handle.UpdateHoverState(true);
+            return base.OnHover(e);
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e) => handle.UpdateHoverState(false);
+
         public IEnumerable<string> FilterTerms { get; }
 
         private bool matching = true;
@@ -99,5 +233,44 @@ namespace osu.Game.Overlays.Music
         }
 
         public bool FilteringActive { get; set; }
+
+        private class PlaylistItemHandle : SpriteIcon
+        {
+            public bool HandlingDrag { get; private set; }
+            private bool isHovering;
+
+            public PlaylistItemHandle()
+            {
+                Icon = FontAwesome.Solid.Bars;
+            }
+
+            protected override bool OnMouseDown(MouseDownEvent e)
+            {
+                base.OnMouseDown(e);
+
+                HandlingDrag = true;
+                UpdateHoverState(isHovering);
+
+                return false;
+            }
+
+            protected override void OnMouseUp(MouseUpEvent e)
+            {
+                base.OnMouseUp(e);
+
+                HandlingDrag = false;
+                UpdateHoverState(isHovering);
+            }
+
+            public void UpdateHoverState(bool hovering)
+            {
+                isHovering = hovering;
+
+                if (isHovering || HandlingDrag)
+                    this.FadeIn(fade_duration);
+                else
+                    this.FadeOut(fade_duration);
+            }
+        }
     }
 }
diff --git a/osu.Game/Overlays/Music/PlaylistOverlay.cs b/osu.Game/Overlays/Music/PlaylistOverlay.cs
index ff1b26e335..87abbd142c 100644
--- a/osu.Game/Overlays/Music/PlaylistOverlay.cs
+++ b/osu.Game/Overlays/Music/PlaylistOverlay.cs
@@ -21,14 +21,14 @@ namespace osu.Game.Overlays.Music
         private const float transition_duration = 600;
         private const float playlist_height = 510;
 
-        public readonly BindableList<BeatmapSetInfo> BeatmapSets = new BindableList<BeatmapSetInfo>();
+        public readonly IBindableList<BeatmapSetInfo> BeatmapSets = new BindableList<BeatmapSetInfo>();
 
         private readonly Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
         private BeatmapManager beatmaps;
 
         private FilterControl filter;
-        private PlaylistList2 list;
-        
+        private PlaylistList list;
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, Bindable<WorkingBeatmap> beatmap, BeatmapManager beatmaps)
         {
@@ -55,11 +55,11 @@ namespace osu.Game.Overlays.Music
                             Colour = colours.Gray3,
                             RelativeSizeAxes = Axes.Both,
                         },
-                        list = new PlaylistList2
+                        list = new PlaylistList
                         {
                             RelativeSizeAxes = Axes.Both,
                             Padding = new MarginPadding { Top = 95, Bottom = 10, Right = 10 },
-                            // Selected = itemSelected,
+                            RequestSelection = itemSelected
                         },
                         filter = new FilterControl
                         {
@@ -84,6 +84,8 @@ namespace osu.Game.Overlays.Music
                     beatmap.Value.Track.Restart();
                 }
             };
+
+            beatmap.BindValueChanged(working => list.SelectedSet.Value = working.NewValue.BeatmapSetInfo, true);
         }
 
         protected override void PopIn()
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index 042e95c6d7..dfcf99d30c 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -183,6 +183,7 @@ namespace osu.Game.Overlays
                 }
             };
 
+            playlist.BeatmapSets.BindTo(musicController.BeatmapSets);
             playlist.State.ValueChanged += s => playlistButton.FadeColour(s.NewValue == Visibility.Visible ? colours.Yellow : Color4.White, 200, Easing.OutQuint);
         }
 

From e7964023aed0a6d8eeebd6762de8e6e6aff04ad1 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 29 Jan 2020 06:22:08 +0300
Subject: [PATCH 0032/1142] Implement CommentsPage class

---
 .../Overlays/Comments/CommentsContainer.cs    | 54 +------------
 osu.Game/Overlays/Comments/CommentsPage.cs    | 76 +++++++++++++++++++
 2 files changed, 79 insertions(+), 51 deletions(-)
 create mode 100644 osu.Game/Overlays/Comments/CommentsPage.cs

diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index 6abb85088f..0e307d4d0d 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -12,7 +12,6 @@ using osu.Game.Online.API.Requests.Responses;
 using System.Threading;
 using System.Linq;
 using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Overlays.Comments
 {
@@ -163,34 +162,12 @@ namespace osu.Game.Overlays.Comments
 
         private void onSuccess(CommentBundle response)
         {
-            if (!response.Comments.Any())
-            {
-                content.Add(new NoCommentsPlaceholder());
-                moreButton.Hide();
-                return;
-            }
-
             loadCancellation = new CancellationTokenSource();
 
-            var page = new FillFlowContainer
+            LoadComponentAsync(new CommentsPage(response)
             {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                Direction = FillDirection.Vertical,
-            };
-
-            foreach (var c in response.Comments)
-            {
-                if (c.IsTopLevel)
-                {
-                    page.Add(new DrawableComment(c)
-                    {
-                        ShowDeleted = { BindTarget = ShowDeleted }
-                    });
-                }
-            }
-
-            LoadComponentAsync(page, loaded =>
+                ShowDeleted = { BindTarget = ShowDeleted }
+            }, loaded =>
             {
                 content.Add(loaded);
 
@@ -217,30 +194,5 @@ namespace osu.Game.Overlays.Comments
             loadCancellation?.Cancel();
             base.Dispose(isDisposing);
         }
-
-        private class NoCommentsPlaceholder : CompositeDrawable
-        {
-            [BackgroundDependencyLoader]
-            private void load(OverlayColourProvider colourProvider)
-            {
-                Height = 80;
-                RelativeSizeAxes = Axes.X;
-                AddRangeInternal(new Drawable[]
-                {
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = colourProvider.Background4
-                    },
-                    new OsuSpriteText
-                    {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        Margin = new MarginPadding { Left = 50 },
-                        Text = @"No comments yet."
-                    }
-                });
-            }
-        }
     }
 }
diff --git a/osu.Game/Overlays/Comments/CommentsPage.cs b/osu.Game/Overlays/Comments/CommentsPage.cs
new file mode 100644
index 0000000000..1bc9c89dfc
--- /dev/null
+++ b/osu.Game/Overlays/Comments/CommentsPage.cs
@@ -0,0 +1,76 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
+using osu.Framework.Bindables;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Sprites;
+using System.Linq;
+
+namespace osu.Game.Overlays.Comments
+{
+    public class CommentsPage : FillFlowContainer
+    {
+        public readonly BindableBool ShowDeleted = new BindableBool();
+
+        private readonly CommentBundle commentBundle;
+
+        public CommentsPage(CommentBundle commentBundle)
+        {
+            this.commentBundle = commentBundle;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            Direction = FillDirection.Vertical;
+
+            if (!commentBundle.Comments.Any())
+            {
+                Add(new NoCommentsPlaceholder());
+                return;
+            }
+
+            foreach (var c in commentBundle.Comments)
+            {
+                if (c.IsTopLevel)
+                {
+                    Add(new DrawableComment(c)
+                    {
+                        ShowDeleted = { BindTarget = ShowDeleted }
+                    });
+                }
+            }
+        }
+
+        private class NoCommentsPlaceholder : CompositeDrawable
+        {
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                Height = 80;
+                RelativeSizeAxes = Axes.X;
+                AddRangeInternal(new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = colourProvider.Background4
+                    },
+                    new OsuSpriteText
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Margin = new MarginPadding { Left = 50 },
+                        Text = @"No comments yet."
+                    }
+                });
+            }
+        }
+    }
+}

From dc10e58b4f1f4c4e39fa68ebefdf88f919855905 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 29 Jan 2020 06:44:39 +0300
Subject: [PATCH 0033/1142] Add tests for CommentsPage

---
 .../Online/TestSceneCommentsContainer.cs      |   3 +-
 .../Visual/Online/TestSceneCommentsPage.cs    | 165 ++++++++++++++++++
 .../Online/API/Requests/Responses/Comment.cs  |   6 +-
 .../API/Requests/Responses/CommentBundle.cs   |  20 ++-
 osu.Game/Overlays/Comments/DrawableComment.cs |   4 +-
 5 files changed, 184 insertions(+), 14 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneCommentsPage.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
index c81e850cc9..c877176adf 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
@@ -25,7 +25,8 @@ namespace osu.Game.Tests.Visual.Online
             typeof(SortTabControl),
             typeof(ShowChildrenButton),
             typeof(DeletedChildrenPlaceholder),
-            typeof(VotePill)
+            typeof(VotePill),
+            typeof(CommentsPage),
         };
 
         protected override bool UseOnlineAPI => true;
diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsPage.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsPage.cs
new file mode 100644
index 0000000000..706b1ca1ba
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsPage.cs
@@ -0,0 +1,165 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using osu.Game.Overlays.Comments;
+using osu.Game.Overlays;
+using osu.Framework.Allocation;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Users;
+using osu.Game.Graphics.UserInterface;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneCommentsPage : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(DrawableComment),
+            typeof(CommentsPage),
+        };
+
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
+
+        private readonly BindableBool showDeleted = new BindableBool();
+        private readonly Container content;
+
+        public TestSceneCommentsPage()
+        {
+            AddRange(new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Black,
+                },
+                new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Y,
+                    RelativeSizeAxes = Axes.X,
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
+                    {
+                        new OsuCheckbox
+                        {
+                            Current = showDeleted,
+                            LabelText = @"Show Deleted"
+                        },
+                        content = new Container
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                        }
+                    }
+                }
+            });
+
+            AddStep("load comments", () => createPage(comment_bundle));
+            AddStep("load empty comments", () => createPage(empty_comment_bundle));
+        }
+
+        private void createPage(CommentBundle commentBundle)
+        {
+            content.Clear();
+            content.Add(new CommentsPage(commentBundle)
+            {
+                ShowDeleted = { BindTarget = showDeleted }
+            });
+        }
+
+        private static readonly CommentBundle empty_comment_bundle = new CommentBundle
+        {
+            Comments = new List<Comment>(),
+            Total = 0,
+        };
+
+        private static readonly CommentBundle comment_bundle = new CommentBundle
+        {
+            Comments = new List<Comment>
+            {
+                new Comment
+                {
+                    Id = 1,
+                    Message = "Simple test comment",
+                    LegacyName = "TestUser1",
+                    CreatedAt = DateTimeOffset.Now,
+                    VotesCount = 5
+                },
+                new Comment
+                {
+                    Id = 2,
+                    Message = "This comment has been deleted :( but visible for admins",
+                    LegacyName = "TestUser2",
+                    CreatedAt = DateTimeOffset.Now,
+                    DeletedAt = DateTimeOffset.Now,
+                    VotesCount = 5
+                },
+                new Comment
+                {
+                    Id = 3,
+                    Message = "This comment is a top level",
+                    LegacyName = "TestUser3",
+                    CreatedAt = DateTimeOffset.Now,
+                    RepliesCount = 2,
+                },
+                new Comment
+                {
+                    Id = 4,
+                    ParentId = 3,
+                    Message = "And this is a reply",
+                    RepliesCount = 1,
+                    LegacyName = "TestUser1",
+                    CreatedAt = DateTimeOffset.Now,
+                },
+                new Comment
+                {
+                    Id = 15,
+                    ParentId = 4,
+                    Message = "Reply to reply",
+                    LegacyName = "TestUser1",
+                    CreatedAt = DateTimeOffset.Now,
+                },
+                new Comment
+                {
+                    Id = 6,
+                    ParentId = 3,
+                    LegacyName = "TestUser11515",
+                    CreatedAt = DateTimeOffset.Now,
+                    DeletedAt = DateTimeOffset.Now,
+                },
+                new Comment
+                {
+                    Id = 5,
+                    Message = "This comment is voted and edited",
+                    LegacyName = "BigBrainUser",
+                    CreatedAt = DateTimeOffset.Now,
+                    EditedAt = DateTimeOffset.Now,
+                    VotesCount = 1000,
+                    EditedById = 1,
+                }
+            },
+            IncludedComments = new List<Comment>(),
+            UserVotes = new List<long>
+            {
+                5
+            },
+            Users = new List<User>
+            {
+                new User
+                {
+                    Id = 1,
+                    Username = "Good_Admin"
+                }
+            },
+            TopLevelCount = 4,
+            Total = 7
+        };
+    }
+}
diff --git a/osu.Game/Online/API/Requests/Responses/Comment.cs b/osu.Game/Online/API/Requests/Responses/Comment.cs
index 5510e9afff..3e38c3067b 100644
--- a/osu.Game/Online/API/Requests/Responses/Comment.cs
+++ b/osu.Game/Online/API/Requests/Responses/Comment.cs
@@ -6,8 +6,6 @@ using osu.Game.Users;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net;
-using System.Text.RegularExpressions;
 
 namespace osu.Game.Online.API.Requests.Responses
 {
@@ -70,12 +68,10 @@ namespace osu.Game.Online.API.Requests.Responses
 
         public bool IsDeleted => DeletedAt.HasValue;
 
-        public bool HasMessage => !string.IsNullOrEmpty(MessageHtml);
+        public bool HasMessage => !string.IsNullOrEmpty(Message);
 
         public bool IsVoted { get; set; }
 
-        public string GetMessage => HasMessage ? WebUtility.HtmlDecode(Regex.Replace(MessageHtml, @"<(.|\n)*?>", string.Empty)) : string.Empty;
-
         public int DeletedChildrenCount => ChildComments.Count(c => c.IsDeleted);
     }
 }
diff --git a/osu.Game/Online/API/Requests/Responses/CommentBundle.cs b/osu.Game/Online/API/Requests/Responses/CommentBundle.cs
index 8db5d8d6ad..c3dc775bd0 100644
--- a/osu.Game/Online/API/Requests/Responses/CommentBundle.cs
+++ b/osu.Game/Online/API/Requests/Responses/CommentBundle.cs
@@ -47,17 +47,25 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty(@"included_comments")]
         public List<Comment> IncludedComments { get; set; }
 
+        private List<long> userVotes;
+
         [JsonProperty(@"user_votes")]
-        private List<long> userVotes
+        public List<long> UserVotes
         {
-            set => value.ForEach(v =>
+            get => userVotes;
+            set
             {
-                Comments.ForEach(c =>
+                userVotes = value;
+
+                value.ForEach(v =>
                 {
-                    if (v == c.Id)
-                        c.IsVoted = true;
+                    Comments.ForEach(c =>
+                    {
+                        if (v == c.Id)
+                            c.IsVoted = true;
+                    });
                 });
-            });
+            }
         }
 
         private List<User> users;
diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index bdae9da226..d77ba5e298 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -213,7 +213,7 @@ namespace osu.Game.Overlays.Comments
 
             if (comment.HasMessage)
             {
-                var formattedSource = MessageFormatter.FormatText(comment.GetMessage);
+                var formattedSource = MessageFormatter.FormatText(comment.Message);
                 message.AddLinks(formattedSource.Text, formattedSource.Links);
             }
 
@@ -343,7 +343,7 @@ namespace osu.Game.Overlays.Comments
                 if (parentComment == null)
                     return string.Empty;
 
-                return parentComment.HasMessage ? parentComment.GetMessage : parentComment.IsDeleted ? @"deleted" : string.Empty;
+                return parentComment.HasMessage ? parentComment.Message : parentComment.IsDeleted ? @"deleted" : string.Empty;
             }
         }
     }

From 5fcda013469f133efb573496fd0a398c65621785 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 29 Jan 2020 06:58:53 +0300
Subject: [PATCH 0034/1142] Cleanup pass

---
 .../Visual/Online/TestSceneCommentsPage.cs    | 35 +++++++++----------
 osu.Game/Overlays/Comments/CommentsPage.cs    | 26 +++++++++++---
 2 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsPage.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsPage.cs
index 706b1ca1ba..1217ce6b42 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsPage.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsPage.cs
@@ -12,8 +12,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Shapes;
-using osuTK.Graphics;
+using osuTK;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -33,30 +32,28 @@ namespace osu.Game.Tests.Visual.Online
 
         public TestSceneCommentsPage()
         {
-            AddRange(new Drawable[]
+            Add(new FillFlowContainer
             {
-                new Box
+                AutoSizeAxes = Axes.Y,
+                RelativeSizeAxes = Axes.X,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 10),
+                Children = new Drawable[]
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = Color4.Black,
-                },
-                new FillFlowContainer
-                {
-                    AutoSizeAxes = Axes.Y,
-                    RelativeSizeAxes = Axes.X,
-                    Direction = FillDirection.Vertical,
-                    Children = new Drawable[]
+                    new Container
                     {
-                        new OsuCheckbox
+                        AutoSizeAxes = Axes.Y,
+                        Width = 200,
+                        Child = new OsuCheckbox
                         {
                             Current = showDeleted,
                             LabelText = @"Show Deleted"
-                        },
-                        content = new Container
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
                         }
+                    },
+                    content = new Container
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
                     }
                 }
             });
diff --git a/osu.Game/Overlays/Comments/CommentsPage.cs b/osu.Game/Overlays/Comments/CommentsPage.cs
index 1bc9c89dfc..153ce676eb 100644
--- a/osu.Game/Overlays/Comments/CommentsPage.cs
+++ b/osu.Game/Overlays/Comments/CommentsPage.cs
@@ -12,7 +12,7 @@ using System.Linq;
 
 namespace osu.Game.Overlays.Comments
 {
-    public class CommentsPage : FillFlowContainer
+    public class CommentsPage : CompositeDrawable
     {
         public readonly BindableBool ShowDeleted = new BindableBool();
 
@@ -24,15 +24,31 @@ namespace osu.Game.Overlays.Comments
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OverlayColourProvider colourProvider)
         {
+            FillFlowContainer flow;
+
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
-            Direction = FillDirection.Vertical;
+
+            AddRangeInternal(new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colourProvider.Background5
+                },
+                flow = new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Vertical,
+                }
+            });
 
             if (!commentBundle.Comments.Any())
             {
-                Add(new NoCommentsPlaceholder());
+                flow.Add(new NoCommentsPlaceholder());
                 return;
             }
 
@@ -40,7 +56,7 @@ namespace osu.Game.Overlays.Comments
             {
                 if (c.IsTopLevel)
                 {
-                    Add(new DrawableComment(c)
+                    flow.Add(new DrawableComment(c)
                     {
                         ShowDeleted = { BindTarget = ShowDeleted }
                     });

From 7588c574a21e7a0a54a509f4c50013714769f810 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 29 Jan 2020 19:37:54 +0900
Subject: [PATCH 0035/1142] Fix presenting a beatmap from a different ruleset
 not working

---
 .../Navigation/TestScenePresentBeatmap.cs     |  1 -
 osu.Game/Screens/Select/SongSelect.cs         | 39 +++++++++++--------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs b/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs
index de330004c2..909409835c 100644
--- a/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs
@@ -30,7 +30,6 @@ namespace osu.Game.Tests.Visual.Navigation
         }
 
         [Test]
-        [Ignore("will be fixed soon")]
         public void TestFromMainMenuDifferentRuleset()
         {
             var firstImport = importBeatmap(1);
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index a5352c4eeb..a1959ff17d 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -277,7 +277,7 @@ namespace osu.Game.Screens.Select
             // if not the current screen, we want to get carousel in a good presentation state before displaying (resume or enter).
             bool shouldDebounce = this.IsCurrentScreen();
 
-            Schedule(() => Carousel.Filter(criteria, shouldDebounce));
+            Carousel.Filter(criteria, shouldDebounce);
         }
 
         private DependencyContainer dependencies;
@@ -310,8 +310,10 @@ namespace osu.Game.Screens.Select
             if (!Carousel.BeatmapSetsLoaded)
                 return;
 
-            // if we have a pending filter operation, we want to run it now.
-            // it could change selection (ie. if the ruleset has been changed).
+            transferRulesetValue();
+
+            // while transferRulesetValue will flush, it only does so if the ruleset changes.
+            // the user could have changed a filter, and we want to ensure we are 100% up-to-date and consistent here.
             Carousel.FlushPendingFilterOperations();
 
             // avoid attempting to continue before a selection has been obtained.
@@ -397,20 +399,10 @@ namespace osu.Game.Screens.Select
             {
                 Logger.Log($"updating selection with beatmap:{beatmap?.ID.ToString() ?? "null"} ruleset:{ruleset?.ID.ToString() ?? "null"}");
 
-                if (ruleset?.Equals(decoupledRuleset.Value) == false)
+                if (transferRulesetValue())
                 {
-                    Logger.Log($"ruleset changed from \"{decoupledRuleset.Value}\" to \"{ruleset}\"");
-
+                    // if the ruleset changed, the rest of the selection update will happen via updateSelectedRuleset.
                     Mods.Value = Array.Empty<Mod>();
-                    decoupledRuleset.Value = ruleset;
-
-                    // force a filter before attempting to change the beatmap.
-                    // we may still be in the wrong ruleset as there is a debounce delay on ruleset changes.
-                    Carousel.Filter(null, false);
-
-                    // Filtering only completes after the carousel runs Update.
-                    // If we also have a pending beatmap change we should delay it one frame.
-                    selectionChangedDebounce = Schedule(run);
                     return;
                 }
 
@@ -634,6 +626,7 @@ namespace osu.Game.Screens.Select
 
             // manual binding to parent ruleset to allow for delayed load in the incoming direction.
             transferRulesetValue();
+
             Ruleset.ValueChanged += r => updateSelectedRuleset(r.NewValue);
 
             decoupledRuleset.ValueChanged += r => Ruleset.Value = r.NewValue;
@@ -645,9 +638,23 @@ namespace osu.Game.Screens.Select
             boundLocalBindables = true;
         }
 
-        private void transferRulesetValue()
+        /// <summary>
+        /// Transfer the game-wide ruleset to the local decoupled ruleset.
+        /// Will immediately run filter operations is required.
+        /// </summary>
+        /// <returns>Whether a transfer occurred.</returns>
+        private bool transferRulesetValue()
         {
+            if (decoupledRuleset.Value?.Equals(Ruleset.Value) == true)
+                return false;
+
+            Logger.Log($"decoupled ruleset transferred (\"{decoupledRuleset.Value}\" -> \"{Ruleset.Value}\"");
             rulesetNoDebounce = decoupledRuleset.Value = Ruleset.Value;
+
+            // if we have a pending filter operation, we want to run it now.
+            // it could change selection (ie. if the ruleset has been changed).
+            Carousel?.FlushPendingFilterOperations();
+            return true;
         }
 
         private void delete(BeatmapSetInfo beatmap)

From 3d6e00095edc737f247b6a93e20b4608d0206b7b Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 29 Jan 2020 14:08:10 +0300
Subject: [PATCH 0036/1142] Remove useless test

---
 osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
index c877176adf..de6f7fd29d 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
@@ -49,7 +49,6 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Airman comments", () => comments.ShowComments(CommentableType.Beatmapset, 24313));
             AddStep("Lazer build comments", () => comments.ShowComments(CommentableType.Build, 4772));
             AddStep("News comments", () => comments.ShowComments(CommentableType.NewsPost, 715));
-            AddStep("Beatmap with no comments", () => comments.ShowComments(CommentableType.Beatmapset, 1288));
             AddStep("Idle state", () =>
             {
                 scroll.Clear();

From 13eb32fea25b0e02d8e4e0a8af9a7b0c5c3a2c1e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 29 Jan 2020 22:20:34 +0900
Subject: [PATCH 0037/1142] Fix editor being accessible for multiplayer song
 select

---
 osu.Game/Screens/Select/MatchSongSelect.cs |  2 ++
 osu.Game/Screens/Select/SongSelect.cs      | 15 +++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index c5fa9e2396..a78477c771 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -24,6 +24,8 @@ namespace osu.Game.Screens.Select
         [Resolved(typeof(Room))]
         protected Bindable<PlaylistItem> CurrentItem { get; private set; }
 
+        public override bool AllowEditing => false;
+
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index a5352c4eeb..f36b7ae059 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -35,6 +35,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
+using osu.Game.Overlays.Notifications;
 using osu.Game.Scoring;
 
 namespace osu.Game.Screens.Select
@@ -66,6 +67,14 @@ namespace osu.Game.Screens.Select
         /// </summary>
         protected Container FooterPanels { get; private set; }
 
+        /// <summary>
+        /// Whether entering editor mode should be allowed.
+        /// </summary>
+        public virtual bool AllowEditing => true;
+
+        [Resolved]
+        private NotificationOverlay notificationOverlay { get; set; }
+
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap.Value);
 
         protected BeatmapCarousel Carousel { get; private set; }
@@ -295,6 +304,12 @@ namespace osu.Game.Screens.Select
 
         public void Edit(BeatmapInfo beatmap = null)
         {
+            if (!AllowEditing)
+            {
+                notificationOverlay?.Post(new SimpleNotification { Text = "Editing is not available from the current mode." });
+                return;
+            }
+
             Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap ?? beatmapNoDebounce);
             this.Push(new Editor());
         }

From da6952407ea04b5f4e752c0d2587b77d4f3ce103 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 29 Jan 2020 23:01:57 +0900
Subject: [PATCH 0038/1142] Allow null DI

---
 osu.Game/Screens/Select/SongSelect.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index f36b7ae059..74a4aea033 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Screens.Select
         /// </summary>
         public virtual bool AllowEditing => true;
 
-        [Resolved]
+        [Resolved(canBeNull: true)]
         private NotificationOverlay notificationOverlay { get; set; }
 
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap.Value);

From 786ed038683f49ebd105b7668da9b95007c4e6d1 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 29 Jan 2020 21:01:40 +0300
Subject: [PATCH 0039/1142] Update profile recent activities in line with the
 web design

---
 .../Online/TestSceneHistoricalSection.cs      |   6 +-
 .../TestSceneUserProfileRecentSection.cs      |   5 +
 .../Sections/BeatmapMetadataContainer.cs      |   2 +-
 .../Profile/Sections/DrawableProfileRow.cs    | 124 ------------------
 .../Sections/Recent/DrawableRecentActivity.cs |  78 +++++++----
 .../Profile/Sections/Recent/MedalIcon.cs      |   3 +-
 .../PaginatedRecentActivityContainer.cs       |   4 +-
 7 files changed, 68 insertions(+), 154 deletions(-)
 delete mode 100644 osu.Game/Overlays/Profile/Sections/DrawableProfileRow.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneHistoricalSection.cs b/osu.Game.Tests/Visual/Online/TestSceneHistoricalSection.cs
index d3b037f499..5825bc72f7 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneHistoricalSection.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneHistoricalSection.cs
@@ -4,10 +4,12 @@
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
+using osu.Game.Overlays;
 using osu.Game.Overlays.Profile.Sections;
 using osu.Game.Overlays.Profile.Sections.Historical;
 using osu.Game.Users;
@@ -24,9 +26,11 @@ namespace osu.Game.Tests.Visual.Online
             typeof(HistoricalSection),
             typeof(PaginatedMostPlayedBeatmapContainer),
             typeof(DrawableMostPlayedBeatmap),
-            typeof(DrawableProfileRow)
         };
 
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
+
         public TestSceneHistoricalSection()
         {
             HistoricalSection section;
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileRecentSection.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileRecentSection.cs
index f022425bf6..532aaa9c92 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileRecentSection.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileRecentSection.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -12,6 +13,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays;
 using osu.Game.Overlays.Profile.Sections;
 using osu.Game.Overlays.Profile.Sections.Recent;
 
@@ -28,6 +30,9 @@ namespace osu.Game.Tests.Visual.Online
             typeof(MedalIcon)
         };
 
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
+
         public TestSceneUserProfileRecentSection()
         {
             Children = new Drawable[]
diff --git a/osu.Game/Overlays/Profile/Sections/BeatmapMetadataContainer.cs b/osu.Game/Overlays/Profile/Sections/BeatmapMetadataContainer.cs
index 13b547eed3..67a976fe6f 100644
--- a/osu.Game/Overlays/Profile/Sections/BeatmapMetadataContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/BeatmapMetadataContainer.cs
@@ -10,7 +10,7 @@ using osu.Game.Graphics.Containers;
 namespace osu.Game.Overlays.Profile.Sections
 {
     /// <summary>
-    /// Display artist/title/mapper information, commonly used as the left portion of a profile or score display row (see <see cref="DrawableProfileRow"/>).
+    /// Display artist/title/mapper information, commonly used as the left portion of a profile or score display row.
     /// </summary>
     public abstract class BeatmapMetadataContainer : OsuHoverContainer
     {
diff --git a/osu.Game/Overlays/Profile/Sections/DrawableProfileRow.cs b/osu.Game/Overlays/Profile/Sections/DrawableProfileRow.cs
deleted file mode 100644
index 03ee29d0c2..0000000000
--- a/osu.Game/Overlays/Profile/Sections/DrawableProfileRow.cs
+++ /dev/null
@@ -1,124 +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.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Effects;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input.Events;
-using osu.Game.Graphics;
-using osuTK;
-using osuTK.Graphics;
-
-namespace osu.Game.Overlays.Profile.Sections
-{
-    public abstract class DrawableProfileRow : Container
-    {
-        private const int fade_duration = 200;
-
-        private Box underscoreLine;
-        private Box coloredBackground;
-        private Container background;
-
-        /// <summary>
-        /// A visual element displayed to the left of <see cref="LeftFlowContainer"/> content.
-        /// </summary>
-        protected abstract Drawable CreateLeftVisual();
-
-        protected FillFlowContainer LeftFlowContainer { get; private set; }
-        protected FillFlowContainer RightFlowContainer { get; private set; }
-
-        protected override Container<Drawable> Content { get; }
-
-        protected DrawableProfileRow()
-        {
-            RelativeSizeAxes = Axes.X;
-            Height = 60;
-
-            Content = new Container
-            {
-                RelativeSizeAxes = Axes.Both,
-                Anchor = Anchor.TopCentre,
-                Origin = Anchor.TopCentre,
-                Width = 0.97f,
-            };
-        }
-
-        [BackgroundDependencyLoader(true)]
-        private void load(OsuColour colour)
-        {
-            InternalChildren = new Drawable[]
-            {
-                background = new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    CornerRadius = 3,
-                    Alpha = 0,
-                    EdgeEffect = new EdgeEffectParameters
-                    {
-                        Type = EdgeEffectType.Shadow,
-                        Offset = new Vector2(0f, 1f),
-                        Radius = 1f,
-                        Colour = Color4.Black.Opacity(0.2f),
-                    },
-                    Child = coloredBackground = new Box { RelativeSizeAxes = Axes.Both }
-                },
-                Content,
-                underscoreLine = new Box
-                {
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.BottomCentre,
-                    RelativeSizeAxes = Axes.X,
-                    Height = 1,
-                },
-                new FillFlowContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Direction = FillDirection.Horizontal,
-                    Children = new[]
-                    {
-                        CreateLeftVisual(),
-                        LeftFlowContainer = new FillFlowContainer
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.CentreLeft,
-                            Margin = new MarginPadding { Left = 10 },
-                            Direction = FillDirection.Vertical,
-                        },
-                    }
-                },
-                RightFlowContainer = new FillFlowContainer
-                {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Anchor = Anchor.CentreRight,
-                    Origin = Anchor.CentreRight,
-                    Direction = FillDirection.Vertical,
-                },
-            };
-
-            coloredBackground.Colour = underscoreLine.Colour = colour.Gray4;
-        }
-
-        protected override bool OnClick(ClickEvent e) => true;
-
-        protected override bool OnHover(HoverEvent e)
-        {
-            background.FadeIn(fade_duration, Easing.OutQuint);
-            underscoreLine.FadeOut(fade_duration, Easing.OutQuint);
-            return true;
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            background.FadeOut(fade_duration, Easing.OutQuint);
-            underscoreLine.FadeIn(fade_duration, Easing.OutQuint);
-            base.OnHoverLost(e);
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs b/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
index 4e856845ac..aef8044b12 100644
--- a/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
+++ b/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
@@ -14,7 +14,7 @@ using osu.Game.Online.Leaderboards;
 
 namespace osu.Game.Overlays.Profile.Sections.Recent
 {
-    public class DrawableRecentActivity : DrawableProfileRow
+    public class DrawableRecentActivity : CompositeDrawable
     {
         private IAPIProvider api;
 
@@ -28,24 +28,55 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
         }
 
         [BackgroundDependencyLoader]
-        private void load(IAPIProvider api)
+        private void load(IAPIProvider api, OverlayColourProvider colourProvider)
         {
             this.api = api;
 
-            LeftFlowContainer.Padding = new MarginPadding { Left = 10, Right = 160 };
-
-            LeftFlowContainer.Add(content = new LinkFlowContainer
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            AddInternal(new GridContainer
             {
-                AutoSizeAxes = Axes.Y,
                 RelativeSizeAxes = Axes.X,
-            });
-
-            RightFlowContainer.Add(new DrawableDate(activity.CreatedAt)
-            {
-                Font = OsuFont.GetFont(size: 13),
-                Colour = OsuColour.Gray(0xAA),
-                Anchor = Anchor.TopRight,
-                Origin = Anchor.TopRight,
+                AutoSizeAxes = Axes.Y,
+                ColumnDimensions = new[]
+                {
+                    new Dimension(GridSizeMode.Absolute, size: 40),
+                    new Dimension(),
+                    new Dimension(GridSizeMode.AutoSize)
+                },
+                RowDimensions = new[]
+                {
+                    new Dimension(GridSizeMode.AutoSize)
+                },
+                Content = new[]
+                {
+                    new Drawable[]
+                    {
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Child = createIcon().With(icon =>
+                            {
+                                icon.Anchor = Anchor.Centre;
+                                icon.Origin = Anchor.Centre;
+                            })
+                        },
+                        content = new LinkFlowContainer
+                        {
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            AutoSizeAxes = Axes.Y,
+                            RelativeSizeAxes = Axes.X,
+                        },
+                        new DrawableDate(activity.CreatedAt)
+                        {
+                            Anchor = Anchor.CentreRight,
+                            Origin = Anchor.CentreRight,
+                            Colour = colourProvider.Foreground1,
+                        }
+                    }
+                }
             });
 
             var formatted = createMessage();
@@ -53,36 +84,33 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
             content.AddLinks(formatted.Text, formatted.Links);
         }
 
-        protected override Drawable CreateLeftVisual()
+        private Drawable createIcon()
         {
             switch (activity.Type)
             {
                 case RecentActivityType.Rank:
                     return new UpdateableRank(activity.ScoreRank)
                     {
-                        RelativeSizeAxes = Axes.Y,
-                        Width = 60,
+                        RelativeSizeAxes = Axes.X,
+                        Height = 16,
                         FillMode = FillMode.Fit,
                     };
 
                 case RecentActivityType.Achievement:
                     return new DelayedLoadWrapper(new MedalIcon(activity.Achievement.Slug)
                     {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
                         RelativeSizeAxes = Axes.Both,
                         FillMode = FillMode.Fit,
                     })
                     {
-                        RelativeSizeAxes = Axes.Y,
-                        Width = 60,
+                        RelativeSizeAxes = Axes.X,
+                        Height = 20
                     };
 
                 default:
-                    return new Container
-                    {
-                        RelativeSizeAxes = Axes.Y,
-                        Width = 60,
-                        FillMode = FillMode.Fit,
-                    };
+                    return Empty();
             }
         }
 
diff --git a/osu.Game/Overlays/Profile/Sections/Recent/MedalIcon.cs b/osu.Game/Overlays/Profile/Sections/Recent/MedalIcon.cs
index 4563510046..0c1f8b2e92 100644
--- a/osu.Game/Overlays/Profile/Sections/Recent/MedalIcon.cs
+++ b/osu.Game/Overlays/Profile/Sections/Recent/MedalIcon.cs
@@ -23,8 +23,7 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
 
             Child = sprite = new Sprite
             {
-                Height = 40,
-                Width = 40,
+                RelativeSizeAxes = Axes.Both,
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             };
diff --git a/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs b/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
index 3f9d4dc93e..7a9cce4675 100644
--- a/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
@@ -8,6 +8,7 @@ using osu.Framework.Bindables;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.API;
 using System.Collections.Generic;
+using osuTK;
 
 namespace osu.Game.Overlays.Profile.Sections.Recent
 {
@@ -16,7 +17,8 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
         public PaginatedRecentActivityContainer(Bindable<User> user, string header, string missing)
             : base(user, header, missing)
         {
-            ItemsPerPage = 5;
+            ItemsPerPage = 10;
+            ItemsContainer.Spacing = new Vector2(0, 5);
         }
 
         protected override APIRequest<List<APIRecentActivity>> CreateRequest() =>

From 65f71b8c12757a1085d971d77fcd65c2fca23e9c Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 29 Jan 2020 21:23:19 +0100
Subject: [PATCH 0040/1142] Make colourProvider accessable from derived classes

---
 osu.Game/Overlays/FullscreenOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/FullscreenOverlay.cs b/osu.Game/Overlays/FullscreenOverlay.cs
index 959f6749d2..44e6ce086b 100644
--- a/osu.Game/Overlays/FullscreenOverlay.cs
+++ b/osu.Game/Overlays/FullscreenOverlay.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Overlays
         protected IAPIProvider API { get; private set; }
 
         [Cached]
-        private readonly OverlayColourProvider colourProvider;
+        protected readonly OverlayColourProvider colourProvider;
 
         protected FullscreenOverlay(OverlayColourScheme colourScheme)
         {

From 0ce18256e02af52ae5feb156659b1ce998d11c5f Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 29 Jan 2020 21:35:17 +0100
Subject: [PATCH 0041/1142] Recolor ProfileTabControl

---
 osu.Game/Overlays/UserProfileOverlay.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index 07c0dbed43..8ba79efe18 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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;
@@ -165,9 +165,9 @@ namespace osu.Game.Overlays
             };
 
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
+            private void load(OverlayColourProvider colourProvider)
             {
-                AccentColour = colours.Seafoam;
+                AccentColour = colourProvider.Highlight1;
             }
 
             private class ProfileTabItem : OverlayTabItem

From c091b31fe875a98e70a0c37258b49674176406a7 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 29 Jan 2020 21:37:51 +0100
Subject: [PATCH 0042/1142] Recolor basic background boxes

---
 osu.Game/Overlays/UserProfileOverlay.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index 8ba79efe18..a8e11ec124 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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;
@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
-using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Online.API.Requests;
 using osu.Game.Overlays.Profile;
@@ -74,7 +73,7 @@ namespace osu.Game.Overlays
             Add(new Box
             {
                 RelativeSizeAxes = Axes.Both,
-                Colour = OsuColour.Gray(0.1f)
+                Colour = colourProvider.Background6
             });
 
             Add(sectionsContainer = new ProfileSectionsContainer
@@ -83,7 +82,8 @@ namespace osu.Game.Overlays
                 FixedHeader = tabs,
                 HeaderBackground = new Box
                 {
-                    Colour = OsuColour.Gray(34),
+                    // this is only visible as the ProfileTabControl background
+                    Colour = colourProvider.Background5,
                     RelativeSizeAxes = Axes.Both
                 },
             });

From 12a49b74bb19e8e6151ad8a828dcd4c039669023 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 29 Jan 2020 21:48:02 +0100
Subject: [PATCH 0043/1142] Recolor TopHeaderContainer

---
 osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index b0d7070994..19a24dd576 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Overlays.Profile.Header
         private FillFlowContainer userStats;
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colourProvider)
         {
             Height = 150;
 
@@ -42,7 +42,7 @@ namespace osu.Game.Overlays.Profile.Header
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = colours.GreySeafoamDark,
+                    Colour = colourProvider.Background5,
                 },
                 new FillFlowContainer
                 {
@@ -117,7 +117,7 @@ namespace osu.Game.Overlays.Profile.Header
                                             RelativeSizeAxes = Axes.X,
                                             Height = 1.5f,
                                             Margin = new MarginPadding { Top = 10 },
-                                            Colour = colours.GreySeafoamLighter,
+                                            Colour = colourProvider.Light1,
                                         },
                                         new FillFlowContainer
                                         {
@@ -137,7 +137,7 @@ namespace osu.Game.Overlays.Profile.Header
                                                     Margin = new MarginPadding { Left = 10 },
                                                     Origin = Anchor.CentreLeft,
                                                     Anchor = Anchor.CentreLeft,
-                                                    Colour = colours.GreySeafoamLighter,
+                                                    Colour = colourProvider.Light1,
                                                 }
                                             }
                                         },

From 088064523bdd2a67c7d758de98351bb73583a6f7 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 29 Jan 2020 21:55:41 +0100
Subject: [PATCH 0044/1142] Recolor CentreHeaderContainer

---
 osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
index 68fd77dd84..4f36a7e240 100644
--- a/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Overlays.Profile.Header
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, TextureStore textures)
+        private void load(OverlayColourProvider colourProvider, TextureStore textures)
         {
             Container<Drawable> hiddenDetailContainer;
             Container<Drawable> expandedDetailContainer;
@@ -38,7 +38,7 @@ namespace osu.Game.Overlays.Profile.Header
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = colours.GreySeafoam
+                    Colour = colourProvider.Background4
                 },
                 new FillFlowContainer
                 {
@@ -119,12 +119,12 @@ namespace osu.Game.Overlays.Profile.Header
                                 hiddenDetailGlobal = new OverlinedInfoContainer
                                 {
                                     Title = "Global Ranking",
-                                    LineColour = colours.Yellow
+                                    LineColour = colourProvider.Highlight1
                                 },
                                 hiddenDetailCountry = new OverlinedInfoContainer
                                 {
                                     Title = "Country Ranking",
-                                    LineColour = colours.Yellow
+                                    LineColour = colourProvider.Highlight1
                                 },
                             }
                         }

From 799a86544f577e5a627b4b9e74d0e3b8c9886a99 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 29 Jan 2020 21:57:43 +0100
Subject: [PATCH 0045/1142] Recolor play time border

---
 .../Profile/Header/Components/OverlinedTotalPlayTime.cs       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/OverlinedTotalPlayTime.cs b/osu.Game/Overlays/Profile/Header/Components/OverlinedTotalPlayTime.cs
index 2c88a83680..06c9dc2602 100644
--- a/osu.Game/Overlays/Profile/Header/Components/OverlinedTotalPlayTime.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/OverlinedTotalPlayTime.cs
@@ -27,12 +27,12 @@ namespace osu.Game.Overlays.Profile.Header.Components
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colourProvider)
         {
             InternalChild = info = new OverlinedInfoContainer
             {
                 Title = "Total Play Time",
-                LineColour = colours.Yellow,
+                LineColour = colourProvider.Highlight1,
             };
 
             User.BindValueChanged(updateTime, true);

From 83d5691ba3eab76fc98b62ff16f7bedd32f5fb0b Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 29 Jan 2020 22:00:37 +0100
Subject: [PATCH 0046/1142] Match web border height

---
 .../Profile/Header/Components/OverlinedInfoContainer.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/OverlinedInfoContainer.cs b/osu.Game/Overlays/Profile/Header/Components/OverlinedInfoContainer.cs
index c40ddca688..c306e3db2e 100644
--- a/osu.Game/Overlays/Profile/Header/Components/OverlinedInfoContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/OverlinedInfoContainer.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
                     line = new Circle
                     {
                         RelativeSizeAxes = Axes.X,
-                        Height = 4,
+                        Height = 2,
                     },
                     title = new OsuSpriteText
                     {

From fa0a96c3f5981dadafb5e03f31eba101acb77ed5 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 29 Jan 2020 22:05:40 +0100
Subject: [PATCH 0047/1142] Match web margins

---
 .../Profile/Header/Components/OverlinedInfoContainer.cs     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Overlays/Profile/Header/Components/OverlinedInfoContainer.cs b/osu.Game/Overlays/Profile/Header/Components/OverlinedInfoContainer.cs
index c306e3db2e..e9d22139ae 100644
--- a/osu.Game/Overlays/Profile/Header/Components/OverlinedInfoContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/OverlinedInfoContainer.cs
@@ -12,6 +12,11 @@ namespace osu.Game.Overlays.Profile.Header.Components
 {
     public class OverlinedInfoContainer : CompositeDrawable
     {
+        /// <summary>
+        /// The amount of space between the overline and the underneath text.
+        /// </summary>
+        private const float line_bottom_margin = 2;
+
         private readonly Circle line;
         private readonly OsuSpriteText title;
         private readonly OsuSpriteText content;
@@ -44,6 +49,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
                     {
                         RelativeSizeAxes = Axes.X,
                         Height = 2,
+                        Margin = new MarginPadding { Bottom = line_bottom_margin }
                     },
                     title = new OsuSpriteText
                     {

From 0f9ab7c98050286d90044a18383ea1307c95b2bf Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 29 Jan 2020 22:10:19 +0100
Subject: [PATCH 0048/1142] Recolor BottomHeaderContainer

---
 osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
index 158641d816..b6c6f33678 100644
--- a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
@@ -33,16 +33,16 @@ namespace osu.Game.Overlays.Profile.Header
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colourProvider)
         {
-            iconColour = colours.GreySeafoamLighter;
+            iconColour = colourProvider.Foreground1;
 
             InternalChildren = new Drawable[]
             {
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = colours.GreySeafoamDark,
+                    Colour = colourProvider.Background4
                 },
                 new FillFlowContainer
                 {

From 85990cdcdb4d714673afa1b569f6efdc48b484f7 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 29 Jan 2020 22:10:48 +0100
Subject: [PATCH 0049/1142] Recolor MedalHeaderContainer

---
 osu.Game/Overlays/Profile/Header/MedalHeaderContainer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/MedalHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/MedalHeaderContainer.cs
index 45bc60f794..bbba9a3538 100644
--- a/osu.Game/Overlays/Profile/Header/MedalHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/MedalHeaderContainer.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Overlays.Profile.Header
         public readonly Bindable<User> User = new Bindable<User>();
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colourProvider)
         {
             Alpha = 0;
             AutoSizeAxes = Axes.Y;
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Profile.Header
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = colours.GreySeafoamDarker,
+                    Colour = colourProvider.Background5,
                 },
                 new Container //artificial shadow
                 {

From 06eded16e282a754d0ed672d342b53a11e18995f Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 29 Jan 2020 22:10:58 +0100
Subject: [PATCH 0050/1142] Recolor DetailHeaderContainer

---
 osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
index 6ee0d9ee8f..cf6ae1a3fc 100644
--- a/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Overlays.Profile.Header
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colourProvider, OsuColour colours)
         {
             AutoSizeAxes = Axes.Y;
 
@@ -65,7 +65,7 @@ namespace osu.Game.Overlays.Profile.Header
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = colours.GreySeafoamDarker,
+                    Colour = colourProvider.Background5,
                 },
                 fillFlow = new FillFlowContainer
                 {
@@ -152,12 +152,12 @@ namespace osu.Game.Overlays.Profile.Header
                                         detailGlobalRank = new OverlinedInfoContainer(true, 110)
                                         {
                                             Title = "Global Ranking",
-                                            LineColour = colours.Yellow,
+                                            LineColour = colourProvider.Highlight1,
                                         },
                                         detailCountryRank = new OverlinedInfoContainer(false, 110)
                                         {
                                             Title = "Country Ranking",
-                                            LineColour = colours.Yellow,
+                                            LineColour = colourProvider.Highlight1,
                                         },
                                     }
                                 }

From 87521f35ed6e98d99a3ef5b30b5f8a707714349e Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 29 Jan 2020 22:25:28 +0100
Subject: [PATCH 0051/1142] Recolor buttons

---
 .../Profile/Header/Components/ExpandDetailsButton.cs      | 6 +++---
 .../Overlays/Profile/Sections/ProfileShowMoreButton.cs    | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/ExpandDetailsButton.cs b/osu.Game/Overlays/Profile/Header/Components/ExpandDetailsButton.cs
index 46d24608ed..859cf0cc0b 100644
--- a/osu.Game/Overlays/Profile/Header/Components/ExpandDetailsButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/ExpandDetailsButton.cs
@@ -25,10 +25,10 @@ namespace osu.Game.Overlays.Profile.Header.Components
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colourProvider)
         {
-            IdleColour = colours.GreySeafoamLight;
-            HoverColour = colours.GreySeafoamLight.Darken(0.2f);
+            IdleColour = colourProvider.Background2;
+            HoverColour = colourProvider.Background2.Lighten(0.2f);
 
             Child = icon = new SpriteIcon
             {
diff --git a/osu.Game/Overlays/Profile/Sections/ProfileShowMoreButton.cs b/osu.Game/Overlays/Profile/Sections/ProfileShowMoreButton.cs
index 28486cc743..b009ab90d7 100644
--- a/osu.Game/Overlays/Profile/Sections/ProfileShowMoreButton.cs
+++ b/osu.Game/Overlays/Profile/Sections/ProfileShowMoreButton.cs
@@ -10,11 +10,11 @@ namespace osu.Game.Overlays.Profile.Sections
     public class ProfileShowMoreButton : ShowMoreButton
     {
         [BackgroundDependencyLoader]
-        private void load(OsuColour colors)
+        private void load(OverlayColourProvider colourProvider)
         {
-            IdleColour = colors.GreySeafoamDark;
-            HoverColour = colors.GreySeafoam;
-            ChevronIconColour = colors.Yellow;
+            IdleColour = colourProvider.Background2;
+            HoverColour = colourProvider.Background1;
+            ChevronIconColour = colourProvider.Foreground1;
         }
     }
 }

From f7c38da0306dad4b461fef1d66b03efac8e239df Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 29 Jan 2020 22:25:56 +0100
Subject: [PATCH 0052/1142] Match web border height

---
 osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs b/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
index aabfa56ee6..d4d0976724 100644
--- a/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
+++ b/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
@@ -101,7 +101,7 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
                         {
                             Masking = true,
                             RelativeSizeAxes = Axes.X,
-                            Height = 5,
+                            Height = 2,
                             Child = lineBackground = new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
@@ -128,10 +128,10 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
             }
 
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
+            private void load(OverlayColourProvider colourProvider)
             {
-                lineBackground.Colour = colours.Yellow;
-                DescriptionText.Colour = colours.GreySeafoamLighter;
+                lineBackground.Colour = colourProvider.Highlight1;
+                DescriptionText.Colour = colourProvider.Foreground1;
             }
         }
     }

From ef92c26c17aa0704ae37ed1cbdd75df441a4e024 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 29 Jan 2020 22:26:21 +0100
Subject: [PATCH 0053/1142] Recolor ProfileSection

---
 osu.Game/Overlays/Profile/ProfileSection.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Profile/ProfileSection.cs b/osu.Game/Overlays/Profile/ProfileSection.cs
index f3590d4bb7..2e19ae4b64 100644
--- a/osu.Game/Overlays/Profile/ProfileSection.cs
+++ b/osu.Game/Overlays/Profile/ProfileSection.cs
@@ -95,10 +95,10 @@ namespace osu.Game.Overlays.Profile
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colourProvider)
         {
-            background.Colour = colours.GreySeafoamDarker;
-            underscore.Colour = colours.Seafoam;
+            background.Colour = colourProvider.Background5;
+            underscore.Colour = colourProvider.Highlight1;
         }
 
         private class SectionTriangles : Container
@@ -128,11 +128,11 @@ namespace osu.Game.Overlays.Profile
             }
 
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
+            private void load(OverlayColourProvider colourProvider)
             {
-                triangles.ColourLight = colours.GreySeafoamDark;
-                triangles.ColourDark = colours.GreySeafoamDarker.Darken(0.2f);
-                foreground.Colour = ColourInfo.GradientVertical(colours.GreySeafoamDarker, colours.GreySeafoamDarker.Opacity(0));
+                triangles.ColourLight = colourProvider.Background4;
+                triangles.ColourDark = colourProvider.Background5.Darken(0.2f);
+                foreground.Colour = ColourInfo.GradientVertical(colourProvider.Background5, colourProvider.Background5.Opacity(0));
             }
         }
     }

From d20c48d15146b1c5e69616bb71afbc6441ade761 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 30 Jan 2020 00:53:05 +0300
Subject: [PATCH 0054/1142] Resolve possible UserVotes issues

---
 osu.Game/Online/API/Requests/Responses/CommentBundle.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/osu.Game/Online/API/Requests/Responses/CommentBundle.cs b/osu.Game/Online/API/Requests/Responses/CommentBundle.cs
index c3dc775bd0..9b3ef8b6e5 100644
--- a/osu.Game/Online/API/Requests/Responses/CommentBundle.cs
+++ b/osu.Game/Online/API/Requests/Responses/CommentBundle.cs
@@ -57,14 +57,7 @@ namespace osu.Game.Online.API.Requests.Responses
             {
                 userVotes = value;
 
-                value.ForEach(v =>
-                {
-                    Comments.ForEach(c =>
-                    {
-                        if (v == c.Id)
-                            c.IsVoted = true;
-                    });
-                });
+                Comments.ForEach(c => c.IsVoted = value.Contains(c.Id));
             }
         }
 

From ebdb425c508c34894048e40a66c84b8cd1aacea7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jan 2020 11:17:26 +0900
Subject: [PATCH 0055/1142] Rename and tidy up DeletedCommentsCounter

---
 .../Online/TestSceneCommentsContainer.cs      |  2 +-
 .../Overlays/Comments/CommentsContainer.cs    |  8 ++--
 ...aceholder.cs => DeletedCommentsCounter.cs} | 45 ++++++++++---------
 osu.Game/Overlays/Comments/DrawableComment.cs |  6 +--
 4 files changed, 33 insertions(+), 28 deletions(-)
 rename osu.Game/Overlays/Comments/{DeletedChildrenPlaceholder.cs => DeletedCommentsCounter.cs} (51%)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
index 3d63e2b07e..3deb9cb1fa 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Tests.Visual.Online
             typeof(HeaderButton),
             typeof(SortTabControl),
             typeof(ShowChildrenButton),
-            typeof(DeletedChildrenPlaceholder),
+            typeof(DeletedCommentsCounter),
             typeof(VotePill)
         };
 
diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index 78df73eb0d..e641cd8ddf 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Overlays.Comments
         private int currentPage;
 
         private FillFlowContainer content;
-        private DeletedChildrenPlaceholder deletedChildrenPlaceholder;
+        private DeletedCommentsCounter deletedCommentsCounter;
         private CommentsShowMoreButton moreButton;
         private TotalCommentsCounter commentCounter;
 
@@ -84,7 +84,7 @@ namespace osu.Game.Overlays.Comments
                                     Direction = FillDirection.Vertical,
                                     Children = new Drawable[]
                                     {
-                                        deletedChildrenPlaceholder = new DeletedChildrenPlaceholder
+                                        deletedCommentsCounter = new DeletedCommentsCounter
                                         {
                                             ShowDeleted = { BindTarget = ShowDeleted }
                                         },
@@ -153,7 +153,7 @@ namespace osu.Game.Overlays.Comments
         private void clearComments()
         {
             currentPage = 1;
-            deletedChildrenPlaceholder.DeletedCount.Value = 0;
+            deletedCommentsCounter.Count.Value = 0;
             moreButton.IsLoading = true;
             content.Clear();
         }
@@ -184,7 +184,7 @@ namespace osu.Game.Overlays.Comments
             {
                 content.Add(loaded);
 
-                deletedChildrenPlaceholder.DeletedCount.Value += response.Comments.Count(c => c.IsDeleted && c.IsTopLevel);
+                deletedCommentsCounter.Count.Value += response.Comments.Count(c => c.IsDeleted && c.IsTopLevel);
 
                 if (response.HasMore)
                 {
diff --git a/osu.Game/Overlays/Comments/DeletedChildrenPlaceholder.cs b/osu.Game/Overlays/Comments/DeletedCommentsCounter.cs
similarity index 51%
rename from osu.Game/Overlays/Comments/DeletedChildrenPlaceholder.cs
rename to osu.Game/Overlays/Comments/DeletedCommentsCounter.cs
index 6b41453b91..f22086bf23 100644
--- a/osu.Game/Overlays/Comments/DeletedChildrenPlaceholder.cs
+++ b/osu.Game/Overlays/Comments/DeletedCommentsCounter.cs
@@ -12,51 +12,56 @@ using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Overlays.Comments
 {
-    public class DeletedChildrenPlaceholder : FillFlowContainer
+    public class DeletedCommentsCounter : CompositeDrawable
     {
         public readonly BindableBool ShowDeleted = new BindableBool();
-        public readonly BindableInt DeletedCount = new BindableInt();
+
+        public readonly BindableInt Count = new BindableInt();
 
         private readonly SpriteText countText;
 
-        public DeletedChildrenPlaceholder()
+        public DeletedCommentsCounter()
         {
             AutoSizeAxes = Axes.Both;
-            Direction = FillDirection.Horizontal;
-            Spacing = new Vector2(3, 0);
             Margin = new MarginPadding { Vertical = 10, Left = 80 };
-            Children = new Drawable[]
+
+            InternalChild = new FillFlowContainer
             {
-                new SpriteIcon
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Horizontal,
+                Spacing = new Vector2(3, 0),
+                Children = new Drawable[]
                 {
-                    Icon = FontAwesome.Solid.Trash,
-                    Size = new Vector2(14),
-                },
-                countText = new OsuSpriteText
-                {
-                    Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true),
+                    new SpriteIcon
+                    {
+                        Icon = FontAwesome.Solid.Trash,
+                        Size = new Vector2(14),
+                    },
+                    countText = new OsuSpriteText
+                    {
+                        Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true),
+                    }
                 }
             };
         }
 
         protected override void LoadComplete()
         {
-            DeletedCount.BindValueChanged(_ => updateDisplay(), true);
-            ShowDeleted.BindValueChanged(_ => updateDisplay(), true);
             base.LoadComplete();
+
+            Count.BindValueChanged(_ => updateDisplay(), true);
+            ShowDeleted.BindValueChanged(_ => updateDisplay(), true);
         }
 
         private void updateDisplay()
         {
-            if (DeletedCount.Value != 0)
+            if (!ShowDeleted.Value && Count.Value != 0)
             {
-                countText.Text = @"deleted comment".ToQuantity(DeletedCount.Value);
-                this.FadeTo(ShowDeleted.Value ? 0 : 1);
+                countText.Text = @"deleted comment".ToQuantity(Count.Value);
+                Show();
             }
             else
-            {
                 Hide();
-            }
         }
     }
 }
diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index bdae9da226..0f217f057d 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Overlays.Comments
         {
             LinkFlowContainer username;
             FillFlowContainer childCommentsContainer;
-            DeletedChildrenPlaceholder deletedChildrenPlaceholder;
+            DeletedCommentsCounter deletedCommentsCounter;
             FillFlowContainer info;
             LinkFlowContainer message;
             GridContainer content;
@@ -184,7 +184,7 @@ namespace osu.Game.Overlays.Comments
                                 AutoSizeAxes = Axes.Y,
                                 Direction = FillDirection.Vertical
                             },
-                            deletedChildrenPlaceholder = new DeletedChildrenPlaceholder
+                            deletedCommentsCounter = new DeletedCommentsCounter
                             {
                                 ShowDeleted = { BindTarget = ShowDeleted }
                             }
@@ -193,7 +193,7 @@ namespace osu.Game.Overlays.Comments
                 }
             };
 
-            deletedChildrenPlaceholder.DeletedCount.Value = comment.DeletedChildrenCount;
+            deletedCommentsCounter.Count.Value = comment.DeletedChildrenCount;
 
             if (comment.UserId.HasValue)
                 username.AddUserLink(comment.User);

From c158570249cfc5867ebd1a79f0766e8f33e2762d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jan 2020 11:31:34 +0900
Subject: [PATCH 0056/1142] Fix typo in comment
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game/Screens/Select/SongSelect.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index a1959ff17d..ea852d26f1 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -640,7 +640,7 @@ namespace osu.Game.Screens.Select
 
         /// <summary>
         /// Transfer the game-wide ruleset to the local decoupled ruleset.
-        /// Will immediately run filter operations is required.
+        /// Will immediately run filter operations if required.
         /// </summary>
         /// <returns>Whether a transfer occurred.</returns>
         private bool transferRulesetValue()

From d7d7ab48d354e00fb6c29dba5e148dbc73c66e65 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 30 Jan 2020 12:36:38 +0900
Subject: [PATCH 0057/1142] Cleanup

---
 osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs  | 1 -
 .../Profile/Header/Components/ExpandDetailsButton.cs       | 1 -
 .../Profile/Header/Components/OverlinedInfoContainer.cs    | 7 +------
 .../Profile/Header/Components/OverlinedTotalPlayTime.cs    | 1 -
 osu.Game/Overlays/Profile/Header/MedalHeaderContainer.cs   | 1 -
 .../Overlays/Profile/Sections/ProfileShowMoreButton.cs     | 1 -
 6 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
index 4f36a7e240..658cdb8ce3 100644
--- a/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
@@ -7,7 +7,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Textures;
-using osu.Game.Graphics;
 using osu.Game.Overlays.Profile.Header.Components;
 using osu.Game.Users;
 using osuTK;
diff --git a/osu.Game/Overlays/Profile/Header/Components/ExpandDetailsButton.cs b/osu.Game/Overlays/Profile/Header/Components/ExpandDetailsButton.cs
index 859cf0cc0b..29e13e4f51 100644
--- a/osu.Game/Overlays/Profile/Header/Components/ExpandDetailsButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/ExpandDetailsButton.cs
@@ -6,7 +6,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Graphics;
 using osuTK;
 
 namespace osu.Game.Overlays.Profile.Header.Components
diff --git a/osu.Game/Overlays/Profile/Header/Components/OverlinedInfoContainer.cs b/osu.Game/Overlays/Profile/Header/Components/OverlinedInfoContainer.cs
index e9d22139ae..b11e41f90f 100644
--- a/osu.Game/Overlays/Profile/Header/Components/OverlinedInfoContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/OverlinedInfoContainer.cs
@@ -12,11 +12,6 @@ namespace osu.Game.Overlays.Profile.Header.Components
 {
     public class OverlinedInfoContainer : CompositeDrawable
     {
-        /// <summary>
-        /// The amount of space between the overline and the underneath text.
-        /// </summary>
-        private const float line_bottom_margin = 2;
-
         private readonly Circle line;
         private readonly OsuSpriteText title;
         private readonly OsuSpriteText content;
@@ -49,7 +44,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
                     {
                         RelativeSizeAxes = Axes.X,
                         Height = 2,
-                        Margin = new MarginPadding { Bottom = line_bottom_margin }
+                        Margin = new MarginPadding { Bottom = 2 }
                     },
                     title = new OsuSpriteText
                     {
diff --git a/osu.Game/Overlays/Profile/Header/Components/OverlinedTotalPlayTime.cs b/osu.Game/Overlays/Profile/Header/Components/OverlinedTotalPlayTime.cs
index 06c9dc2602..be96840217 100644
--- a/osu.Game/Overlays/Profile/Header/Components/OverlinedTotalPlayTime.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/OverlinedTotalPlayTime.cs
@@ -6,7 +6,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
-using osu.Game.Graphics;
 using osu.Game.Users;
 
 namespace osu.Game.Overlays.Profile.Header.Components
diff --git a/osu.Game/Overlays/Profile/Header/MedalHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/MedalHeaderContainer.cs
index bbba9a3538..a5938a3fe7 100644
--- a/osu.Game/Overlays/Profile/Header/MedalHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/MedalHeaderContainer.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
 using osu.Game.Overlays.Profile.Header.Components;
 using osu.Game.Users;
 using osuTK;
diff --git a/osu.Game/Overlays/Profile/Sections/ProfileShowMoreButton.cs b/osu.Game/Overlays/Profile/Sections/ProfileShowMoreButton.cs
index b009ab90d7..426ebeebe6 100644
--- a/osu.Game/Overlays/Profile/Sections/ProfileShowMoreButton.cs
+++ b/osu.Game/Overlays/Profile/Sections/ProfileShowMoreButton.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Profile.Sections

From da2c2450833acacf2f68f3d207768088d0806aaf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 30 Jan 2020 12:36:47 +0900
Subject: [PATCH 0058/1142] Change to pink colour scheme

---
 osu.Game/Overlays/UserProfileOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index a8e11ec124..d6a9b82ca1 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Overlays
         public const float CONTENT_X_MARGIN = 70;
 
         public UserProfileOverlay()
-            : base(OverlayColourScheme.Green)
+            : base(OverlayColourScheme.Pink)
         {
         }
 

From 17978035ea90466a1f4625012197b3105d813bf6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 30 Jan 2020 12:50:15 +0900
Subject: [PATCH 0059/1142] Fix uncaught inconsistent naming

---
 osu.Game/Overlays/FullscreenOverlay.cs  | 12 ++++++------
 osu.Game/Overlays/UserProfileOverlay.cs |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/FullscreenOverlay.cs b/osu.Game/Overlays/FullscreenOverlay.cs
index 44e6ce086b..3464ce6086 100644
--- a/osu.Game/Overlays/FullscreenOverlay.cs
+++ b/osu.Game/Overlays/FullscreenOverlay.cs
@@ -18,11 +18,11 @@ namespace osu.Game.Overlays
         protected IAPIProvider API { get; private set; }
 
         [Cached]
-        protected readonly OverlayColourProvider colourProvider;
+        protected readonly OverlayColourProvider ColourProvider;
 
         protected FullscreenOverlay(OverlayColourScheme colourScheme)
         {
-            colourProvider = new OverlayColourProvider(colourScheme);
+            ColourProvider = new OverlayColourProvider(colourScheme);
 
             RelativeSizeAxes = Axes.Both;
             RelativePositionAxes = Axes.Both;
@@ -43,10 +43,10 @@ namespace osu.Game.Overlays
         [BackgroundDependencyLoader]
         private void load()
         {
-            Waves.FirstWaveColour = colourProvider.Light4;
-            Waves.SecondWaveColour = colourProvider.Light3;
-            Waves.ThirdWaveColour = colourProvider.Dark4;
-            Waves.FourthWaveColour = colourProvider.Dark3;
+            Waves.FirstWaveColour = ColourProvider.Light4;
+            Waves.SecondWaveColour = ColourProvider.Light3;
+            Waves.ThirdWaveColour = ColourProvider.Dark4;
+            Waves.FourthWaveColour = ColourProvider.Dark3;
         }
 
         public override void Show()
diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index d6a9b82ca1..6f0d96c226 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -73,7 +73,7 @@ namespace osu.Game.Overlays
             Add(new Box
             {
                 RelativeSizeAxes = Axes.Both,
-                Colour = colourProvider.Background6
+                Colour = ColourProvider.Background6
             });
 
             Add(sectionsContainer = new ProfileSectionsContainer
@@ -83,7 +83,7 @@ namespace osu.Game.Overlays
                 HeaderBackground = new Box
                 {
                     // this is only visible as the ProfileTabControl background
-                    Colour = colourProvider.Background5,
+                    Colour = ColourProvider.Background5,
                     RelativeSizeAxes = Axes.Both
                 },
             });

From 4ca3f216b82790ab026dea5c2914baa6033bcfca Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 30 Jan 2020 13:11:35 +0900
Subject: [PATCH 0060/1142] Fix test scene

---
 osu.Game.Tests/Visual/Online/TestSceneHistoricalSection.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneHistoricalSection.cs b/osu.Game.Tests/Visual/Online/TestSceneHistoricalSection.cs
index d3b037f499..1b7a2160d0 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneHistoricalSection.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneHistoricalSection.cs
@@ -4,10 +4,12 @@
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
+using osu.Game.Overlays;
 using osu.Game.Overlays.Profile.Sections;
 using osu.Game.Overlays.Profile.Sections.Historical;
 using osu.Game.Users;
@@ -27,6 +29,9 @@ namespace osu.Game.Tests.Visual.Online
             typeof(DrawableProfileRow)
         };
 
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Pink);
+
         public TestSceneHistoricalSection()
         {
             HistoricalSection section;

From d8ce1fd86cda5d00ec78ce3c63ae4b2fb9023012 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jan 2020 13:23:39 +0900
Subject: [PATCH 0061/1142] Fix osu!catch not handling all vertical space

---
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index 589503c35b..2d71fb93fb 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -20,7 +20,9 @@ namespace osu.Game.Rulesets.Catch.UI
 
         internal readonly CatcherArea CatcherArea;
 
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => base.ReceivePositionalInputAt(screenSpacePos) || CatcherArea.ReceivePositionalInputAt(screenSpacePos);
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
+            // only check the X position; handle all vertical space.
+            base.ReceivePositionalInputAt(new Vector2(screenSpacePos.X, ScreenSpaceDrawQuad.Centre.Y));
 
         public CatchPlayfield(BeatmapDifficulty difficulty, Func<CatchHitObject, DrawableHitObject<CatchHitObject>> createDrawableRepresentation)
         {

From ce36e5458fa74640b9d8cbc3d7c68f7e19991074 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 30 Jan 2020 14:35:03 +0900
Subject: [PATCH 0062/1142] Fix possible crash with no channel topic

---
 .../Visual/Online/TestSceneChatOverlay.cs       | 17 ++++++++++++++---
 .../Overlays/Chat/Selection/ChannelListItem.cs  | 12 ++++++------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index 9196513a55..6626640a32 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -3,12 +3,15 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Testing;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Chat;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Chat;
@@ -35,8 +38,9 @@ namespace osu.Game.Tests.Visual.Online
         private TestChatOverlay chatOverlay;
         private ChannelManager channelManager;
 
-        private readonly Channel channel1 = new Channel(new User()) { Name = "test really long username" };
-        private readonly Channel channel2 = new Channel(new User()) { Name = "test2" };
+        private readonly Channel channel1 = new Channel(new User()) { Name = "test really long username", Topic = "Topic for channel 1" };
+        private readonly Channel channel2 = new Channel(new User()) { Name = "test2", Topic = "Topic for channel 2" };
+        private readonly Channel channel3 = new Channel(new User()) { Name = "channel with no topic" };
 
         [SetUp]
         public void Setup()
@@ -45,7 +49,7 @@ namespace osu.Game.Tests.Visual.Online
             {
                 ChannelManagerContainer container;
 
-                Child = container = new ChannelManagerContainer(new List<Channel> { channel1, channel2 })
+                Child = container = new ChannelManagerContainer(new List<Channel> { channel1, channel2, channel3 })
                 {
                     RelativeSizeAxes = Axes.Both,
                 };
@@ -96,6 +100,13 @@ namespace osu.Game.Tests.Visual.Online
             AddAssert("Selector is visible", () => chatOverlay.SelectionOverlayState == Visibility.Visible);
         }
 
+        [Test]
+        public void TestSearchInSelector()
+        {
+            AddStep("search for 'test2'", () => chatOverlay.ChildrenOfType<SearchTextBox>().First().Text = "test2");
+            AddAssert("only channel 2 visible", () => chatOverlay.ChildrenOfType<ChannelListItem>().Single(c => c.IsPresent).Channel == channel2);
+        }
+
         private void clickDrawable(Drawable d)
         {
             InputManager.MoveMouseTo(d);
diff --git a/osu.Game/Overlays/Chat/Selection/ChannelListItem.cs b/osu.Game/Overlays/Chat/Selection/ChannelListItem.cs
index 31c48deee0..e6f61e4fbb 100644
--- a/osu.Game/Overlays/Chat/Selection/ChannelListItem.cs
+++ b/osu.Game/Overlays/Chat/Selection/ChannelListItem.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Overlays.Chat.Selection
         private const float text_size = 15;
         private const float transition_duration = 100;
 
-        private readonly Channel channel;
+        public readonly Channel Channel;
 
         private readonly Bindable<bool> joinedBind = new Bindable<bool>();
         private readonly OsuSpriteText name;
@@ -36,7 +36,7 @@ namespace osu.Game.Overlays.Chat.Selection
         private Color4 topicColour;
         private Color4 hoverColour;
 
-        public IEnumerable<string> FilterTerms => new[] { channel.Name, channel.Topic };
+        public IEnumerable<string> FilterTerms => new[] { Channel.Name, Channel.Topic ?? string.Empty };
 
         public bool MatchingFilter
         {
@@ -50,7 +50,7 @@ namespace osu.Game.Overlays.Chat.Selection
 
         public ChannelListItem(Channel channel)
         {
-            this.channel = channel;
+            this.Channel = channel;
 
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
@@ -148,7 +148,7 @@ namespace osu.Game.Overlays.Chat.Selection
             hoverColour = colours.Yellow;
 
             joinedBind.ValueChanged += joined => updateColour(joined.NewValue);
-            joinedBind.BindTo(channel.Joined);
+            joinedBind.BindTo(Channel.Joined);
 
             joinedBind.TriggerChange();
             FinishTransforms(true);
@@ -156,7 +156,7 @@ namespace osu.Game.Overlays.Chat.Selection
 
         protected override bool OnHover(HoverEvent e)
         {
-            if (!channel.Joined.Value)
+            if (!Channel.Joined.Value)
                 name.FadeColour(hoverColour, 50, Easing.OutQuint);
 
             return base.OnHover(e);
@@ -164,7 +164,7 @@ namespace osu.Game.Overlays.Chat.Selection
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            if (!channel.Joined.Value)
+            if (!Channel.Joined.Value)
                 name.FadeColour(Color4.White, transition_duration);
         }
 

From 7b4a658264ba82938d7967bd233cc35e7ba8175e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jan 2020 14:54:57 +0900
Subject: [PATCH 0063/1142] Fix negative replay frames being played back
 incorrectly

---
 osu.Game/Scoring/Legacy/LegacyScoreParser.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Scoring/Legacy/LegacyScoreParser.cs b/osu.Game/Scoring/Legacy/LegacyScoreParser.cs
index 0029c843b4..85c5d414df 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreParser.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreParser.cs
@@ -220,9 +220,11 @@ namespace osu.Game.Scoring.Legacy
             float lastTime = 0;
             ReplayFrame currentFrame = null;
 
-            foreach (var l in reader.ReadToEnd().Split(','))
+            var frames = reader.ReadToEnd().Split(',');
+
+            for (var i = 0; i < frames.Length; i++)
             {
-                var split = l.Split('|');
+                var split = frames[i].Split('|');
 
                 if (split.Length < 4)
                     continue;
@@ -234,8 +236,14 @@ namespace osu.Game.Scoring.Legacy
                 }
 
                 var diff = Parsing.ParseFloat(split[0]);
+
                 lastTime += diff;
 
+                if (i == 0 && diff == 0)
+                    // osu-stable adds a zero-time frame before potentially valid negative user frames.
+                    // we need to ignroe this.
+                    continue;
+
                 // Todo: At some point we probably want to rewind and play back the negative-time frames
                 // but for now we'll achieve equal playback to stable by skipping negative frames
                 if (diff < 0)

From 2fb640f57f88a58008fe9c1ecd6bc855cf2972b8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 30 Jan 2020 15:00:39 +0900
Subject: [PATCH 0064/1142] Change to until step + fix CI error

---
 osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs | 2 +-
 osu.Game/Overlays/Chat/Selection/ChannelListItem.cs  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index 6626640a32..29bda524e8 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Tests.Visual.Online
         public void TestSearchInSelector()
         {
             AddStep("search for 'test2'", () => chatOverlay.ChildrenOfType<SearchTextBox>().First().Text = "test2");
-            AddAssert("only channel 2 visible", () => chatOverlay.ChildrenOfType<ChannelListItem>().Single(c => c.IsPresent).Channel == channel2);
+            AddUntilStep("only channel 2 visible", () => chatOverlay.ChildrenOfType<ChannelListItem>().Single(c => c.IsPresent).Channel == channel2);
         }
 
         private void clickDrawable(Drawable d)
diff --git a/osu.Game/Overlays/Chat/Selection/ChannelListItem.cs b/osu.Game/Overlays/Chat/Selection/ChannelListItem.cs
index e6f61e4fbb..1e58e8b640 100644
--- a/osu.Game/Overlays/Chat/Selection/ChannelListItem.cs
+++ b/osu.Game/Overlays/Chat/Selection/ChannelListItem.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Overlays.Chat.Selection
 
         public ChannelListItem(Channel channel)
         {
-            this.Channel = channel;
+            Channel = channel;
 
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;

From d03723303d0402c8dac21d045086519aedf96a42 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jan 2020 16:29:15 +0900
Subject: [PATCH 0065/1142] Fix typo in comment

---
 osu.Game/Scoring/Legacy/LegacyScoreParser.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Scoring/Legacy/LegacyScoreParser.cs b/osu.Game/Scoring/Legacy/LegacyScoreParser.cs
index 85c5d414df..19d8410cc2 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreParser.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreParser.cs
@@ -241,7 +241,7 @@ namespace osu.Game.Scoring.Legacy
 
                 if (i == 0 && diff == 0)
                     // osu-stable adds a zero-time frame before potentially valid negative user frames.
-                    // we need to ignroe this.
+                    // we need to ignore this.
                     continue;
 
                 // Todo: At some point we probably want to rewind and play back the negative-time frames

From ea2f66da1d9d10a9608a87cfed312b46a95afc4d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 30 Jan 2020 10:34:22 +0300
Subject: [PATCH 0066/1142] Simplify OverlayRulesetTabItem.AccentColour

---
 osu.Game/Overlays/OverlayRulesetSelector.cs   | 23 -----------
 osu.Game/Overlays/OverlayRulesetTabItem.cs    | 40 ++++++++-----------
 .../Components/ProfileRulesetTabItem.cs       | 17 ++++----
 3 files changed, 27 insertions(+), 53 deletions(-)

diff --git a/osu.Game/Overlays/OverlayRulesetSelector.cs b/osu.Game/Overlays/OverlayRulesetSelector.cs
index 0c87686f6f..b73d38eeb3 100644
--- a/osu.Game/Overlays/OverlayRulesetSelector.cs
+++ b/osu.Game/Overlays/OverlayRulesetSelector.cs
@@ -1,44 +1,21 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
-using osu.Game.Graphics;
 using osu.Game.Rulesets;
 using osuTK;
-using osuTK.Graphics;
-using System.Linq;
 
 namespace osu.Game.Overlays
 {
     public class OverlayRulesetSelector : RulesetSelector
     {
-        private Color4 accentColour;
-
-        public Color4 AccentColour
-        {
-            get => accentColour;
-            set
-            {
-                accentColour = value;
-                foreach (var i in TabContainer.Children.OfType<IHasAccentColour>())
-                    i.AccentColour = value;
-            }
-        }
-
         public OverlayRulesetSelector()
         {
             AutoSizeAxes = Axes.Both;
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
-        {
-            AccentColour = colourProvider.Highlight1;
-        }
-
         protected override TabItem<RulesetInfo> CreateTabItem(RulesetInfo value) => new OverlayRulesetTabItem(value);
 
         protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
diff --git a/osu.Game/Overlays/OverlayRulesetTabItem.cs b/osu.Game/Overlays/OverlayRulesetTabItem.cs
index 91cf2d6b96..5b53d9d1fa 100644
--- a/osu.Game/Overlays/OverlayRulesetTabItem.cs
+++ b/osu.Game/Overlays/OverlayRulesetTabItem.cs
@@ -11,27 +11,31 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 using osuTK.Graphics;
 using osuTK;
-using osu.Framework.Bindables;
+using osu.Framework.Allocation;
 
 namespace osu.Game.Overlays
 {
-    public class OverlayRulesetTabItem : TabItem<RulesetInfo>, IHasAccentColour
+    public class OverlayRulesetTabItem : TabItem<RulesetInfo>
     {
         protected readonly OsuSpriteText Text;
         private readonly FillFlowContainer content;
 
-        public override bool PropagatePositionalInputSubTree => Enabled.Value && !Active.Value && base.PropagatePositionalInputSubTree;
+        protected override Container<Drawable> Content => content;
 
-        private readonly Bindable<Color4> accentColour = new Bindable<Color4>();
-        private readonly Bindable<Color4> currentColour = new Bindable<Color4>();
+        private Color4 accentColour;
 
-        public Color4 AccentColour
+        protected virtual Color4 AccentColour
         {
-            get => accentColour.Value;
-            set => accentColour.Value = value;
+            get => accentColour;
+            set
+            {
+                accentColour = value;
+                Text.FadeColour(value, 120, Easing.OutQuint);
+            }
         }
 
-        protected override Container<Drawable> Content => content;
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; }
 
         public OverlayRulesetTabItem(RulesetInfo value)
             : base(value)
@@ -58,13 +62,10 @@ namespace osu.Game.Overlays
             Enabled.Value = true;
         }
 
-        protected override void LoadComplete()
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            base.LoadComplete();
-
-            currentColour.BindValueChanged(OnCurrentColourChanged);
-            accentColour.BindValueChanged(_ => updateState());
-            Enabled.BindValueChanged(_ => updateState(), true);
+            updateState();
         }
 
         protected override bool OnHover(HoverEvent e)
@@ -87,14 +88,7 @@ namespace osu.Game.Overlays
         private void updateState()
         {
             Text.Font = Text.Font.With(weight: Active.Value ? FontWeight.Bold : FontWeight.Medium);
-
-            currentColour.Value = IsHovered || Active.Value
-                ? Color4.White
-                : Enabled.Value
-                    ? AccentColour
-                    : Color4.DimGray;
+            AccentColour = IsHovered || Active.Value ? Color4.White : colourProvider.Highlight1;
         }
-
-        protected virtual void OnCurrentColourChanged(ValueChangedEvent<Color4> colour) => Text.FadeColour(colour.NewValue, 120, Easing.OutQuint);
     }
 }
diff --git a/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetTabItem.cs b/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetTabItem.cs
index 038509d371..3d20fba542 100644
--- a/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetTabItem.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetTabItem.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 osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets;
@@ -28,6 +27,16 @@ namespace osu.Game.Overlays.Profile.Header.Components
             }
         }
 
+        protected override Color4 AccentColour
+        {
+            get => base.AccentColour;
+            set
+            {
+                base.AccentColour = value;
+                icon.FadeColour(value, 120, Easing.OutQuint);
+            }
+        }
+
         private readonly SpriteIcon icon;
 
         public ProfileRulesetTabItem(RulesetInfo value)
@@ -43,11 +52,5 @@ namespace osu.Game.Overlays.Profile.Header.Components
                 Size = new Vector2(12),
             });
         }
-
-        protected override void OnCurrentColourChanged(ValueChangedEvent<Color4> colour)
-        {
-            base.OnCurrentColourChanged(colour);
-            icon.FadeColour(colour.NewValue, 120, Easing.OutQuint);
-        }
     }
 }

From b2c501a4393751eb58cd220400688b5fd52f08dc Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 30 Jan 2020 10:54:58 +0300
Subject: [PATCH 0067/1142] Adjust font size

---
 .../Profile/Sections/Recent/DrawableRecentActivity.cs        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs b/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
index aef8044b12..b8b53f6ab6 100644
--- a/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
+++ b/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
@@ -16,6 +16,8 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
 {
     public class DrawableRecentActivity : CompositeDrawable
     {
+        private const int font_size = 14;
+
         private IAPIProvider api;
 
         private readonly APIRecentActivity activity;
@@ -62,7 +64,7 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
                                 icon.Origin = Anchor.Centre;
                             })
                         },
-                        content = new LinkFlowContainer
+                        content = new LinkFlowContainer(t => t.Font = OsuFont.GetFont(size: font_size))
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
@@ -74,6 +76,7 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
                             Anchor = Anchor.CentreRight,
                             Origin = Anchor.CentreRight,
                             Colour = colourProvider.Foreground1,
+                            Font = OsuFont.GetFont(size: font_size),
                         }
                     }
                 }

From 2f7076f91c15b21896a92c08b2c3c86969e13a35 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 30 Jan 2020 11:16:58 +0300
Subject: [PATCH 0068/1142] Adjust icons size

---
 .../Profile/Sections/Recent/DrawableRecentActivity.cs     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs b/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
index b8b53f6ab6..0387f79131 100644
--- a/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
+++ b/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
                 AutoSizeAxes = Axes.Y,
                 ColumnDimensions = new[]
                 {
-                    new Dimension(GridSizeMode.Absolute, size: 40),
+                    new Dimension(GridSizeMode.Absolute, size: 28),
                     new Dimension(),
                     new Dimension(GridSizeMode.AutoSize)
                 },
@@ -95,8 +95,9 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
                     return new UpdateableRank(activity.ScoreRank)
                     {
                         RelativeSizeAxes = Axes.X,
-                        Height = 16,
+                        Height = 11,
                         FillMode = FillMode.Fit,
+                        Margin = new MarginPadding { Top = 2 }
                     };
 
                 case RecentActivityType.Achievement:
@@ -109,7 +110,8 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
                     })
                     {
                         RelativeSizeAxes = Axes.X,
-                        Height = 20
+                        Width = 0.5f,
+                        Height = 18
                     };
 
                 default:

From 7bf2e9b36989dddd793b997fef8a254e993ee9a7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jan 2020 17:37:52 +0900
Subject: [PATCH 0069/1142] Decouple ModSelectOverlay from global SelectedMods

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs |  5 ++---
 osu.Game/Screens/Select/SongSelect.cs      | 12 ++++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 38f5d54714..6afe398172 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Overlays.Mods
 
         protected readonly Container ModSettingsContainer;
 
-        protected readonly Bindable<IReadOnlyList<Mod>> SelectedMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
+        public readonly Bindable<IReadOnlyList<Mod>> SelectedMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
 
         private Bindable<Dictionary<ModType, IReadOnlyList<Mod>>> availableMods;
 
@@ -321,14 +321,13 @@ namespace osu.Game.Overlays.Mods
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(OsuColour colours, AudioManager audio, Bindable<IReadOnlyList<Mod>> selectedMods, OsuGameBase osu)
+        private void load(OsuColour colours, AudioManager audio, OsuGameBase osu)
         {
             LowMultiplierColour = colours.Red;
             HighMultiplierColour = colours.Green;
             UnrankedLabel.Colour = colours.Blue;
 
             availableMods = osu.AvailableMods.GetBoundCopy();
-            SelectedMods.BindTo(selectedMods);
 
             sampleOn = audio.Samples.Get(@"UI/check-on");
             sampleOff = audio.Samples.Get(@"UI/check-off");
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 74a4aea033..018c487250 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -75,6 +75,9 @@ namespace osu.Game.Screens.Select
         [Resolved(canBeNull: true)]
         private NotificationOverlay notificationOverlay { get; set; }
 
+        [Resolved]
+        private Bindable<IReadOnlyList<Mod>> selectedMods { get; set; }
+
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap.Value);
 
         protected BeatmapCarousel Carousel { get; private set; }
@@ -468,6 +471,8 @@ namespace osu.Game.Screens.Select
 
             this.FadeInFromZero(250);
             FilterControl.Activate();
+
+            ModSelect.SelectedMods.BindTo(selectedMods);
         }
 
         private const double logo_transition = 250;
@@ -508,6 +513,12 @@ namespace osu.Game.Screens.Select
 
         public override void OnResuming(IScreen last)
         {
+            base.OnResuming(last);
+
+            // required due to https://github.com/ppy/osu-framework/issues/3218
+            ModSelect.SelectedMods.Disabled = false;
+            ModSelect.SelectedMods.BindTo(selectedMods);
+
             BeatmapDetails.Leaderboard.RefreshScores();
 
             Beatmap.Value.Track.Looping = true;
@@ -532,6 +543,7 @@ namespace osu.Game.Screens.Select
 
         public override void OnSuspending(IScreen next)
         {
+            ModSelect.SelectedMods.UnbindFrom(selectedMods);
             ModSelect.Hide();
 
             BeatmapOptions.Hide();

From bc21e30b09ef42fa17f8297a58bab4873181a100 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jan 2020 17:35:54 +0900
Subject: [PATCH 0070/1142] Allow specifying a valid list of types to
 performFromMenu

---
 osu.Game/OsuGame.cs | 45 ++++++++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index ff46c6d849..f54e6c02af 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -327,10 +327,10 @@ namespace osu.Game
                 return;
             }
 
-            performFromMainMenu(() =>
+            performFromScreen(screen =>
             {
                 // we might already be at song select, so a check is required before performing the load to solo.
-                if (menuScreen.IsCurrentScreen())
+                if (screen is MainMenu)
                     menuScreen.LoadToSolo();
 
                 // we might even already be at the song
@@ -344,7 +344,7 @@ namespace osu.Game
 
                 Ruleset.Value = first.Ruleset;
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(first);
-            }, $"load {beatmap}", bypassScreenAllowChecks: true, targetScreen: typeof(PlaySongSelect));
+            }, $"load {beatmap}", bypassScreenAllowChecks: true, validScreens: new[] { typeof(PlaySongSelect) });
         }
 
         /// <summary>
@@ -381,11 +381,11 @@ namespace osu.Game
                 return;
             }
 
-            performFromMainMenu(() =>
+            performFromScreen(screen =>
             {
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(databasedBeatmap);
 
-                menuScreen.Push(new ReplayPlayerLoader(databasedScore));
+                screen.Push(new ReplayPlayerLoader(databasedScore));
             }, $"watch {databasedScoreInfo}", bypassScreenAllowChecks: true);
         }
 
@@ -441,17 +441,20 @@ namespace osu.Game
         private ScheduledDelegate performFromMainMenuTask;
 
         /// <summary>
-        /// Perform an action only after returning to the main menu.
+        /// Perform an action only after returning to a specific screen specification.
         /// Eagerly tries to exit the current screen until it succeeds.
         /// </summary>
         /// <param name="action">The action to perform once we are in the correct state.</param>
         /// <param name="taskName">The task name to display in a notification (if we can't immediately reach the main menu state).</param>
-        /// <param name="targetScreen">An optional target screen type. If this screen is already current we can immediately perform the action without returning to the menu.</param>
+        /// <param name="validScreens">An optional collection of valid screen types. If any of these screens are already current we can immediately perform the action immediately, else the first valid parent will be made current before performing the action. <see cref="MainMenu"/> is used if not specified.</param>
         /// <param name="bypassScreenAllowChecks">Whether checking <see cref="IOsuScreen.AllowExternalScreenChange"/> should be bypassed.</param>
-        private void performFromMainMenu(Action action, string taskName, Type targetScreen = null, bool bypassScreenAllowChecks = false)
+        private void performFromScreen(Action<IScreen> action, string taskName, IEnumerable<Type> validScreens = null, bool bypassScreenAllowChecks = false)
         {
             performFromMainMenuTask?.Cancel();
 
+            validScreens ??= Enumerable.Empty<Type>();
+            validScreens = validScreens.Append(typeof(MainMenu));
+
             // if the current screen does not allow screen changing, give the user an option to try again later.
             if (!bypassScreenAllowChecks && (ScreenStack.CurrentScreen as IOsuScreen)?.AllowExternalScreenChange == false)
             {
@@ -460,7 +463,7 @@ namespace osu.Game
                     Text = $"Click here to {taskName}",
                     Activated = () =>
                     {
-                        performFromMainMenu(action, taskName, targetScreen, true);
+                        performFromScreen(action, taskName, validScreens, true);
                         return true;
                     }
                 });
@@ -471,23 +474,27 @@ namespace osu.Game
             CloseAllOverlays(false);
 
             // we may already be at the target screen type.
-            if (targetScreen != null && ScreenStack.CurrentScreen?.GetType() == targetScreen)
+            if (validScreens.Contains(ScreenStack.CurrentScreen?.GetType()) && !Beatmap.Disabled)
             {
-                action();
+                action(ScreenStack.CurrentScreen);
                 return;
             }
 
-            // all conditions have been met to continue with the action.
-            if (menuScreen?.IsCurrentScreen() == true && !Beatmap.Disabled)
+            // find closest valid target
+            IScreen screen = ScreenStack.CurrentScreen;
+
+            while (screen != null)
             {
-                action();
-                return;
+                if (validScreens.Contains(screen.GetType()))
+                {
+                    screen.MakeCurrent();
+                    break;
+                }
+
+                screen = screen.GetParentScreen();
             }
 
-            // menuScreen may not be initialised yet (null check required).
-            menuScreen?.MakeCurrent();
-
-            performFromMainMenuTask = Schedule(() => performFromMainMenu(action, taskName));
+            performFromMainMenuTask = Schedule(() => performFromScreen(action, taskName, validScreens));
         }
 
         /// <summary>

From f637e0e5a73c356cccf03580cee858c9a737996f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jan 2020 18:08:34 +0900
Subject: [PATCH 0071/1142] Remove unused bypassScreenAllowChecks argument

---
 osu.Game/OsuGame.cs | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index f54e6c02af..374bacde00 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -344,7 +344,7 @@ namespace osu.Game
 
                 Ruleset.Value = first.Ruleset;
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(first);
-            }, $"load {beatmap}", bypassScreenAllowChecks: true, validScreens: new[] { typeof(PlaySongSelect) });
+            }, $"load {beatmap}", validScreens: new[] { typeof(PlaySongSelect) });
         }
 
         /// <summary>
@@ -386,7 +386,7 @@ namespace osu.Game
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(databasedBeatmap);
 
                 screen.Push(new ReplayPlayerLoader(databasedScore));
-            }, $"watch {databasedScoreInfo}", bypassScreenAllowChecks: true);
+            }, $"watch {databasedScoreInfo}");
         }
 
         protected virtual Loader CreateLoader() => new Loader();
@@ -447,30 +447,13 @@ namespace osu.Game
         /// <param name="action">The action to perform once we are in the correct state.</param>
         /// <param name="taskName">The task name to display in a notification (if we can't immediately reach the main menu state).</param>
         /// <param name="validScreens">An optional collection of valid screen types. If any of these screens are already current we can immediately perform the action immediately, else the first valid parent will be made current before performing the action. <see cref="MainMenu"/> is used if not specified.</param>
-        /// <param name="bypassScreenAllowChecks">Whether checking <see cref="IOsuScreen.AllowExternalScreenChange"/> should be bypassed.</param>
-        private void performFromScreen(Action<IScreen> action, string taskName, IEnumerable<Type> validScreens = null, bool bypassScreenAllowChecks = false)
+        private void performFromScreen(Action<IScreen> action, string taskName, IEnumerable<Type> validScreens = null)
         {
             performFromMainMenuTask?.Cancel();
 
             validScreens ??= Enumerable.Empty<Type>();
             validScreens = validScreens.Append(typeof(MainMenu));
 
-            // if the current screen does not allow screen changing, give the user an option to try again later.
-            if (!bypassScreenAllowChecks && (ScreenStack.CurrentScreen as IOsuScreen)?.AllowExternalScreenChange == false)
-            {
-                notifications.Post(new SimpleNotification
-                {
-                    Text = $"Click here to {taskName}",
-                    Activated = () =>
-                    {
-                        performFromScreen(action, taskName, validScreens, true);
-                        return true;
-                    }
-                });
-
-                return;
-            }
-
             CloseAllOverlays(false);
 
             // we may already be at the target screen type.

From 8e0d51766b3c9ca8e90e9ba74f45f0e0c45a4360 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jan 2020 18:10:19 +0900
Subject: [PATCH 0072/1142] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 5497a82a7a..a31db201b2 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -54,6 +54,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.125.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.130.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 0ea558bbc7..6c3aea04a1 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.125.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.130.0" />
     <PackageReference Include="Sentry" Version="1.2.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index a215bc65e8..6f9d27a93a 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -74,7 +74,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.125.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.130.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
@@ -82,7 +82,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.125.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.130.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 0975002ef503841177a69bc6c5bccc3a80465fef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jan 2020 18:16:28 +0900
Subject: [PATCH 0073/1142] Allow presenting scores from PlaySongSelect

---
 osu.Game/OsuGame.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 374bacde00..597b318c90 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -386,7 +386,7 @@ namespace osu.Game
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(databasedBeatmap);
 
                 screen.Push(new ReplayPlayerLoader(databasedScore));
-            }, $"watch {databasedScoreInfo}");
+            }, $"watch {databasedScoreInfo}", new[] { typeof(PlaySongSelect) });
         }
 
         protected virtual Loader CreateLoader() => new Loader();

From 29ba82ee448ecab176c603ea4582e0edf3021912 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 30 Jan 2020 12:29:35 +0300
Subject: [PATCH 0074/1142] Apply different font styles for different content
 parts

---
 .../Sections/Recent/DrawableRecentActivity.cs | 80 ++++++++++++-------
 1 file changed, 52 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs b/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
index 0387f79131..e9377bb00b 100644
--- a/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
+++ b/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Online.API;
@@ -82,9 +83,7 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
                 }
             });
 
-            var formatted = createMessage();
-
-            content.AddLinks(formatted.Text, formatted.Links);
+            createMessage();
         }
 
         private Drawable createIcon()
@@ -119,81 +118,106 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
             }
         }
 
-        private string toAbsoluteUrl(string url) => $"{api.Endpoint}{url}";
+        private string getLinkArgument(string url) => MessageFormatter.GetLinkDetails($"{api.Endpoint}{url}").Argument;
 
-        private MessageFormatter.MessageFormatterResult createMessage()
+        private FontUsage getLinkFont(FontWeight fontWeight = FontWeight.Regular)
+            => OsuFont.GetFont(size: font_size, weight: fontWeight, italics: true);
+
+        private void addUserLink()
+            => content.AddLink(activity.User?.Username, LinkAction.OpenUserProfile, getLinkArgument(activity.User?.Url), creationParameters: t => t.Font = getLinkFont(FontWeight.Bold));
+
+        private void addBeatmapLink()
+            => content.AddLink(activity.Beatmap?.Title, LinkAction.OpenBeatmap, getLinkArgument(activity.Beatmap?.Url), creationParameters: t => t.Font = getLinkFont());
+
+        private void addBeatmapsetLink()
+            => content.AddLink(activity.Beatmapset?.Title, LinkAction.OpenBeatmapSet, getLinkArgument(activity.Beatmapset?.Url), creationParameters: t => t.Font = getLinkFont());
+
+        private void addText(string text)
+            => content.AddText(text, t => t.Font = OsuFont.GetFont(size: font_size, weight: FontWeight.SemiBold));
+
+        private void createMessage()
         {
-            string userLinkTemplate() => $"[{toAbsoluteUrl(activity.User?.Url)} {activity.User?.Username}]";
-            string beatmapLinkTemplate() => $"[{toAbsoluteUrl(activity.Beatmap?.Url)} {activity.Beatmap?.Title}]";
-            string beatmapsetLinkTemplate() => $"[{toAbsoluteUrl(activity.Beatmapset?.Url)} {activity.Beatmapset?.Title}]";
-
-            string message;
-
             switch (activity.Type)
             {
                 case RecentActivityType.Achievement:
-                    message = $"{userLinkTemplate()} unlocked the {activity.Achievement.Name} medal!";
+                    addUserLink();
+                    addText($" unlocked the \"{activity.Achievement.Name}\" medal!");
                     break;
 
                 case RecentActivityType.BeatmapPlaycount:
-                    message = $"{beatmapLinkTemplate()} has been played {activity.Count} times!";
+                    addBeatmapLink();
+                    addText($" has been played {activity.Count} times!");
                     break;
 
                 case RecentActivityType.BeatmapsetApprove:
-                    message = $"{beatmapsetLinkTemplate()} has been {activity.Approval.ToString().ToLowerInvariant()}!";
+                    addBeatmapsetLink();
+                    addText($" has been {activity.Approval.ToString().ToLowerInvariant()}!");
                     break;
 
                 case RecentActivityType.BeatmapsetDelete:
-                    message = $"{beatmapsetLinkTemplate()} has been deleted.";
+                    addBeatmapsetLink();
+                    addText(" has been deleted.");
                     break;
 
                 case RecentActivityType.BeatmapsetRevive:
-                    message = $"{beatmapsetLinkTemplate()} has been revived from eternal slumber by {userLinkTemplate()}.";
+                    addBeatmapsetLink();
+                    addText(" has been revived from eternal slumber by ");
+                    addUserLink();
                     break;
 
                 case RecentActivityType.BeatmapsetUpdate:
-                    message = $"{userLinkTemplate()} has updated the beatmap {beatmapsetLinkTemplate()}!";
+                    addUserLink();
+                    addText(" has updated the beatmap ");
+                    addBeatmapsetLink();
                     break;
 
                 case RecentActivityType.BeatmapsetUpload:
-                    message = $"{userLinkTemplate()} has submitted a new beatmap {beatmapsetLinkTemplate()}!";
+                    addUserLink();
+                    addText(" has submitted a new beatmap ");
+                    addBeatmapsetLink();
                     break;
 
                 case RecentActivityType.Medal:
                     // apparently this shouldn't exist look at achievement instead (https://github.com/ppy/osu-web/blob/master/resources/assets/coffee/react/profile-page/recent-activity.coffee#L111)
-                    message = string.Empty;
                     break;
 
                 case RecentActivityType.Rank:
-                    message = $"{userLinkTemplate()} achieved rank #{activity.Rank} on {beatmapLinkTemplate()} ({activity.Mode}!)";
+                    addUserLink();
+                    addText($" achieved rank #{activity.Rank} on ");
+                    addBeatmapLink();
+                    addText($" ({activity.Mode}!)");
                     break;
 
                 case RecentActivityType.RankLost:
-                    message = $"{userLinkTemplate()} has lost first place on {beatmapLinkTemplate()} ({activity.Mode}!)";
+                    addUserLink();
+                    addText(" has lost first place on ");
+                    addBeatmapLink();
+                    addText($" ({activity.Mode}!)");
                     break;
 
                 case RecentActivityType.UserSupportAgain:
-                    message = $"{userLinkTemplate()} has once again chosen to support osu! - thanks for your generosity!";
+                    addUserLink();
+                    addText(" has once again chosen to support osu! - thanks for your generosity!");
                     break;
 
                 case RecentActivityType.UserSupportFirst:
-                    message = $"{userLinkTemplate()} has become an osu!supporter - thanks for your generosity!";
+                    addUserLink();
+                    addText(" has become an osu!supporter - thanks for your generosity!");
                     break;
 
                 case RecentActivityType.UserSupportGift:
-                    message = $"{userLinkTemplate()} has received the gift of osu!supporter!";
+                    addUserLink();
+                    addText(" has received the gift of osu!supporter!");
                     break;
 
                 case RecentActivityType.UsernameChange:
-                    message = $"{activity.User?.PreviousUsername} has changed their username to {userLinkTemplate()}!";
+                    addText($"{activity.User?.PreviousUsername} has changed their username to ");
+                    addUserLink();
                     break;
 
                 default:
-                    message = string.Empty;
                     break;
             }
-
-            return MessageFormatter.FormatText(message);
         }
     }
 }

From f6ba98eec0f1087d9d7214681f41b8a35c1c47bd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 30 Jan 2020 19:00:59 +0900
Subject: [PATCH 0075/1142] Apply refactorings for framework-side changes

---
 osu.Game/Overlays/Music/PlaylistList.cs    | 70 +++++-----------------
 osu.Game/Overlays/Music/PlaylistOverlay.cs |  6 +-
 2 files changed, 18 insertions(+), 58 deletions(-)

diff --git a/osu.Game/Overlays/Music/PlaylistList.cs b/osu.Game/Overlays/Music/PlaylistList.cs
index f7be69e1f2..e183c14f10 100644
--- a/osu.Game/Overlays/Music/PlaylistList.cs
+++ b/osu.Game/Overlays/Music/PlaylistList.cs
@@ -19,12 +19,11 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Music
 {
-    public class PlaylistList : RearrangeableListContainer<PlaylistListItem>
+    public class PlaylistList : RearrangeableListContainer<BeatmapSetInfo>
     {
         public Action<BeatmapSetInfo> RequestSelection;
 
         public readonly Bindable<BeatmapSetInfo> SelectedSet = new Bindable<BeatmapSetInfo>();
-        public readonly IBindableList<BeatmapSetInfo> BeatmapSets = new BindableList<BeatmapSetInfo>();
 
         public new MarginPadding Padding
         {
@@ -32,44 +31,17 @@ namespace osu.Game.Overlays.Music
             set => base.Padding = value;
         }
 
-        private readonly HashSet<BeatmapSetInfo> existingItems = new HashSet<BeatmapSetInfo>();
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            BeatmapSets.ItemsAdded += addBeatmapSets;
-            BeatmapSets.ItemsRemoved += removeBeatmapSets;
-
-            foreach (var item in BeatmapSets)
-                addBeatmapSet(item);
-        }
-
         public void Filter(string searchTerm) => ((PlaylistListFlowContainer)ListContainer).SearchTerm = searchTerm;
 
-        public BeatmapSetInfo FirstVisibleSet => ListContainer.FlowingChildren.Cast<DrawablePlaylistListItem>().FirstOrDefault(i => i.MatchingFilter)?.Model.BeatmapSetInfo;
-
-        private void addBeatmapSets(IEnumerable<BeatmapSetInfo> sets)
-        {
-            foreach (var set in sets)
-                addBeatmapSet(set);
-        }
-
-        private void addBeatmapSet(BeatmapSetInfo set) => Schedule(() =>
-        {
-            if (existingItems.Contains(set))
-                return;
-
-            AddItem(new PlaylistListItem(set));
-            existingItems.Add(set);
-        });
+        public BeatmapSetInfo FirstVisibleSet => ListContainer.FlowingChildren.Cast<DrawablePlaylistListItem>().FirstOrDefault(i => i.MatchingFilter)?.Model;
 
         private void removeBeatmapSets(IEnumerable<BeatmapSetInfo> sets) => Schedule(() =>
         {
             foreach (var item in sets)
-                RemoveItem(ListContainer.Children.Select(d => d.Model).FirstOrDefault(m => m.BeatmapSetInfo == item));
+                Items.Remove(ListContainer.Children.Select(d => d.Model).FirstOrDefault(m => m == item));
         });
 
-        protected override DrawableRearrangeableListItem<PlaylistListItem> CreateDrawable(PlaylistListItem item) => new DrawablePlaylistListItem(item)
+        protected override DrawableRearrangeableListItem<BeatmapSetInfo> CreateDrawable(BeatmapSetInfo item) => new DrawablePlaylistListItem(item)
         {
             SelectedSet = { BindTarget = SelectedSet },
             RequestSelection = set => RequestSelection?.Invoke(set)
@@ -77,7 +49,7 @@ namespace osu.Game.Overlays.Music
 
         protected override ScrollContainer<Drawable> CreateScrollContainer() => new OsuScrollContainer();
 
-        protected override FillFlowContainer<DrawableRearrangeableListItem<PlaylistListItem>> CreateListFillFlowContainer() => new PlaylistListFlowContainer
+        protected override FillFlowContainer<DrawableRearrangeableListItem<BeatmapSetInfo>> CreateListFillFlowContainer() => new PlaylistListFlowContainer
         {
             Spacing = new Vector2(0, 3),
             LayoutDuration = 200,
@@ -85,25 +57,11 @@ namespace osu.Game.Overlays.Music
         };
     }
 
-    public class PlaylistListFlowContainer : SearchContainer<DrawableRearrangeableListItem<PlaylistListItem>>
+    public class PlaylistListFlowContainer : SearchContainer<DrawableRearrangeableListItem<BeatmapSetInfo>>
     {
     }
 
-    public class PlaylistListItem : IEquatable<PlaylistListItem>
-    {
-        public readonly BeatmapSetInfo BeatmapSetInfo;
-
-        public PlaylistListItem(BeatmapSetInfo beatmapSetInfo)
-        {
-            BeatmapSetInfo = beatmapSetInfo;
-        }
-
-        public override string ToString() => BeatmapSetInfo.ToString();
-
-        public bool Equals(PlaylistListItem other) => BeatmapSetInfo.Equals(other?.BeatmapSetInfo);
-    }
-
-    public class DrawablePlaylistListItem : DrawableRearrangeableListItem<PlaylistListItem>, IFilterable
+    public class DrawablePlaylistListItem : DrawableRearrangeableListItem<BeatmapSetInfo>, IFilterable
     {
         private const float fade_duration = 100;
 
@@ -119,7 +77,7 @@ namespace osu.Game.Overlays.Music
         private Color4 hoverColour;
         private Color4 artistColour;
 
-        public DrawablePlaylistListItem(PlaylistListItem item)
+        public DrawablePlaylistListItem(BeatmapSetInfo item)
             : base(item)
         {
             RelativeSizeAxes = Axes.X;
@@ -127,7 +85,7 @@ namespace osu.Game.Overlays.Music
 
             Padding = new MarginPadding { Left = 5 };
 
-            FilterTerms = item.BeatmapSetInfo.Metadata.SearchableTerms;
+            FilterTerms = item.Metadata.SearchableTerms;
         }
 
         [BackgroundDependencyLoader]
@@ -164,8 +122,8 @@ namespace osu.Game.Overlays.Music
                 RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
             };
 
-            titleBind = localisation.GetLocalisedString(new LocalisedString((Model.BeatmapSetInfo.Metadata.TitleUnicode, Model.BeatmapSetInfo.Metadata.Title)));
-            artistBind = localisation.GetLocalisedString(new LocalisedString((Model.BeatmapSetInfo.Metadata.ArtistUnicode, Model.BeatmapSetInfo.Metadata.Artist)));
+            titleBind = localisation.GetLocalisedString(new LocalisedString((Model.Metadata.TitleUnicode, Model.Metadata.Title)));
+            artistBind = localisation.GetLocalisedString(new LocalisedString((Model.Metadata.ArtistUnicode, Model.Metadata.Artist)));
 
             artistBind.BindValueChanged(_ => recreateText(), true);
         }
@@ -176,11 +134,11 @@ namespace osu.Game.Overlays.Music
 
             SelectedSet.BindValueChanged(set =>
             {
-                if (set.OldValue != Model.BeatmapSetInfo && set.NewValue != Model.BeatmapSetInfo)
+                if (set.OldValue != Model && set.NewValue != Model)
                     return;
 
                 foreach (Drawable s in titleSprites)
-                    s.FadeColour(set.NewValue == Model.BeatmapSetInfo ? hoverColour : Color4.White, fade_duration);
+                    s.FadeColour(set.NewValue == Model ? hoverColour : Color4.White, fade_duration);
             }, true);
         }
 
@@ -201,7 +159,7 @@ namespace osu.Game.Overlays.Music
 
         protected override bool OnClick(ClickEvent e)
         {
-            RequestSelection?.Invoke(Model.BeatmapSetInfo);
+            RequestSelection?.Invoke(Model);
             return true;
         }
 
diff --git a/osu.Game/Overlays/Music/PlaylistOverlay.cs b/osu.Game/Overlays/Music/PlaylistOverlay.cs
index 87abbd142c..a814712907 100644
--- a/osu.Game/Overlays/Music/PlaylistOverlay.cs
+++ b/osu.Game/Overlays/Music/PlaylistOverlay.cs
@@ -21,7 +21,9 @@ namespace osu.Game.Overlays.Music
         private const float transition_duration = 600;
         private const float playlist_height = 510;
 
-        public readonly IBindableList<BeatmapSetInfo> BeatmapSets = new BindableList<BeatmapSetInfo>();
+        public IBindableList<BeatmapSetInfo> BeatmapSets => beatmapSets;
+
+        private readonly BindableList<BeatmapSetInfo> beatmapSets = new BindableList<BeatmapSetInfo>();
 
         private readonly Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
         private BeatmapManager beatmaps;
@@ -72,7 +74,7 @@ namespace osu.Game.Overlays.Music
                 },
             };
 
-            list.BeatmapSets.BindTo(BeatmapSets);
+            list.Items.BindTo(beatmapSets);
 
             filter.Search.OnCommit = (sender, newText) =>
             {

From a7a3372a984bd9ad79c3414a4e75d16d883df2b5 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 30 Jan 2020 13:01:40 +0300
Subject: [PATCH 0076/1142] Remove redundant empty switch section

---
 .../Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs b/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
index e9377bb00b..d5bdcffeef 100644
--- a/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
+++ b/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
@@ -214,9 +214,6 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
                     addText($"{activity.User?.PreviousUsername} has changed their username to ");
                     addUserLink();
                     break;
-
-                default:
-                    break;
             }
         }
     }

From 00a7adcdca53ccc475372b5f9d5221944d17a696 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 30 Jan 2020 19:21:24 +0900
Subject: [PATCH 0077/1142] Further refactorings

---
 .../UserInterface/TestScenePlaylistOverlay.cs |   4 +-
 ...laylistList.cs => DrawablePlaylistItem.cs} |  48 +----
 osu.Game/Overlays/Music/Playlist.cs           |  46 +++++
 osu.Game/Overlays/Music/PlaylistItem.cs       | 183 ------------------
 osu.Game/Overlays/Music/PlaylistOverlay.cs    |   4 +-
 5 files changed, 53 insertions(+), 232 deletions(-)
 rename osu.Game/Overlays/Music/{PlaylistList.cs => DrawablePlaylistItem.cs} (75%)
 create mode 100644 osu.Game/Overlays/Music/Playlist.cs
 delete mode 100644 osu.Game/Overlays/Music/PlaylistItem.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs
index 986cf458ab..7476b52b49 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs
@@ -16,10 +16,10 @@ namespace osu.Game.Tests.Visual.UserInterface
 {
     public class TestScenePlaylistOverlay : OsuTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => new Type[]
+        public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(PlaylistOverlay),
-            typeof(PlaylistList)
+            typeof(Playlist)
         };
 
         private readonly BindableList<BeatmapSetInfo> beatmapSets = new BindableList<BeatmapSetInfo>();
diff --git a/osu.Game/Overlays/Music/PlaylistList.cs b/osu.Game/Overlays/Music/DrawablePlaylistItem.cs
similarity index 75%
rename from osu.Game/Overlays/Music/PlaylistList.cs
rename to osu.Game/Overlays/Music/DrawablePlaylistItem.cs
index e183c14f10..e3dd72ae8b 100644
--- a/osu.Game/Overlays/Music/PlaylistList.cs
+++ b/osu.Game/Overlays/Music/DrawablePlaylistItem.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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;
@@ -19,49 +19,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Music
 {
-    public class PlaylistList : RearrangeableListContainer<BeatmapSetInfo>
-    {
-        public Action<BeatmapSetInfo> RequestSelection;
-
-        public readonly Bindable<BeatmapSetInfo> SelectedSet = new Bindable<BeatmapSetInfo>();
-
-        public new MarginPadding Padding
-        {
-            get => base.Padding;
-            set => base.Padding = value;
-        }
-
-        public void Filter(string searchTerm) => ((PlaylistListFlowContainer)ListContainer).SearchTerm = searchTerm;
-
-        public BeatmapSetInfo FirstVisibleSet => ListContainer.FlowingChildren.Cast<DrawablePlaylistListItem>().FirstOrDefault(i => i.MatchingFilter)?.Model;
-
-        private void removeBeatmapSets(IEnumerable<BeatmapSetInfo> sets) => Schedule(() =>
-        {
-            foreach (var item in sets)
-                Items.Remove(ListContainer.Children.Select(d => d.Model).FirstOrDefault(m => m == item));
-        });
-
-        protected override DrawableRearrangeableListItem<BeatmapSetInfo> CreateDrawable(BeatmapSetInfo item) => new DrawablePlaylistListItem(item)
-        {
-            SelectedSet = { BindTarget = SelectedSet },
-            RequestSelection = set => RequestSelection?.Invoke(set)
-        };
-
-        protected override ScrollContainer<Drawable> CreateScrollContainer() => new OsuScrollContainer();
-
-        protected override FillFlowContainer<DrawableRearrangeableListItem<BeatmapSetInfo>> CreateListFillFlowContainer() => new PlaylistListFlowContainer
-        {
-            Spacing = new Vector2(0, 3),
-            LayoutDuration = 200,
-            LayoutEasing = Easing.OutQuint,
-        };
-    }
-
-    public class PlaylistListFlowContainer : SearchContainer<DrawableRearrangeableListItem<BeatmapSetInfo>>
-    {
-    }
-
-    public class DrawablePlaylistListItem : DrawableRearrangeableListItem<BeatmapSetInfo>, IFilterable
+    public class DrawablePlaylistItem : RearrangeableListItem<BeatmapSetInfo>, IFilterable
     {
         private const float fade_duration = 100;
 
@@ -77,7 +35,7 @@ namespace osu.Game.Overlays.Music
         private Color4 hoverColour;
         private Color4 artistColour;
 
-        public DrawablePlaylistListItem(BeatmapSetInfo item)
+        public DrawablePlaylistItem(BeatmapSetInfo item)
             : base(item)
         {
             RelativeSizeAxes = Axes.X;
diff --git a/osu.Game/Overlays/Music/Playlist.cs b/osu.Game/Overlays/Music/Playlist.cs
new file mode 100644
index 0000000000..ba9aaf03d4
--- /dev/null
+++ b/osu.Game/Overlays/Music/Playlist.cs
@@ -0,0 +1,46 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Linq;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics.Containers;
+using osuTK;
+
+namespace osu.Game.Overlays.Music
+{
+    public class Playlist : RearrangeableListContainer<BeatmapSetInfo>
+    {
+        public Action<BeatmapSetInfo> RequestSelection;
+
+        public readonly Bindable<BeatmapSetInfo> SelectedSet = new Bindable<BeatmapSetInfo>();
+
+        public new MarginPadding Padding
+        {
+            get => base.Padding;
+            set => base.Padding = value;
+        }
+
+        public void Filter(string searchTerm) => ((SearchContainer<RearrangeableListItem<BeatmapSetInfo>>)ListContainer).SearchTerm = searchTerm;
+
+        public BeatmapSetInfo FirstVisibleSet => Items.FirstOrDefault(i => ((DrawablePlaylistItem)ItemMap[i]).MatchingFilter);
+
+        protected override RearrangeableListItem<BeatmapSetInfo> CreateDrawable(BeatmapSetInfo item) => new DrawablePlaylistItem(item)
+        {
+            SelectedSet = { BindTarget = SelectedSet },
+            RequestSelection = set => RequestSelection?.Invoke(set)
+        };
+
+        protected override ScrollContainer<Drawable> CreateScrollContainer() => new OsuScrollContainer();
+
+        protected override FillFlowContainer<RearrangeableListItem<BeatmapSetInfo>> CreateListFillFlowContainer() => new SearchContainer<RearrangeableListItem<BeatmapSetInfo>>
+        {
+            Spacing = new Vector2(0, 3),
+            LayoutDuration = 200,
+            LayoutEasing = Easing.OutQuint,
+        };
+    }
+}
diff --git a/osu.Game/Overlays/Music/PlaylistItem.cs b/osu.Game/Overlays/Music/PlaylistItem.cs
deleted file mode 100644
index d40f391982..0000000000
--- a/osu.Game/Overlays/Music/PlaylistItem.cs
+++ /dev/null
@@ -1,183 +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 System;
-using System.Collections.Generic;
-using System.Linq;
-using osuTK.Graphics;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Input.Events;
-using osu.Framework.Localisation;
-using osu.Game.Beatmaps;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
-using osuTK;
-
-namespace osu.Game.Overlays.Music
-{
-    public class PlaylistItem : Container, IFilterable, IDraggable
-    {
-        private const float fade_duration = 100;
-
-        private Color4 hoverColour;
-        private Color4 artistColour;
-
-        private SpriteIcon handle;
-        private TextFlowContainer text;
-        private IEnumerable<Drawable> titleSprites;
-        private ILocalisedBindableString titleBind;
-        private ILocalisedBindableString artistBind;
-
-        public readonly BeatmapSetInfo BeatmapSetInfo;
-
-        public Action<BeatmapSetInfo> OnSelect;
-
-        public bool IsDraggable { get; private set; }
-
-        protected override bool OnMouseDown(MouseDownEvent e)
-        {
-            IsDraggable = handle.IsHovered;
-            return base.OnMouseDown(e);
-        }
-
-        protected override void OnMouseUp(MouseUpEvent e)
-        {
-            IsDraggable = false;
-            base.OnMouseUp(e);
-        }
-
-        private bool selected;
-
-        public bool Selected
-        {
-            get => selected;
-            set
-            {
-                if (value == selected) return;
-
-                selected = value;
-
-                FinishTransforms(true);
-                foreach (Drawable s in titleSprites)
-                    s.FadeColour(Selected ? hoverColour : Color4.White, fade_duration);
-            }
-        }
-
-        public PlaylistItem(BeatmapSetInfo setInfo)
-        {
-            BeatmapSetInfo = setInfo;
-
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
-            Padding = new MarginPadding { Top = 3, Bottom = 3 };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours, LocalisationManager localisation)
-        {
-            hoverColour = colours.Yellow;
-            artistColour = colours.Gray9;
-
-            var metadata = BeatmapSetInfo.Metadata;
-            FilterTerms = metadata.SearchableTerms;
-
-            Children = new Drawable[]
-            {
-                handle = new PlaylistItemHandle
-                {
-                    Colour = colours.Gray5
-                },
-                text = new OsuTextFlowContainer
-                {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Padding = new MarginPadding { Left = 20 },
-                    ContentIndent = 10f,
-                },
-            };
-
-            titleBind = localisation.GetLocalisedString(new LocalisedString((metadata.TitleUnicode, metadata.Title)));
-            artistBind = localisation.GetLocalisedString(new LocalisedString((metadata.ArtistUnicode, metadata.Artist)));
-
-            artistBind.BindValueChanged(_ => recreateText(), true);
-        }
-
-        private void recreateText()
-        {
-            text.Clear();
-
-            //space after the title to put a space between the title and artist
-            titleSprites = text.AddText(titleBind.Value + @"  ", sprite => sprite.Font = OsuFont.GetFont(weight: FontWeight.Regular)).OfType<SpriteText>();
-
-            text.AddText(artistBind.Value, sprite =>
-            {
-                sprite.Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold);
-                sprite.Colour = artistColour;
-                sprite.Padding = new MarginPadding { Top = 1 };
-            });
-        }
-
-        protected override bool OnHover(HoverEvent e)
-        {
-            handle.FadeIn(fade_duration);
-
-            return base.OnHover(e);
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            handle.FadeOut(fade_duration);
-        }
-
-        protected override bool OnClick(ClickEvent e)
-        {
-            OnSelect?.Invoke(BeatmapSetInfo);
-            return true;
-        }
-
-        public IEnumerable<string> FilterTerms { get; private set; }
-
-        private bool matching = true;
-
-        public bool MatchingFilter
-        {
-            get => matching;
-            set
-            {
-                if (matching == value) return;
-
-                matching = value;
-
-                this.FadeTo(matching ? 1 : 0, 200);
-            }
-        }
-
-        public bool FilteringActive { get; set; }
-
-        private class PlaylistItemHandle : SpriteIcon
-        {
-            public PlaylistItemHandle()
-            {
-                Anchor = Anchor.CentreLeft;
-                Origin = Anchor.CentreLeft;
-                Size = new Vector2(12);
-                Icon = FontAwesome.Solid.Bars;
-                Alpha = 0f;
-                Margin = new MarginPadding { Left = 5 };
-            }
-
-            public override bool HandlePositionalInput => IsPresent;
-        }
-    }
-
-    public interface IDraggable : IDrawable
-    {
-        /// <summary>
-        /// Whether this <see cref="IDraggable"/> can be dragged in its current state.
-        /// </summary>
-        bool IsDraggable { get; }
-    }
-}
diff --git a/osu.Game/Overlays/Music/PlaylistOverlay.cs b/osu.Game/Overlays/Music/PlaylistOverlay.cs
index a814712907..7c391e27f9 100644
--- a/osu.Game/Overlays/Music/PlaylistOverlay.cs
+++ b/osu.Game/Overlays/Music/PlaylistOverlay.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Overlays.Music
         private BeatmapManager beatmaps;
 
         private FilterControl filter;
-        private PlaylistList list;
+        private Playlist list;
 
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, Bindable<WorkingBeatmap> beatmap, BeatmapManager beatmaps)
@@ -57,7 +57,7 @@ namespace osu.Game.Overlays.Music
                             Colour = colours.Gray3,
                             RelativeSizeAxes = Axes.Both,
                         },
-                        list = new PlaylistList
+                        list = new Playlist
                         {
                             RelativeSizeAxes = Axes.Both,
                             Padding = new MarginPadding { Top = 95, Bottom = 10, Right = 10 },

From 0c4540b551138d3ca0676469071c0f0d18315ce5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 30 Jan 2020 19:23:53 +0900
Subject: [PATCH 0078/1142] Rename PlaylistItem

---
 osu.Game/Overlays/Music/Playlist.cs                           | 4 ++--
 .../Music/{DrawablePlaylistItem.cs => PlaylistItem.cs}        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename osu.Game/Overlays/Music/{DrawablePlaylistItem.cs => PlaylistItem.cs} (97%)

diff --git a/osu.Game/Overlays/Music/Playlist.cs b/osu.Game/Overlays/Music/Playlist.cs
index ba9aaf03d4..8744a6db8b 100644
--- a/osu.Game/Overlays/Music/Playlist.cs
+++ b/osu.Game/Overlays/Music/Playlist.cs
@@ -26,9 +26,9 @@ namespace osu.Game.Overlays.Music
 
         public void Filter(string searchTerm) => ((SearchContainer<RearrangeableListItem<BeatmapSetInfo>>)ListContainer).SearchTerm = searchTerm;
 
-        public BeatmapSetInfo FirstVisibleSet => Items.FirstOrDefault(i => ((DrawablePlaylistItem)ItemMap[i]).MatchingFilter);
+        public BeatmapSetInfo FirstVisibleSet => Items.FirstOrDefault(i => ((PlaylistItem)ItemMap[i]).MatchingFilter);
 
-        protected override RearrangeableListItem<BeatmapSetInfo> CreateDrawable(BeatmapSetInfo item) => new DrawablePlaylistItem(item)
+        protected override RearrangeableListItem<BeatmapSetInfo> CreateDrawable(BeatmapSetInfo item) => new PlaylistItem(item)
         {
             SelectedSet = { BindTarget = SelectedSet },
             RequestSelection = set => RequestSelection?.Invoke(set)
diff --git a/osu.Game/Overlays/Music/DrawablePlaylistItem.cs b/osu.Game/Overlays/Music/PlaylistItem.cs
similarity index 97%
rename from osu.Game/Overlays/Music/DrawablePlaylistItem.cs
rename to osu.Game/Overlays/Music/PlaylistItem.cs
index e3dd72ae8b..4ce67c2d66 100644
--- a/osu.Game/Overlays/Music/DrawablePlaylistItem.cs
+++ b/osu.Game/Overlays/Music/PlaylistItem.cs
@@ -19,7 +19,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Music
 {
-    public class DrawablePlaylistItem : RearrangeableListItem<BeatmapSetInfo>, IFilterable
+    public class PlaylistItem : RearrangeableListItem<BeatmapSetInfo>, IFilterable
     {
         private const float fade_duration = 100;
 
@@ -35,7 +35,7 @@ namespace osu.Game.Overlays.Music
         private Color4 hoverColour;
         private Color4 artistColour;
 
-        public DrawablePlaylistItem(BeatmapSetInfo item)
+        public PlaylistItem(BeatmapSetInfo item)
             : base(item)
         {
             RelativeSizeAxes = Axes.X;

From 8e966624e02345c593501f69cabd8c78b34ec384 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jan 2020 19:55:25 +0900
Subject: [PATCH 0079/1142] Fix regressing tests

---
 .../Visual/UserInterface/TestSceneModSelectOverlay.cs  |  1 +
 .../Visual/UserInterface/TestSceneModSettings.cs       | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 12ee4ceb2e..cd0ce26ea5 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -63,6 +63,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                     RelativeSizeAxes = Axes.X,
                     Origin = Anchor.BottomCentre,
                     Anchor = Anchor.BottomCentre,
+                    SelectedMods = { BindTarget = SelectedMods }
                 },
 
                 modDisplay = new ModDisplay
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
index e2ce2341e5..a89b4f5ba9 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
@@ -27,6 +27,13 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private readonly Mod testCustomisableAutoOpenMod = new TestModCustomisable2();
 
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            SelectedMods.Value = Array.Empty<Mod>();
+            Ruleset.Value = new TestRulesetInfo();
+        });
+
         [Test]
         public void TestButtonShowsOnCustomisableMod()
         {
@@ -70,13 +77,12 @@ namespace osu.Game.Tests.Visual.UserInterface
         {
             AddStep("create mod select", () =>
             {
-                Ruleset.Value = new TestRulesetInfo();
-
                 Child = modSelect = new TestModSelectOverlay
                 {
                     RelativeSizeAxes = Axes.X,
                     Origin = Anchor.BottomCentre,
                     Anchor = Anchor.BottomCentre,
+                    SelectedMods = { BindTarget = SelectedMods }
                 };
             });
         }

From 3f62c40e709bd1ac2d66abe6f33578fa99ed8aec Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 30 Jan 2020 13:55:50 +0300
Subject: [PATCH 0080/1142] Increase spacing

---
 .../Profile/Sections/Recent/PaginatedRecentActivityContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs b/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
index 7a9cce4675..a37f398272 100644
--- a/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Recent/PaginatedRecentActivityContainer.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
             : base(user, header, missing)
         {
             ItemsPerPage = 10;
-            ItemsContainer.Spacing = new Vector2(0, 5);
+            ItemsContainer.Spacing = new Vector2(0, 8);
         }
 
         protected override APIRequest<List<APIRecentActivity>> CreateRequest() =>

From 3002366e70281b1bc600c741239a529b114ae9f1 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 30 Jan 2020 13:56:19 +0300
Subject: [PATCH 0081/1142] Adjust mode part

---
 .../Requests/Responses/APIRecentActivity.cs   | 31 ++++++++++++++++++-
 .../Sections/Recent/DrawableRecentActivity.cs |  4 +--
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Online/API/Requests/Responses/APIRecentActivity.cs b/osu.Game/Online/API/Requests/Responses/APIRecentActivity.cs
index 8695d09570..92b520c36b 100644
--- a/osu.Game/Online/API/Requests/Responses/APIRecentActivity.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIRecentActivity.cs
@@ -41,8 +41,37 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty("count")]
         public int Count;
 
+        public string Mode { get; private set; }
+
         [JsonProperty("mode")]
-        public string Mode;
+        private string mode
+        {
+            set
+            {
+                switch (value)
+                {
+                    default:
+                        Mode = value;
+                        return;
+
+                    case "osu":
+                        Mode = "osu!";
+                        return;
+
+                    case "mania":
+                        Mode = "osu!mania";
+                        return;
+
+                    case "taiko":
+                        Mode = "osu!taiko";
+                        return;
+
+                    case "fruits":
+                        Mode = "osu!catch";
+                        return;
+                }
+            }
+        }
 
         [JsonProperty("beatmap")]
         public RecentActivityBeatmap Beatmap;
diff --git a/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs b/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
index d5bdcffeef..3f8ab93abd 100644
--- a/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
+++ b/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
@@ -185,14 +185,14 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
                     addUserLink();
                     addText($" achieved rank #{activity.Rank} on ");
                     addBeatmapLink();
-                    addText($" ({activity.Mode}!)");
+                    addText($" ({activity.Mode})");
                     break;
 
                 case RecentActivityType.RankLost:
                     addUserLink();
                     addText(" has lost first place on ");
                     addBeatmapLink();
-                    addText($" ({activity.Mode}!)");
+                    addText($" ({activity.Mode})");
                     break;
 
                 case RecentActivityType.UserSupportAgain:

From 3db4c11f29979057147f0e3589ed3009e917ec13 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 30 Jan 2020 14:05:55 +0300
Subject: [PATCH 0082/1142] CI fix

---
 osu.Game/Online/API/Requests/Responses/APIRecentActivity.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/API/Requests/Responses/APIRecentActivity.cs b/osu.Game/Online/API/Requests/Responses/APIRecentActivity.cs
index 92b520c36b..b416085217 100644
--- a/osu.Game/Online/API/Requests/Responses/APIRecentActivity.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIRecentActivity.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty("count")]
         public int Count;
 
-        public string Mode { get; private set; }
+        public string Mode;
 
         [JsonProperty("mode")]
         private string mode

From 878250056c1dc4096c76c8ace223a6cc202f6787 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jan 2020 23:34:04 +0900
Subject: [PATCH 0083/1142] Remove unused parameter

---
 osu.Game/OsuGame.cs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 374bacde00..321cb25088 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -327,7 +327,7 @@ namespace osu.Game
                 return;
             }
 
-            performFromScreen(screen =>
+            PerformFromScreen(screen =>
             {
                 // we might already be at song select, so a check is required before performing the load to solo.
                 if (screen is MainMenu)
@@ -344,7 +344,7 @@ namespace osu.Game
 
                 Ruleset.Value = first.Ruleset;
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(first);
-            }, $"load {beatmap}", validScreens: new[] { typeof(PlaySongSelect) });
+            }, validScreens: new[] { typeof(PlaySongSelect) });
         }
 
         /// <summary>
@@ -381,12 +381,12 @@ namespace osu.Game
                 return;
             }
 
-            performFromScreen(screen =>
+            PerformFromScreen(screen =>
             {
                 Beatmap.Value = BeatmapManager.GetWorkingBeatmap(databasedBeatmap);
 
                 screen.Push(new ReplayPlayerLoader(databasedScore));
-            }, $"watch {databasedScoreInfo}");
+            });
         }
 
         protected virtual Loader CreateLoader() => new Loader();
@@ -445,9 +445,8 @@ namespace osu.Game
         /// Eagerly tries to exit the current screen until it succeeds.
         /// </summary>
         /// <param name="action">The action to perform once we are in the correct state.</param>
-        /// <param name="taskName">The task name to display in a notification (if we can't immediately reach the main menu state).</param>
         /// <param name="validScreens">An optional collection of valid screen types. If any of these screens are already current we can immediately perform the action immediately, else the first valid parent will be made current before performing the action. <see cref="MainMenu"/> is used if not specified.</param>
-        private void performFromScreen(Action<IScreen> action, string taskName, IEnumerable<Type> validScreens = null)
+        protected void PerformFromScreen(Action<IScreen> action, IEnumerable<Type> validScreens = null)
         {
             performFromMainMenuTask?.Cancel();
 
@@ -477,7 +476,7 @@ namespace osu.Game
                 screen = screen.GetParentScreen();
             }
 
-            performFromMainMenuTask = Schedule(() => performFromScreen(action, taskName, validScreens));
+            performFromMainMenuTask = Schedule(() => PerformFromScreen(action, validScreens));
         }
 
         /// <summary>

From 6b24b7687f68137c6dfca6fdb10b7121275eba3f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 30 Jan 2020 23:45:15 +0900
Subject: [PATCH 0084/1142] Add test coverage

---
 .../Visual/Navigation/OsuGameTestScene.cs     | 11 +++
 .../Navigation/TestScenePerformFromScreen.cs  | 72 +++++++++++++++++++
 .../Navigation/TestSceneScreenNavigation.cs   | 19 ++---
 3 files changed, 88 insertions(+), 14 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs

diff --git a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
index 662d9977ba..8d2e4a614d 100644
--- a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
+++ b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
+using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Configuration;
@@ -76,6 +78,13 @@ namespace osu.Game.Tests.Visual.Navigation
             ConfirmAtMainMenu();
         }
 
+        protected void PushAndConfirm(Func<Screen> newScreen)
+        {
+            Screen screen = null;
+            AddStep("Push new screen", () => Game.ScreenStack.Push(screen = newScreen()));
+            AddUntilStep("Wait for new screen", () => Game.ScreenStack.CurrentScreen == screen && screen.IsLoaded);
+        }
+
         protected void ConfirmAtMainMenu() => AddUntilStep("Wait for main menu", () => Game.ScreenStack.CurrentScreen is MainMenu menu && menu.IsLoaded);
 
         public class TestOsuGame : OsuGame
@@ -96,6 +105,8 @@ namespace osu.Game.Tests.Visual.Navigation
 
             protected override Loader CreateLoader() => new TestLoader();
 
+            public new void PerformFromScreen(Action<IScreen> action, IEnumerable<Type> validScreens = null) => base.PerformFromScreen(action, validScreens);
+
             public TestOsuGame(Storage storage, IAPIProvider api)
             {
                 Storage = storage;
diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs b/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
new file mode 100644
index 0000000000..75c6a2b733
--- /dev/null
+++ b/osu.Game.Tests/Visual/Navigation/TestScenePerformFromScreen.cs
@@ -0,0 +1,72 @@
+// 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.Game.Screens.Menu;
+using osu.Game.Screens.Play;
+using osu.Game.Screens.Select;
+
+namespace osu.Game.Tests.Visual.Navigation
+{
+    public class TestScenePerformFromScreen : OsuGameTestScene
+    {
+        [Test]
+        public void TestPerformAtMenu()
+        {
+            AddAssert("could perform immediately", () =>
+            {
+                bool actionPerformed = false;
+                Game.PerformFromScreen(_ => actionPerformed = true);
+                return actionPerformed;
+            });
+        }
+
+        [Test]
+        public void TestPerformAtSongSelect()
+        {
+            PushAndConfirm(() => new PlaySongSelect());
+
+            AddAssert("could perform immediately", () =>
+            {
+                bool actionPerformed = false;
+                Game.PerformFromScreen(_ => actionPerformed = true, new[] { typeof(PlaySongSelect) });
+                return actionPerformed;
+            });
+        }
+
+        [Test]
+        public void TestPerformAtMenuFromSongSelect()
+        {
+            PushAndConfirm(() => new PlaySongSelect());
+
+            bool actionPerformed = false;
+            AddStep("try to perform", () => Game.PerformFromScreen(_ => actionPerformed = true));
+            AddUntilStep("returned to menu", () => Game.ScreenStack.CurrentScreen is MainMenu);
+            AddAssert("did perform", () => actionPerformed);
+        }
+
+        [Test]
+        public void TestPerformAtSongSelectFromPlayerLoader()
+        {
+            PushAndConfirm(() => new PlaySongSelect());
+            PushAndConfirm(() => new PlayerLoader(() => new Player()));
+
+            bool actionPerformed = false;
+            AddStep("try to perform", () => Game.PerformFromScreen(_ => actionPerformed = true, new[] { typeof(PlaySongSelect) }));
+            AddUntilStep("returned to song select", () => Game.ScreenStack.CurrentScreen is PlaySongSelect);
+            AddAssert("did perform", () => actionPerformed);
+        }
+
+        [Test]
+        public void TestPerformAtMenuFromPlayerLoader()
+        {
+            PushAndConfirm(() => new PlaySongSelect());
+            PushAndConfirm(() => new PlayerLoader(() => new Player()));
+
+            bool actionPerformed = false;
+            AddStep("try to perform", () => Game.PerformFromScreen(_ => actionPerformed = true));
+            AddUntilStep("returned to song select", () => Game.ScreenStack.CurrentScreen is MainMenu);
+            AddAssert("did perform", () => actionPerformed);
+        }
+    }
+}
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index d706d47384..8258cc9465 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -1,13 +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.
 
-using System;
 using System.Linq;
 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;
@@ -32,7 +30,7 @@ namespace osu.Game.Tests.Visual.Navigation
         {
             TestSongSelect songSelect = null;
 
-            pushAndConfirm(() => songSelect = new TestSongSelect());
+            PushAndConfirm(() => songSelect = new TestSongSelect());
             AddStep("Show mods overlay", () => songSelect.ModSelectOverlay.Show());
             AddAssert("Overlay was shown", () => songSelect.ModSelectOverlay.State.Value == Visibility.Visible);
             pushEscape();
@@ -49,7 +47,7 @@ namespace osu.Game.Tests.Visual.Navigation
             WorkingBeatmap beatmap() => Game.Beatmap.Value;
             Track track() => beatmap().Track;
 
-            pushAndConfirm(() => new TestSongSelect());
+            PushAndConfirm(() => new TestSongSelect());
 
             AddStep("import beatmap", () => ImportBeatmapTest.LoadOszIntoOsu(Game, virtualTrack: true).Wait());
 
@@ -77,7 +75,7 @@ namespace osu.Game.Tests.Visual.Navigation
         {
             TestSongSelect songSelect = null;
 
-            pushAndConfirm(() => songSelect = new TestSongSelect());
+            PushAndConfirm(() => songSelect = new TestSongSelect());
             AddStep("Show mods overlay", () => songSelect.ModSelectOverlay.Show());
             AddAssert("Overlay was shown", () => songSelect.ModSelectOverlay.State.Value == Visibility.Visible);
             AddStep("Move mouse to backButton", () => InputManager.MoveMouseTo(backButtonPosition));
@@ -93,14 +91,14 @@ namespace osu.Game.Tests.Visual.Navigation
         [Test]
         public void TestExitMultiWithEscape()
         {
-            pushAndConfirm(() => new Screens.Multi.Multiplayer());
+            PushAndConfirm(() => new Screens.Multi.Multiplayer());
             exitViaEscapeAndConfirm();
         }
 
         [Test]
         public void TestExitMultiWithBackButton()
         {
-            pushAndConfirm(() => new Screens.Multi.Multiplayer());
+            PushAndConfirm(() => new Screens.Multi.Multiplayer());
             exitViaBackButtonAndConfirm();
         }
 
@@ -116,13 +114,6 @@ namespace osu.Game.Tests.Visual.Navigation
             AddAssert("Options overlay was closed", () => Game.Settings.State.Value == Visibility.Hidden);
         }
 
-        private void pushAndConfirm(Func<Screen> newScreen)
-        {
-            Screen screen = null;
-            AddStep("Push new screen", () => Game.ScreenStack.Push(screen = newScreen()));
-            AddUntilStep("Wait for new screen", () => Game.ScreenStack.CurrentScreen == screen && screen.IsLoaded);
-        }
-
         private void pushEscape() =>
             AddStep("Press escape", () => pressAndRelease(Key.Escape));
 

From f51cfa22204c3b4da2ebbd3eb3d32912f11d576f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 31 Jan 2020 00:24:00 +0900
Subject: [PATCH 0085/1142] Fix too many ticks being displayed on beatmaps with
 multiple timing sections

Closes https://github.com/ppy/osu/issues/7681.
---
 .../Edit/Compose/Components/Timeline/TimelineTickDisplay.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
index f9b92c0504..b565a42c5a 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             for (var i = 0; i < beatmap.ControlPointInfo.TimingPoints.Count; i++)
             {
                 var point = beatmap.ControlPointInfo.TimingPoints[i];
-                var until = beatmap.ControlPointInfo.TimingPoints.Count < i + 1 ? beatmap.ControlPointInfo.TimingPoints[i + 1].Time : working.Value.Track.Length;
+                var until = beatmap.ControlPointInfo.TimingPoints.Count > i + 1 ? beatmap.ControlPointInfo.TimingPoints[i + 1].Time : working.Value.Track.Length;
 
                 int beat = 0;
 

From 40a44357925e9e0479aaf8b315935655e12605eb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 31 Jan 2020 00:33:24 +0900
Subject: [PATCH 0086/1142] Fix chat test intermittently failing

Was throwing exception instead of returning false due to LINQ Single() call.
---
 osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index 29bda524e8..1561d0d11d 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -104,7 +104,11 @@ namespace osu.Game.Tests.Visual.Online
         public void TestSearchInSelector()
         {
             AddStep("search for 'test2'", () => chatOverlay.ChildrenOfType<SearchTextBox>().First().Text = "test2");
-            AddUntilStep("only channel 2 visible", () => chatOverlay.ChildrenOfType<ChannelListItem>().Single(c => c.IsPresent).Channel == channel2);
+            AddUntilStep("only channel 2 visible", () =>
+            {
+                var listItems = chatOverlay.ChildrenOfType<ChannelListItem>().Where(c => c.IsPresent);
+                return listItems.Count() == 1 && listItems.Single().Channel == channel2;
+            });
         }
 
         private void clickDrawable(Drawable d)

From 682d0e6e712984007307e0d3679d23f53da0860b Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Thu, 30 Jan 2020 17:46:59 +0100
Subject: [PATCH 0087/1142] Fix typo in variable

---
 .../Overlays/Profile/Header/BottomHeaderContainer.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
index b6c6f33678..aa8b332bd3 100644
--- a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
@@ -111,14 +111,14 @@ namespace osu.Game.Overlays.Profile.Header
             topLinkContainer.AddText("Contributed ");
             topLinkContainer.AddLink($@"{user.PostCount:#,##0} forum posts", $"https://osu.ppy.sh/users/{user.Id}/posts", creationParameters: embolden);
 
-            string websiteWithoutProtcol = user.Website;
+            string websiteWithoutProtocol = user.Website;
 
-            if (!string.IsNullOrEmpty(websiteWithoutProtcol))
+            if (!string.IsNullOrEmpty(websiteWithoutProtocol))
             {
-                if (Uri.TryCreate(websiteWithoutProtcol, UriKind.Absolute, out var uri))
+                if (Uri.TryCreate(websiteWithoutProtocol, UriKind.Absolute, out var uri))
                 {
-                    websiteWithoutProtcol = uri.Host + uri.PathAndQuery + uri.Fragment;
-                    websiteWithoutProtcol = websiteWithoutProtcol.TrimEnd('/');
+                    websiteWithoutProtocol = uri.Host + uri.PathAndQuery + uri.Fragment;
+                    websiteWithoutProtocol = websiteWithoutProtocol.TrimEnd('/');
                 }
             }
 
@@ -131,7 +131,7 @@ namespace osu.Game.Overlays.Profile.Header
             tryAddInfo(FontAwesome.Brands.Discord, user.Discord);
             tryAddInfo(FontAwesome.Brands.Skype, user.Skype, @"skype:" + user.Skype + @"?chat");
             tryAddInfo(FontAwesome.Brands.Lastfm, user.Lastfm, $@"https://last.fm/users/{user.Lastfm}");
-            tryAddInfo(FontAwesome.Solid.Link, websiteWithoutProtcol, user.Website);
+            tryAddInfo(FontAwesome.Solid.Link, websiteWithoutProtocol, user.Website);
         }
 
         private void addSpacer(OsuTextFlowContainer textFlow) => textFlow.AddArbitraryDrawable(new Container { Width = 15 });

From 754200d84358b740f80c744be45018d6968a32f6 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Thu, 30 Jan 2020 18:10:40 +0100
Subject: [PATCH 0088/1142] Fix padding when user has no additional info

---
 osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
index aa8b332bd3..7531cab024 100644
--- a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
@@ -132,6 +132,10 @@ namespace osu.Game.Overlays.Profile.Header
             tryAddInfo(FontAwesome.Brands.Skype, user.Skype, @"skype:" + user.Skype + @"?chat");
             tryAddInfo(FontAwesome.Brands.Lastfm, user.Lastfm, $@"https://last.fm/users/{user.Lastfm}");
             tryAddInfo(FontAwesome.Solid.Link, websiteWithoutProtocol, user.Website);
+
+            // Hide the container to prevent adding unnecessary padding if it has no children other than the NewLine
+            if (!bottomLinkContainer.Children.Skip(1).Any())
+                bottomLinkContainer.Hide();
         }
 
         private void addSpacer(OsuTextFlowContainer textFlow) => textFlow.AddArbitraryDrawable(new Container { Width = 15 });

From de9a1737a5f04800c5c1ee2f1dbb9c23a9ffa226 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Thu, 30 Jan 2020 18:18:42 +0100
Subject: [PATCH 0089/1142] Recolour LevelProgressBar

---
 .../Overlays/Profile/Header/Components/LevelProgressBar.cs    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/LevelProgressBar.cs b/osu.Game/Overlays/Profile/Header/Components/LevelProgressBar.cs
index a73ce56a2b..c97df3bc4d 100644
--- a/osu.Game/Overlays/Profile/Header/Components/LevelProgressBar.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/LevelProgressBar.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colourProvider)
         {
             InternalChildren = new Drawable[]
             {
@@ -42,7 +42,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
                         RelativeSizeAxes = Axes.Both,
                         BackgroundColour = Color4.Black,
                         Direction = BarDirection.LeftToRight,
-                        AccentColour = colours.Yellow
+                        AccentColour = colourProvider.Highlight1
                     }
                 },
                 levelProgressText = new OsuSpriteText

From e69d93ae5c01b90d0a5d6fea4c0aa58bd4f86e2e Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Thu, 30 Jan 2020 19:26:42 +0100
Subject: [PATCH 0090/1142] Adjust ProfileTabControl height

---
 osu.Game/Overlays/UserProfileOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/UserProfileOverlay.cs b/osu.Game/Overlays/UserProfileOverlay.cs
index 6f0d96c226..045a52a0c7 100644
--- a/osu.Game/Overlays/UserProfileOverlay.cs
+++ b/osu.Game/Overlays/UserProfileOverlay.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Overlays
                 RelativeSizeAxes = Axes.X,
                 Anchor = Anchor.TopCentre,
                 Origin = Anchor.TopCentre,
-                Height = 30
+                Height = 34
             };
 
             Add(new Box

From 1751e96840e345d6c51b95eec54dd9f692052807 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Thu, 30 Jan 2020 19:45:12 +0100
Subject: [PATCH 0091/1142] Recolour ProfileHeaderButton

---
 .../Profile/Header/Components/ProfileHeaderButton.cs  | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderButton.cs b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderButton.cs
index ddcf011277..ae94f3485f 100644
--- a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderButton.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -24,9 +25,6 @@ namespace osu.Game.Overlays.Profile.Header.Components
         {
             AutoSizeAxes = Axes.X;
 
-            IdleColour = Color4.Black;
-            HoverColour = OsuColour.Gray(0.1f);
-
             base.Content.Add(new CircularContainer
             {
                 Masking = true,
@@ -47,5 +45,12 @@ namespace osu.Game.Overlays.Profile.Header.Components
                 }
             });
         }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            IdleColour = colourProvider.Background6;
+            HoverColour = colourProvider.Background5;
+        }
     }
 }

From 3970151e31bbc571fbee4b3fe4f7fc159488827f Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Thu, 30 Jan 2020 20:51:33 +0100
Subject: [PATCH 0092/1142] Improve condition check

---
 osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
index 7531cab024..86e816a28c 100644
--- a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
@@ -15,6 +15,7 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Users;
 using osuTK;
 using osuTK.Graphics;
+using static osu.Framework.Graphics.Containers.TextFlowContainer;
 
 namespace osu.Game.Overlays.Profile.Header
 {
@@ -133,9 +134,12 @@ namespace osu.Game.Overlays.Profile.Header
             tryAddInfo(FontAwesome.Brands.Lastfm, user.Lastfm, $@"https://last.fm/users/{user.Lastfm}");
             tryAddInfo(FontAwesome.Solid.Link, websiteWithoutProtocol, user.Website);
 
-            // Hide the container to prevent adding unnecessary padding if it has no children other than the NewLine
-            if (!bottomLinkContainer.Children.Skip(1).Any())
+            // Hide the container to prevent adding unnecessary padding if it has no children other than the NewLineContainer
+            if (!bottomLinkContainer.Children.Any(child => !(child is NewLineContainer)))
                 bottomLinkContainer.Hide();
+            else
+                // this is needed if user gets changed without the whole header being reloaded
+                bottomLinkContainer.Show();
         }
 
         private void addSpacer(OsuTextFlowContainer textFlow) => textFlow.AddArbitraryDrawable(new Container { Width = 15 });

From a3877cc29e549999d82bd8e45c2de37e50b2c83d Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Thu, 30 Jan 2020 20:55:44 +0100
Subject: [PATCH 0093/1142] Recolour RankGraph circle

---
 osu.Game/Overlays/Profile/Header/Components/RankGraph.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
index 250b345db7..aed63293ea 100644
--- a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
@@ -167,9 +167,9 @@ namespace osu.Game.Overlays.Profile.Header.Components
             }
 
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
+            private void load(OverlayColourProvider colourProvider, OsuColour colours)
             {
-                ballBg.Colour = colours.GreySeafoamDarker;
+                ballBg.Colour = colourProvider.Background5;
                 movingBall.BorderColour = line.Colour = colours.Yellow;
             }
 

From fcd05b5a3c1ddd70a0afcd314fa732d2d481bf76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 30 Jan 2020 21:17:46 +0100
Subject: [PATCH 0094/1142] Add failing test

---
 .../Visual/Online/TestSceneChatOverlay.cs     | 52 +++++++++++++++++--
 1 file changed, 47 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index 1561d0d11d..19bdaff6ff 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -38,9 +38,21 @@ namespace osu.Game.Tests.Visual.Online
         private TestChatOverlay chatOverlay;
         private ChannelManager channelManager;
 
-        private readonly Channel channel1 = new Channel(new User()) { Name = "test really long username", Topic = "Topic for channel 1" };
-        private readonly Channel channel2 = new Channel(new User()) { Name = "test2", Topic = "Topic for channel 2" };
-        private readonly Channel channel3 = new Channel(new User()) { Name = "channel with no topic" };
+        private readonly List<Channel> channels;
+
+        private Channel channel1 => channels[0];
+        private Channel channel2 => channels[1];
+
+        public TestSceneChatOverlay()
+        {
+            channels = Enumerable.Range(1, 10)
+                                 .Select(index => new Channel(new User())
+                                 {
+                                     Name = $"Channel no. {index}",
+                                     Topic = index == 3 ? null : $"We talk about the number {index} here"
+                                 })
+                                 .ToList();
+        }
 
         [SetUp]
         public void Setup()
@@ -49,7 +61,7 @@ namespace osu.Game.Tests.Visual.Online
             {
                 ChannelManagerContainer container;
 
-                Child = container = new ChannelManagerContainer(new List<Channel> { channel1, channel2, channel3 })
+                Child = container = new ChannelManagerContainer(channels)
                 {
                     RelativeSizeAxes = Axes.Both,
                 };
@@ -103,7 +115,7 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestSearchInSelector()
         {
-            AddStep("search for 'test2'", () => chatOverlay.ChildrenOfType<SearchTextBox>().First().Text = "test2");
+            AddStep("search for 'no. 2'", () => chatOverlay.ChildrenOfType<SearchTextBox>().First().Text = "no. 2");
             AddUntilStep("only channel 2 visible", () =>
             {
                 var listItems = chatOverlay.ChildrenOfType<ChannelListItem>().Where(c => c.IsPresent);
@@ -111,6 +123,36 @@ namespace osu.Game.Tests.Visual.Online
             });
         }
 
+        [Test]
+        public void TestChannelShortcutKeys()
+        {
+            AddStep("join 10 channels", () => channels.ForEach(channel => channelManager.JoinChannel(channel)));
+            AddStep("close channel selector", () =>
+            {
+                InputManager.PressKey(Key.Escape);
+                InputManager.ReleaseKey(Key.Escape);
+            });
+            AddUntilStep("wait for close", () => chatOverlay.SelectionOverlayState == Visibility.Hidden);
+
+            for (int zeroBasedIndex = 0; zeroBasedIndex < 10; ++zeroBasedIndex)
+            {
+                var oneBasedIndex = zeroBasedIndex + 1;
+                var targetNumberKey = oneBasedIndex % 10;
+                var targetChannel = channels[zeroBasedIndex];
+                AddStep($"press Alt+{targetNumberKey}", () => pressChannelHotkey(targetNumberKey));
+                AddAssert($"channel #{oneBasedIndex} is selected", () => channelManager.CurrentChannel.Value == targetChannel);
+            }
+        }
+
+        private void pressChannelHotkey(int number)
+        {
+            var channelKey = Key.Number0 + number;
+            InputManager.PressKey(Key.AltLeft);
+            InputManager.PressKey(channelKey);
+            InputManager.ReleaseKey(Key.AltLeft);
+            InputManager.ReleaseKey(channelKey);
+        }
+
         private void clickDrawable(Drawable d)
         {
             InputManager.MoveMouseTo(d);

From c38dc815351616ff14ce3b7941ab736d9df18c94 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Thu, 30 Jan 2020 21:39:06 +0100
Subject: [PATCH 0095/1142] Remove unnecessary using

---
 .../Overlays/Profile/Header/Components/ProfileHeaderButton.cs   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderButton.cs b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderButton.cs
index ae94f3485f..e14d73dd98 100644
--- a/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderButton.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/ProfileHeaderButton.cs
@@ -6,9 +6,7 @@ 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.Containers;
-using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Profile.Header.Components
 {

From 155344400181a321a79cb100a3490c6cc128848a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 30 Jan 2020 21:44:53 +0100
Subject: [PATCH 0096/1142] Fix channel tab keyboard shortcut

Filter out the selector tab item at the point of enumerating tabs to fix
the regression of the Alt+number key shortcut.
---
 osu.Game/Overlays/ChatOverlay.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 2c0fa49b5d..9e48ee5041 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -321,8 +321,11 @@ namespace osu.Game.Overlays
 
         private void selectTab(int index)
         {
-            var channel = ChannelTabControl.Items.Skip(index).FirstOrDefault();
-            if (channel != null && !(channel is ChannelSelectorTabItem.ChannelSelectorTabChannel))
+            var channel = ChannelTabControl.Items
+                                           .Where(tab => !(tab is ChannelSelectorTabItem.ChannelSelectorTabChannel))
+                                           .Skip(index)
+                                           .FirstOrDefault();
+            if (channel != null)
                 ChannelTabControl.Current.Value = channel;
         }
 

From caf76511a73d8b7b73965bba85b7fa5ebe2ea402 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Thu, 30 Jan 2020 21:45:42 +0100
Subject: [PATCH 0097/1142] Remove double negation

---
 osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
index 86e816a28c..469f9caf4a 100644
--- a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
@@ -135,7 +135,7 @@ namespace osu.Game.Overlays.Profile.Header
             tryAddInfo(FontAwesome.Solid.Link, websiteWithoutProtocol, user.Website);
 
             // Hide the container to prevent adding unnecessary padding if it has no children other than the NewLineContainer
-            if (!bottomLinkContainer.Children.Any(child => !(child is NewLineContainer)))
+            if (bottomLinkContainer.Children.All(child => child is NewLineContainer))
                 bottomLinkContainer.Hide();
             else
                 // this is needed if user gets changed without the whole header being reloaded

From c050eed79b08e07087e337ac582da48fae0e4470 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Thu, 30 Jan 2020 22:05:06 +0100
Subject: [PATCH 0098/1142] Recolour RankGraphTooltip

---
 osu.Game/Overlays/Profile/Header/Components/RankGraph.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
index aed63293ea..a742711d26 100644
--- a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
@@ -16,6 +16,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Users;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Profile.Header.Components
 {
@@ -270,7 +271,8 @@ namespace osu.Game.Overlays.Profile.Header.Components
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
             {
-                background.Colour = colours.GreySeafoamDark;
+                // To match osu-web, background and text should both be coloured using OverlayColourProvider
+                background.Colour = colours.Gray1;
             }
 
             public bool SetContent(object content)

From b03e7f12ff0e22b0b7c0279bd27ac75fc79b0bcf Mon Sep 17 00:00:00 2001
From: Tree <thewildtree@outlook.com>
Date: Thu, 30 Jan 2020 22:51:35 +0100
Subject: [PATCH 0099/1142] Remove unused directive

---
 osu.Game/Overlays/Profile/Header/Components/RankGraph.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
index a742711d26..83c6d80dae 100644
--- a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
@@ -16,7 +16,6 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Users;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Profile.Header.Components
 {

From 9a1907d8e07fe2a3bfa92d71dbe8a4912ebbea1a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 31 Jan 2020 09:48:20 +0900
Subject: [PATCH 0100/1142] Apply doc fixes from code review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game/OsuGame.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 321cb25088..fb3ce00824 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -441,11 +441,11 @@ namespace osu.Game
         private ScheduledDelegate performFromMainMenuTask;
 
         /// <summary>
-        /// Perform an action only after returning to a specific screen specification.
+        /// Perform an action only after returning to a specific screen as indicated by <paramref name="validScreens"/>.
         /// Eagerly tries to exit the current screen until it succeeds.
         /// </summary>
         /// <param name="action">The action to perform once we are in the correct state.</param>
-        /// <param name="validScreens">An optional collection of valid screen types. If any of these screens are already current we can immediately perform the action immediately, else the first valid parent will be made current before performing the action. <see cref="MainMenu"/> is used if not specified.</param>
+        /// <param name="validScreens">An optional collection of valid screen types. If any of these screens are already current we can perform the action immediately, else the first valid parent will be made current before performing the action. <see cref="MainMenu"/> is used if not specified.</param>
         protected void PerformFromScreen(Action<IScreen> action, IEnumerable<Type> validScreens = null)
         {
             performFromMainMenuTask?.Cancel();

From 5f48affcbaa3d8a9a36bb44474fbc0fb616ee296 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 31 Jan 2020 13:54:26 +0900
Subject: [PATCH 0101/1142] Centralise screen exit logic to ScreenTestScene

---
 .../Gameplay/TestSceneAllRulesetPlayers.cs    | 57 ++++++++++++-------
 .../Visual/Gameplay/TestSceneAutoplay.cs      |  2 +-
 .../Visual/Gameplay/TestSceneFailAnimation.cs |  4 +-
 .../Visual/Gameplay/TestSceneFailJudgement.cs |  2 +-
 .../Visual/Gameplay/TestScenePause.cs         |  1 +
 .../TestScenePlayerReferenceLeaking.cs        |  2 +-
 .../Visual/Gameplay/TestSceneReplay.cs        |  2 +-
 .../SongSelect/TestScenePlaySongSelect.cs     | 27 ++++-----
 osu.Game/Screens/Play/Player.cs               |  2 +
 osu.Game/Tests/Visual/PlayerTestScene.cs      |  4 +-
 osu.Game/Tests/Visual/ScreenTestScene.cs      | 20 ++++++-
 11 files changed, 76 insertions(+), 47 deletions(-)
 rename osu.Game/Tests/Visual/AllPlayersTestScene.cs => osu.Game.Tests/Visual/Gameplay/TestSceneAllRulesetPlayers.cs (59%)

diff --git a/osu.Game/Tests/Visual/AllPlayersTestScene.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneAllRulesetPlayers.cs
similarity index 59%
rename from osu.Game/Tests/Visual/AllPlayersTestScene.cs
rename to osu.Game.Tests/Visual/Gameplay/TestSceneAllRulesetPlayers.cs
index dd65c8c382..83a7b896d2 100644
--- a/osu.Game/Tests/Visual/AllPlayersTestScene.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneAllRulesetPlayers.cs
@@ -2,49 +2,66 @@
 // 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.Screens;
 using osu.Game.Configuration;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Catch;
+using osu.Game.Rulesets.Mania;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Taiko;
 using osu.Game.Screens.Play;
 
-namespace osu.Game.Tests.Visual
+namespace osu.Game.Tests.Visual.Gameplay
 {
     /// <summary>
     /// A base class which runs <see cref="Player"/> test for all available rulesets.
     /// Steps to be run for each ruleset should be added via <see cref="AddCheckSteps"/>.
     /// </summary>
-    public abstract class AllPlayersTestScene : RateAdjustedBeatmapTestScene
+    public abstract class TestSceneAllRulesetPlayers : RateAdjustedBeatmapTestScene
     {
         protected Player Player;
 
         [BackgroundDependencyLoader]
         private void load(RulesetStore rulesets)
         {
-            foreach (var r in rulesets.AvailableRulesets)
-            {
-                Player p = null;
-                AddStep(r.Name, () => p = loadPlayerFor(r));
-                AddUntilStep("player loaded", () =>
-                {
-                    if (p?.IsLoaded == true)
-                    {
-                        p = null;
-                        return true;
-                    }
-
-                    return false;
-                });
-
-                AddCheckSteps();
-            }
-
             OsuConfigManager manager;
             Dependencies.Cache(manager = new OsuConfigManager(LocalStorage));
             manager.GetBindable<double>(OsuSetting.DimLevel).Value = 1.0;
         }
 
+        [Test]
+        public void TestOsu() => runForRuleset(new OsuRuleset().RulesetInfo);
+
+        [Test]
+        public void TestTaiko() => runForRuleset(new TaikoRuleset().RulesetInfo);
+
+        [Test]
+        public void TestCatch() => runForRuleset(new CatchRuleset().RulesetInfo);
+
+        [Test]
+        public void TestMania() => runForRuleset(new ManiaRuleset().RulesetInfo);
+
+        private void runForRuleset(RulesetInfo ruleset)
+        {
+            Player p = null;
+            AddStep($"load {ruleset.Name} player", () => p = loadPlayerFor(ruleset));
+            AddUntilStep("player loaded", () =>
+            {
+                if (p?.IsLoaded == true)
+                {
+                    p = null;
+                    return true;
+                }
+
+                return false;
+            });
+
+            AddCheckSteps();
+        }
+
         protected abstract void AddCheckSteps();
 
         private Player loadPlayerFor(RulesetInfo rulesetInfo)
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
index 069b965d9b..4daab8d137 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
@@ -12,7 +12,7 @@ using osu.Game.Storyboards;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [Description("Player instantiated with an autoplay mod.")]
-    public class TestSceneAutoplay : AllPlayersTestScene
+    public class TestSceneAutoplay : TestSceneAllRulesetPlayers
     {
         private ClockBackedTestWorkingBeatmap.TrackVirtualManual track;
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailAnimation.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailAnimation.cs
index 81050b1637..de257c9e53 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailAnimation.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailAnimation.cs
@@ -10,7 +10,7 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneFailAnimation : AllPlayersTestScene
+    public class TestSceneFailAnimation : TestSceneAllRulesetPlayers
     {
         protected override Player CreatePlayer(Ruleset ruleset)
         {
@@ -20,7 +20,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
-            typeof(AllPlayersTestScene),
+            typeof(TestSceneAllRulesetPlayers),
             typeof(TestPlayer),
             typeof(Player),
         };
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFailJudgement.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFailJudgement.cs
index 2045072c79..d80efb2c6e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFailJudgement.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFailJudgement.cs
@@ -10,7 +10,7 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestSceneFailJudgement : AllPlayersTestScene
+    public class TestSceneFailJudgement : TestSceneAllRulesetPlayers
     {
         protected override Player CreatePlayer(Ruleset ruleset)
         {
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 1a83e35e4f..ad5bab4681 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -36,6 +36,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         public override void SetUpSteps()
         {
             base.SetUpSteps();
+
             AddStep("resume player", () => Player.GameplayClockContainer.Start());
             confirmClockRunning(true);
         }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerReferenceLeaking.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerReferenceLeaking.cs
index 4d701f56a9..8f767659c6 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerReferenceLeaking.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerReferenceLeaking.cs
@@ -10,7 +10,7 @@ using osu.Game.Storyboards;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestScenePlayerReferenceLeaking : AllPlayersTestScene
+    public class TestScenePlayerReferenceLeaking : TestSceneAllRulesetPlayers
     {
         private readonly WeakList<WorkingBeatmap> workingWeakReferences = new WeakList<WorkingBeatmap>();
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
index 36335bc54a..e82722e7a2 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs
@@ -13,7 +13,7 @@ using osu.Game.Screens.Play;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [Description("Player instantiated with a replay.")]
-    public class TestSceneReplay : AllPlayersTestScene
+    public class TestSceneReplay : TestSceneAllRulesetPlayers
     {
         protected override Player CreatePlayer(Ruleset ruleset)
         {
diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index fc06780431..189420dcef 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -79,12 +79,17 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private OsuConfigManager config;
 
-        [SetUp]
-        public virtual void SetUp() => Schedule(() =>
+        [SetUpSteps]
+        public override void SetUpSteps()
         {
-            Ruleset.Value = new OsuRuleset().RulesetInfo;
-            manager?.Delete(manager.GetAllUsableBeatmapSets());
-        });
+            base.SetUpSteps();
+
+            AddStep("delete all beatmaps", () =>
+            {
+                Ruleset.Value = new OsuRuleset().RulesetInfo;
+                manager?.Delete(manager.GetAllUsableBeatmapSets());
+            });
+        }
 
         [Test]
         public void TestSingleFilterOnEnter()
@@ -120,9 +125,6 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
             AddAssert("ensure selection changed", () => selected != Beatmap.Value);
-
-            AddUntilStep("wait for return to song select", () => songSelect.IsCurrentScreen());
-            AddUntilStep("bindable lease returned", () => !Beatmap.Disabled);
         }
 
         [Test]
@@ -148,9 +150,6 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
             AddAssert("ensure selection didn't change", () => selected == Beatmap.Value);
-
-            AddUntilStep("wait for return to song select", () => songSelect.IsCurrentScreen());
-            AddUntilStep("bindable lease returned", () => !Beatmap.Disabled);
         }
 
         [Test]
@@ -180,9 +179,6 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
             AddAssert("ensure selection changed", () => selected != Beatmap.Value);
-
-            AddUntilStep("wait for return to song select", () => songSelect.IsCurrentScreen());
-            AddUntilStep("bindable lease returned", () => !Beatmap.Disabled);
         }
 
         [Test]
@@ -213,9 +209,6 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddUntilStep("wait for not current", () => !songSelect.IsCurrentScreen());
             AddAssert("ensure selection didn't change", () => selected == Beatmap.Value);
-
-            AddUntilStep("wait for return to song select", () => songSelect.IsCurrentScreen());
-            AddUntilStep("bindable lease returned", () => !Beatmap.Disabled);
         }
 
         [Test]
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 7228e22382..8a288f8299 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -39,6 +39,8 @@ namespace osu.Game.Screens.Play
 
         public override float BackgroundParallaxAmount => 0.1f;
 
+        public override bool DisallowExternalBeatmapRulesetChanges => true;
+
         public override bool HideOverlaysOnEnter => true;
 
         public override OverlayActivation InitialOverlayActivationMode => OverlayActivation.UserTriggered;
diff --git a/osu.Game/Tests/Visual/PlayerTestScene.cs b/osu.Game/Tests/Visual/PlayerTestScene.cs
index 3ed65bee61..7c5ba7d30f 100644
--- a/osu.Game/Tests/Visual/PlayerTestScene.cs
+++ b/osu.Game/Tests/Visual/PlayerTestScene.cs
@@ -33,8 +33,10 @@ namespace osu.Game.Tests.Visual
         }
 
         [SetUpSteps]
-        public virtual void SetUpSteps()
+        public override void SetUpSteps()
         {
+            base.SetUpSteps();
+
             AddStep(ruleset.RulesetInfo.Name, loadPlayer);
             AddUntilStep("player loaded", () => Player.IsLoaded && Player.Alpha == 1);
         }
diff --git a/osu.Game/Tests/Visual/ScreenTestScene.cs b/osu.Game/Tests/Visual/ScreenTestScene.cs
index 707aa61283..e501aa33b3 100644
--- a/osu.Game/Tests/Visual/ScreenTestScene.cs
+++ b/osu.Game/Tests/Visual/ScreenTestScene.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
 using osu.Game.Screens;
 
 namespace osu.Game.Tests.Visual
@@ -27,11 +28,24 @@ namespace osu.Game.Tests.Visual
             });
         }
 
-        protected void LoadScreen(OsuScreen screen)
+        protected void LoadScreen(OsuScreen screen) => Stack.Push(screen);
+
+        [SetUpSteps]
+        public virtual void SetUpSteps() => addExitAllScreensStep();
+
+        // pending framework update.
+        //[TearDownSteps]
+        //public void TearDownSteps() => addExitAllScreensStep();
+
+        private void addExitAllScreensStep()
         {
-            if (Stack.CurrentScreen != null)
+            AddUntilStep("exit all screens", () =>
+            {
+                if (Stack.CurrentScreen == null) return true;
+
                 Stack.Exit();
-            Stack.Push(screen);
+                return false;
+            });
         }
     }
 }

From e6783b622d2ab6ba693a956ce2bdebaec12d6e2a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 31 Jan 2020 14:56:42 +0900
Subject: [PATCH 0102/1142] Fix incorrectly build tests

---
 osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
index 4676f14655..bbb50c287b 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
@@ -7,12 +7,10 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
-using osu.Framework.Graphics;
 using osu.Framework.IO.Stores;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Screens;
 using osu.Game.Screens.Play;
 using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
@@ -21,7 +19,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestSceneLegacyBeatmapSkin : OsuTestScene
+    public class TestSceneLegacyBeatmapSkin : ScreenTestScene
     {
         [Resolved]
         private AudioManager audio { get; set; }
@@ -65,7 +63,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             ExposedPlayer player;
 
             Beatmap.Value = new CustomSkinWorkingBeatmap(audio, beatmapHasColours);
-            Child = new OsuScreenStack(player = new ExposedPlayer(userHasCustomColours)) { RelativeSizeAxes = Axes.Both };
+
+            LoadScreen(player = new ExposedPlayer(userHasCustomColours));
 
             return player;
         }

From 97c3ce132bd7febeb1f90d7f533748ab9436236d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 31 Jan 2020 15:01:37 +0900
Subject: [PATCH 0103/1142] Fix incorrect nUnit adapter version causing rider
 failures

---
 osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj b/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
index 1d8c4708c1..9d4e016eae 100644
--- a/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
+++ b/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
@@ -4,7 +4,7 @@
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <PropertyGroup Label="Project">

From 4a444face115c69cb95f8df0e538602a2cb0d94d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 31 Jan 2020 09:46:35 +0300
Subject: [PATCH 0104/1142] Change ShowMoreButton hide logic

---
 osu.Game/Overlays/Comments/CommentsContainer.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index d174c78666..8761b88b1e 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -181,10 +181,12 @@ namespace osu.Game.Overlays.Comments
                     moreButton.Current.Value = response.TopLevelCount - loadedTopLevelComments;
                     moreButton.IsLoading = false;
                 }
+                else
+                {
+                    moreButton.Hide();
+                }
 
                 commentCounter.Current.Value = response.Total;
-
-                moreButton.FadeTo(response.HasMore ? 1 : 0);
             }, loadCancellation.Token);
         }
 

From 3b5b799d60157ab47a7507ee3184365591d151c2 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 31 Jan 2020 09:51:56 +0300
Subject: [PATCH 0105/1142] Adjust height of ShowMore button

---
 osu.Game/Graphics/UserInterface/ShowMoreButton.cs    | 5 +++--
 osu.Game/Overlays/Comments/CommentsShowMoreButton.cs | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/ShowMoreButton.cs b/osu.Game/Graphics/UserInterface/ShowMoreButton.cs
index 4931a6aed6..c9cd9f1158 100644
--- a/osu.Game/Graphics/UserInterface/ShowMoreButton.cs
+++ b/osu.Game/Graphics/UserInterface/ShowMoreButton.cs
@@ -40,13 +40,14 @@ namespace osu.Game.Graphics.UserInterface
 
         public ShowMoreButton()
         {
-            AutoSizeAxes = Axes.Both;
+            Height = 30;
+            Width = 140;
         }
 
         protected override Drawable CreateContent() => new CircularContainer
         {
             Masking = true,
-            Size = new Vector2(140, 30),
+            RelativeSizeAxes = Axes.Both,
             Children = new Drawable[]
             {
                 background = new Box
diff --git a/osu.Game/Overlays/Comments/CommentsShowMoreButton.cs b/osu.Game/Overlays/Comments/CommentsShowMoreButton.cs
index ab65c9c63a..d2ff7ecb1f 100644
--- a/osu.Game/Overlays/Comments/CommentsShowMoreButton.cs
+++ b/osu.Game/Overlays/Comments/CommentsShowMoreButton.cs
@@ -14,6 +14,8 @@ namespace osu.Game.Overlays.Comments
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
         {
+            Height = 20;
+
             IdleColour = colourProvider.Background2;
             HoverColour = colourProvider.Background1;
             ChevronIconColour = colourProvider.Foreground1;

From ab7bbf38a8e768f0ddef1cdb902ed4b3576805f5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 31 Jan 2020 16:14:55 +0900
Subject: [PATCH 0106/1142] Set default beatmap later in test initialisation

---
 osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 189420dcef..c01dee2959 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -72,8 +72,6 @@ namespace osu.Game.Tests.Visual.SongSelect
             // required to get bindables attached
             Add(music);
 
-            Beatmap.SetDefault();
-
             Dependencies.Cache(config = new OsuConfigManager(LocalStorage));
         }
 
@@ -88,6 +86,8 @@ namespace osu.Game.Tests.Visual.SongSelect
             {
                 Ruleset.Value = new OsuRuleset().RulesetInfo;
                 manager?.Delete(manager.GetAllUsableBeatmapSets());
+
+                Beatmap.SetDefault();
             });
         }
 

From 2f61d3f5ad5f5697c75b8b5500246586b036c58e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 31 Jan 2020 17:35:53 +0900
Subject: [PATCH 0107/1142] Fix song select remaining issue locally

---
 osu.Game/Screens/Select/SongSelect.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index a16401a527..f9f015643d 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -345,8 +345,8 @@ namespace osu.Game.Screens.Select
                 selectionChangedDebounce = null;
             }
 
-            if (performStartAction)
-                OnStart();
+            if (performStartAction && OnStart())
+                Carousel.AllowSelection = false;
         }
 
         /// <summary>
@@ -500,6 +500,8 @@ namespace osu.Game.Screens.Select
 
         public override void OnResuming(IScreen last)
         {
+            Carousel.AllowSelection = true;
+
             BeatmapDetails.Leaderboard.RefreshScores();
 
             Beatmap.Value.Track.Looping = true;
@@ -647,7 +649,6 @@ namespace osu.Game.Screens.Select
             decoupledRuleset.ValueChanged += r => Ruleset.Value = r.NewValue;
             decoupledRuleset.DisabledChanged += r => Ruleset.Disabled = r;
 
-            Beatmap.BindDisabledChanged(disabled => Carousel.AllowSelection = !disabled, true);
             Beatmap.BindValueChanged(workingBeatmapChanged);
 
             boundLocalBindables = true;

From a547d2ed5c0004458911859e6a3b719d65931d03 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 31 Jan 2020 18:37:16 +0900
Subject: [PATCH 0108/1142] Don't least at Player just yet

---
 osu.Game/Screens/Play/Player.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 8a288f8299..7228e22382 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -39,8 +39,6 @@ namespace osu.Game.Screens.Play
 
         public override float BackgroundParallaxAmount => 0.1f;
 
-        public override bool DisallowExternalBeatmapRulesetChanges => true;
-
         public override bool HideOverlaysOnEnter => true;
 
         public override OverlayActivation InitialOverlayActivationMode => OverlayActivation.UserTriggered;

From 19f516e710b657aacc124d433459bd0ce8fc96ee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 31 Jan 2020 19:10:44 +0900
Subject: [PATCH 0109/1142] Ensure OsuScreen level leases are taken out
 synchronously

---
 .../Background/TestSceneUserDimBackgrounds.cs |  8 ++--
 .../Visual/Gameplay/TestScenePlayerLoader.cs  |  6 ++-
 .../Visual/Gameplay/TestSceneResults.cs       | 15 ++++++--
 osu.Game.Tests/Visual/Menus/IntroTestScene.cs |  6 ++-
 .../Multiplayer/TestSceneMultiHeader.cs       |  4 +-
 .../TestSceneScreenBreadcrumbControl.cs       |  4 +-
 .../UserInterface/ScreenBreadcrumbControl.cs  |  3 +-
 osu.Game/Screens/Multi/Multiplayer.cs         |  4 +-
 osu.Game/Screens/OsuScreen.cs                 | 22 +++++++++--
 osu.Game/Screens/OsuScreenStack.cs            | 38 +++++++++++--------
 osu.Game/Screens/Select/PlaySongSelect.cs     |  5 +--
 11 files changed, 79 insertions(+), 36 deletions(-)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index 589ec7e8aa..eff5bd710d 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -68,10 +68,10 @@ namespace osu.Game.Tests.Visual.Background
         [SetUp]
         public virtual void SetUp() => Schedule(() =>
         {
-            Child = new OsuScreenStack(songSelect = new DummySongSelect())
-            {
-                RelativeSizeAxes = Axes.Both
-            };
+            var stack = new OsuScreenStack { RelativeSizeAxes = Axes.Both };
+            Child = stack;
+
+            stack.Push(songSelect = new DummySongSelect());
         });
 
         /// <summary>
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index ad5950d9fc..33ecbed62e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -207,9 +207,11 @@ namespace osu.Game.Tests.Visual.Gameplay
             {
                 RelativeSizeAxes = Axes.Both;
 
+                OsuScreenStack stack;
+
                 InternalChildren = new Drawable[]
                 {
-                    new OsuScreenStack(screen)
+                    stack = new OsuScreenStack
                     {
                         RelativeSizeAxes = Axes.Both,
                     },
@@ -224,6 +226,8 @@ namespace osu.Game.Tests.Visual.Gameplay
                         Origin = Anchor.TopLeft,
                     }
                 };
+
+                stack.Push(screen);
             }
         }
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneResults.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneResults.cs
index 7790126db5..2b7a32ba17 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneResults.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneResults.cs
@@ -75,10 +75,16 @@ namespace osu.Game.Tests.Visual.Gameplay
         public void ResultsWithoutPlayer()
         {
             TestSoloResults screen = null;
+            OsuScreenStack stack;
 
-            AddStep("load results", () => Child = new OsuScreenStack(screen = createResultsScreen())
+            AddStep("load results", () =>
             {
-                RelativeSizeAxes = Axes.Both
+                Child = stack = new OsuScreenStack
+                {
+                    RelativeSizeAxes = Axes.Both
+                };
+
+                stack.Push(screen = createResultsScreen());
             });
             AddUntilStep("wait for loaded", () => screen.IsLoaded);
             AddAssert("retry overlay not present", () => screen.RetryOverlay == null);
@@ -102,11 +108,14 @@ namespace osu.Game.Tests.Visual.Gameplay
             public TestResultsContainer(IScreen screen)
             {
                 RelativeSizeAxes = Axes.Both;
+                OsuScreenStack stack;
 
-                InternalChild = new OsuScreenStack(screen)
+                InternalChild = stack = new OsuScreenStack
                 {
                     RelativeSizeAxes = Axes.Both,
                 };
+
+                stack.Push(screen);
             }
         }
 
diff --git a/osu.Game.Tests/Visual/Menus/IntroTestScene.cs b/osu.Game.Tests/Visual/Menus/IntroTestScene.cs
index d03d341ee4..5870ef9813 100644
--- a/osu.Game.Tests/Visual/Menus/IntroTestScene.cs
+++ b/osu.Game.Tests/Visual/Menus/IntroTestScene.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Tests.Visual.Menus
 
         protected IntroTestScene()
         {
-            Drawable introStack = null;
+            OsuScreenStack introStack = null;
 
             Children = new Drawable[]
             {
@@ -57,10 +57,12 @@ namespace osu.Game.Tests.Visual.Menus
 
                 introStack?.Expire();
 
-                Add(introStack = new OsuScreenStack(CreateScreen())
+                Add(introStack = new OsuScreenStack
                 {
                     RelativeSizeAxes = Axes.Both,
                 });
+
+                introStack.Push(CreateScreen());
             });
         }
 
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
index 3f89f636b1..76ab402b72 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs
@@ -16,7 +16,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             int index = 0;
 
-            OsuScreenStack screenStack = new OsuScreenStack(new TestMultiplayerSubScreen(index)) { RelativeSizeAxes = Axes.Both };
+            OsuScreenStack screenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both };
+
+            screenStack.Push(new TestMultiplayerSubScreen(index));
 
             Children = new Drawable[]
             {
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneScreenBreadcrumbControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneScreenBreadcrumbControl.cs
index 7386e0fa1f..77a7d819a9 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneScreenBreadcrumbControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneScreenBreadcrumbControl.cs
@@ -25,7 +25,9 @@ namespace osu.Game.Tests.Visual.UserInterface
             OsuSpriteText titleText;
 
             IScreen startScreen = new TestScreenOne();
-            screenStack = new OsuScreenStack(startScreen) { RelativeSizeAxes = Axes.Both };
+
+            screenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both };
+            screenStack.Push(startScreen);
 
             Children = new Drawable[]
             {
diff --git a/osu.Game/Graphics/UserInterface/ScreenBreadcrumbControl.cs b/osu.Game/Graphics/UserInterface/ScreenBreadcrumbControl.cs
index 3e0a6c3265..e85525b2f8 100644
--- a/osu.Game/Graphics/UserInterface/ScreenBreadcrumbControl.cs
+++ b/osu.Game/Graphics/UserInterface/ScreenBreadcrumbControl.cs
@@ -17,7 +17,8 @@ namespace osu.Game.Graphics.UserInterface
             stack.ScreenPushed += onPushed;
             stack.ScreenExited += onExited;
 
-            onPushed(null, stack.CurrentScreen);
+            if (stack.CurrentScreen != null)
+                onPushed(null, stack.CurrentScreen);
 
             Current.ValueChanged += current => current.NewValue.MakeCurrent();
         }
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 86d52ff791..9d6a459d14 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -96,7 +96,7 @@ namespace osu.Game.Screens.Multi
                     {
                         RelativeSizeAxes = Axes.Both,
                         Padding = new MarginPadding { Top = Header.HEIGHT },
-                        Child = screenStack = new OsuScreenStack(loungeSubScreen = new LoungeSubScreen()) { RelativeSizeAxes = Axes.Both }
+                        Child = screenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both }
                     },
                     new Header(screenStack),
                     createButton = new HeaderButton
@@ -120,6 +120,8 @@ namespace osu.Game.Screens.Multi
                 }
             };
 
+            screenStack.Push(loungeSubScreen = new LoungeSubScreen());
+
             screenStack.ScreenPushed += screenPushed;
             screenStack.ScreenExited += screenExited;
         }
diff --git a/osu.Game/Screens/OsuScreen.cs b/osu.Game/Screens/OsuScreen.cs
index 6394fb8d23..61e94ae969 100644
--- a/osu.Game/Screens/OsuScreen.cs
+++ b/osu.Game/Screens/OsuScreen.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Internal;
 using osu.Framework.Allocation;
@@ -95,15 +96,30 @@ namespace osu.Game.Screens
 
         public Bindable<IReadOnlyList<Mod>> Mods { get; private set; }
 
+        private OsuScreenDependencies screenDependencies;
+
+        internal void CreateLeasedDependencies(IReadOnlyDependencyContainer dependencies) => createDependencies(dependencies);
+
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
-            var screenDependencies = new OsuScreenDependencies(DisallowExternalBeatmapRulesetChanges, parent);
+            if (screenDependencies == null)
+            {
+                if (DisallowExternalBeatmapRulesetChanges)
+                    throw new InvalidOperationException($"Screens that specify {nameof(DisallowExternalBeatmapRulesetChanges)} must be pushed immediately.");
+
+                createDependencies(parent);
+            }
+
+            return base.CreateChildDependencies(screenDependencies);
+        }
+
+        private void createDependencies(IReadOnlyDependencyContainer dependencies)
+        {
+            screenDependencies = new OsuScreenDependencies(DisallowExternalBeatmapRulesetChanges, dependencies);
 
             Beatmap = screenDependencies.Beatmap;
             Ruleset = screenDependencies.Ruleset;
             Mods = screenDependencies.Mods;
-
-            return base.CreateChildDependencies(screenDependencies);
         }
 
         protected BackgroundScreen Background => backgroundStack?.CurrentScreen as BackgroundScreen;
diff --git a/osu.Game/Screens/OsuScreenStack.cs b/osu.Game/Screens/OsuScreenStack.cs
index 0844e32d46..db577ea5e9 100644
--- a/osu.Game/Screens/OsuScreenStack.cs
+++ b/osu.Game/Screens/OsuScreenStack.cs
@@ -18,17 +18,6 @@ namespace osu.Game.Screens
         protected float ParallaxAmount => parallaxContainer.ParallaxAmount;
 
         public OsuScreenStack()
-        {
-            initializeStack();
-        }
-
-        public OsuScreenStack(IScreen baseScreen)
-            : base(baseScreen)
-        {
-            initializeStack();
-        }
-
-        private void initializeStack()
         {
             InternalChild = parallaxContainer = new ParallaxContainer
             {
@@ -36,13 +25,32 @@ namespace osu.Game.Screens
                 Child = backgroundScreenStack = new BackgroundScreenStack { RelativeSizeAxes = Axes.Both },
             };
 
-            ScreenPushed += onScreenChange;
-            ScreenExited += onScreenChange;
+            ScreenPushed += screenPushed;
+            ScreenExited += screenExited;
         }
 
-        private void onScreenChange(IScreen prev, IScreen next)
+        private void screenPushed(IScreen prev, IScreen next)
         {
-            parallaxContainer.ParallaxAmount = ParallaxContainer.DEFAULT_PARALLAX_AMOUNT * ((IOsuScreen)next)?.BackgroundParallaxAmount ?? 1.0f;
+            if (LoadState < LoadState.Ready)
+            {
+                // dependencies must be present to stay in a sane state.
+                // this is generally only ever hit by test scenes.
+                Schedule(() => screenPushed(prev, next));
+                return;
+            }
+
+            // create dependencies synchronously to ensure leases are in a sane state.
+            ((OsuScreen)next).CreateLeasedDependencies((prev as OsuScreen)?.Dependencies ?? Dependencies);
+
+            setParallax(next);
         }
+
+        private void screenExited(IScreen prev, IScreen next)
+        {
+            setParallax(next);
+        }
+
+        private void setParallax(IScreen next) =>
+            parallaxContainer.ParallaxAmount = ParallaxContainer.DEFAULT_PARALLAX_AMOUNT * ((IOsuScreen)next)?.BackgroundParallaxAmount ?? 1.0f;
     }
 }
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 9368bac69f..347eae49f0 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -68,10 +68,7 @@ namespace osu.Game.Screens.Select
 
             SampleConfirm?.Play();
 
-            LoadComponentAsync(player = new PlayerLoader(() => new Player()), l =>
-            {
-                if (this.IsCurrentScreen()) this.Push(player);
-            });
+            this.Push(player = new PlayerLoader(() => new Player()));
 
             return true;
         }

From a66cdee5e98a849cfafdbbc8a955e7217a573e16 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 31 Jan 2020 21:36:19 +0900
Subject: [PATCH 0110/1142] Fix missed issues

---
 osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs | 5 ++++-
 osu.Game/Screens/OsuScreenStack.cs                        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
index 4676f14655..c3742601c1 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
@@ -63,9 +63,12 @@ namespace osu.Game.Rulesets.Osu.Tests
         private ExposedPlayer loadBeatmap(bool userHasCustomColours, bool beatmapHasColours)
         {
             ExposedPlayer player;
+            OsuScreenStack stack;
 
             Beatmap.Value = new CustomSkinWorkingBeatmap(audio, beatmapHasColours);
-            Child = new OsuScreenStack(player = new ExposedPlayer(userHasCustomColours)) { RelativeSizeAxes = Axes.Both };
+            Child = stack = new OsuScreenStack { RelativeSizeAxes = Axes.Both };
+
+            stack.Push(player = new ExposedPlayer(userHasCustomColours));
 
             return player;
         }
diff --git a/osu.Game/Screens/OsuScreenStack.cs b/osu.Game/Screens/OsuScreenStack.cs
index db577ea5e9..a05933ef0e 100644
--- a/osu.Game/Screens/OsuScreenStack.cs
+++ b/osu.Game/Screens/OsuScreenStack.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Screens
         [Cached]
         private BackgroundScreenStack backgroundScreenStack;
 
-        private ParallaxContainer parallaxContainer;
+        private readonly ParallaxContainer parallaxContainer;
 
         protected float ParallaxAmount => parallaxContainer.ParallaxAmount;
 

From 3e15265a53df29d334d5aff48af57c073405c40c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 31 Jan 2020 22:09:02 +0900
Subject: [PATCH 0111/1142] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 5497a82a7a..e5a1ec2f4e 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -54,6 +54,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.125.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.131.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 0ea558bbc7..b38b7ff9b1 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.125.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.131.0" />
     <PackageReference Include="Sentry" Version="1.2.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index a215bc65e8..6ab3c0f2d2 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -74,7 +74,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.125.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.131.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
@@ -82,7 +82,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.125.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.131.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From c4331f34d55772d6b6c9d04b638772724cd74ca8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 31 Jan 2020 22:09:39 +0900
Subject: [PATCH 0112/1142] Consume TearDownSteps

---
 osu.Game/Tests/Visual/ScreenTestScene.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Tests/Visual/ScreenTestScene.cs b/osu.Game/Tests/Visual/ScreenTestScene.cs
index e501aa33b3..feca592049 100644
--- a/osu.Game/Tests/Visual/ScreenTestScene.cs
+++ b/osu.Game/Tests/Visual/ScreenTestScene.cs
@@ -33,9 +33,8 @@ namespace osu.Game.Tests.Visual
         [SetUpSteps]
         public virtual void SetUpSteps() => addExitAllScreensStep();
 
-        // pending framework update.
-        //[TearDownSteps]
-        //public void TearDownSteps() => addExitAllScreensStep();
+        [TearDownSteps]
+        public void TearDownSteps() => addExitAllScreensStep();
 
         private void addExitAllScreensStep()
         {

From e728d2be1779d280d5ee3a1492a0590acf463af6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 1 Feb 2020 01:19:04 +0900
Subject: [PATCH 0113/1142] Use ElementAtOrDefault

---
 osu.Game/Overlays/ChatOverlay.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 9e48ee5041..f2aef0995f 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -323,8 +323,7 @@ namespace osu.Game.Overlays
         {
             var channel = ChannelTabControl.Items
                                            .Where(tab => !(tab is ChannelSelectorTabItem.ChannelSelectorTabChannel))
-                                           .Skip(index)
-                                           .FirstOrDefault();
+                                           .ElementAtOrDefault(index);
             if (channel != null)
                 ChannelTabControl.Current.Value = channel;
         }

From 90caa612455425f97c892a81be2f37a46066e9f0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 1 Feb 2020 02:05:26 +0900
Subject: [PATCH 0114/1142] Reverse comparison for readability
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 .../Edit/Compose/Components/Timeline/TimelineTickDisplay.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
index b565a42c5a..36ee976bf7 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineTickDisplay.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             for (var i = 0; i < beatmap.ControlPointInfo.TimingPoints.Count; i++)
             {
                 var point = beatmap.ControlPointInfo.TimingPoints[i];
-                var until = beatmap.ControlPointInfo.TimingPoints.Count > i + 1 ? beatmap.ControlPointInfo.TimingPoints[i + 1].Time : working.Value.Track.Length;
+                var until = i + 1 < beatmap.ControlPointInfo.TimingPoints.Count ? beatmap.ControlPointInfo.TimingPoints[i + 1].Time : working.Value.Track.Length;
 
                 int beat = 0;
 

From d94045e612cf0d4e1105078fdf66512bacdc5b09 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 1 Feb 2020 02:12:50 +0900
Subject: [PATCH 0115/1142] Fix remaining merge conflict

---
 osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
index 7cf40b1209..bbb50c287b 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
@@ -61,7 +61,6 @@ namespace osu.Game.Rulesets.Osu.Tests
         private ExposedPlayer loadBeatmap(bool userHasCustomColours, bool beatmapHasColours)
         {
             ExposedPlayer player;
-            OsuScreenStack stack;
 
             Beatmap.Value = new CustomSkinWorkingBeatmap(audio, beatmapHasColours);
 

From 9596030e1dadd5c0190c7868718bb090ae18b978 Mon Sep 17 00:00:00 2001
From: Berkan Diler <b.diler@gmx.de>
Date: Fri, 31 Jan 2020 18:32:47 +0100
Subject: [PATCH 0116/1142] Make use of ElementAtOrDefault() when possible

---
 osu.Game/Overlays/ChatOverlay.cs                    | 2 +-
 osu.Game/Overlays/MusicController.cs                | 2 +-
 osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs | 2 +-
 osu.Game/Rulesets/Edit/HitObjectComposer.cs         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 2c0fa49b5d..8b3edd60a1 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -321,7 +321,7 @@ namespace osu.Game.Overlays
 
         private void selectTab(int index)
         {
-            var channel = ChannelTabControl.Items.Skip(index).FirstOrDefault();
+            var channel = ChannelTabControl.Items.ElementAtOrDefault(index);
             if (channel != null && !(channel is ChannelSelectorTabItem.ChannelSelectorTabChannel))
                 ChannelTabControl.Current.Value = channel;
         }
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 19f06e99f1..7c7daf6eb9 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -196,7 +196,7 @@ namespace osu.Game.Overlays
             if (!instant)
                 queuedDirection = TrackChangeDirection.Next;
 
-            var playable = BeatmapSets.SkipWhile(i => i.ID != current.BeatmapSetInfo.ID).Skip(1).FirstOrDefault() ?? BeatmapSets.FirstOrDefault();
+            var playable = BeatmapSets.SkipWhile(i => i.ID != current.BeatmapSetInfo.ID).ElementAtOrDefault(1) ?? BeatmapSets.FirstOrDefault();
 
             if (playable != null)
             {
diff --git a/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs b/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
index 8f2dbce6f7..422bf00c6d 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRulesetSelector.cs
@@ -99,7 +99,7 @@ namespace osu.Game.Overlays.Toolbar
             {
                 int requested = e.Key - Key.Number1;
 
-                RulesetInfo found = Rulesets.AvailableRulesets.Skip(requested).FirstOrDefault();
+                RulesetInfo found = Rulesets.AvailableRulesets.ElementAtOrDefault(requested);
                 if (found != null)
                     Current.Value = found;
                 return true;
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index ab8dccb9dd..5ac1d4ecc4 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -154,7 +154,7 @@ namespace osu.Game.Rulesets.Edit
         {
             if (e.Key >= Key.Number1 && e.Key <= Key.Number9)
             {
-                var item = toolboxCollection.Items.Skip(e.Key - Key.Number1).FirstOrDefault();
+                var item = toolboxCollection.Items.ElementAtOrDefault(e.Key - Key.Number1);
 
                 if (item != null)
                 {

From 6d30e425a1083e41a9a80285cf539584b45a2345 Mon Sep 17 00:00:00 2001
From: Berkan Diler <b.diler@gmx.de>
Date: Fri, 31 Jan 2020 18:51:29 +0100
Subject: [PATCH 0117/1142] Revert change to avoid conflict with another PR

---
 osu.Game/Overlays/ChatOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 8b3edd60a1..2c0fa49b5d 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -321,7 +321,7 @@ namespace osu.Game.Overlays
 
         private void selectTab(int index)
         {
-            var channel = ChannelTabControl.Items.ElementAtOrDefault(index);
+            var channel = ChannelTabControl.Items.Skip(index).FirstOrDefault();
             if (channel != null && !(channel is ChannelSelectorTabItem.ChannelSelectorTabChannel))
                 ChannelTabControl.Current.Value = channel;
         }

From a74d22d9e55a5fb76fcd4f55bc049ae4ee046b32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 1 Feb 2020 15:50:33 +0100
Subject: [PATCH 0118/1142] Extract beatmap stats test to separate scene

---
 .../SongSelect/TestSceneAdvancedStats.cs      | 125 ++++++++++++++++++
 .../SongSelect/TestSceneBeatmapDetails.cs     |  28 ----
 .../Screens/Select/Details/AdvancedStats.cs   |  40 +++---
 3 files changed, 146 insertions(+), 47 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs
new file mode 100644
index 0000000000..c08e974544
--- /dev/null
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs
@@ -0,0 +1,125 @@
+// 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.Graphics.Sprites;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Select.Details;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.SongSelect
+{
+    [System.ComponentModel.Description("Advanced beatmap statistics display")]
+    public class TestSceneAdvancedStats : OsuTestScene
+    {
+        private TestAdvancedStats advancedStats;
+
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        [SetUp]
+        public void Setup() => Schedule(() => Child = advancedStats = new TestAdvancedStats
+        {
+            Width = 500
+        });
+
+        private BeatmapInfo exampleBeatmapInfo => new BeatmapInfo
+        {
+            RulesetID = 0,
+            Ruleset = rulesets.AvailableRulesets.First(),
+            BaseDifficulty = new BeatmapDifficulty
+            {
+                CircleSize = 7.2f,
+                DrainRate = 1,
+                OverallDifficulty = 5.7f,
+                ApproachRate = 3.5f
+            },
+            StarDifficulty = 4.5f
+        };
+
+        [Test]
+        public void TestNoMod()
+        {
+            AddStep("set beatmap", () => advancedStats.Beatmap = exampleBeatmapInfo);
+
+            AddStep("no mods selected", () => SelectedMods.Value = Array.Empty<Mod>());
+
+            AddAssert("first bar text is Circle Size", () => advancedStats.ChildrenOfType<SpriteText>().First().Text == "Circle Size");
+            AddAssert("circle size bar is white", () => advancedStats.FirstValue.ModBar.AccentColour == Color4.White);
+            AddAssert("HP drain bar is white", () => advancedStats.HpDrain.ModBar.AccentColour == Color4.White);
+            AddAssert("accuracy bar is white", () => advancedStats.Accuracy.ModBar.AccentColour == Color4.White);
+            AddAssert("approach rate bar is white", () => advancedStats.ApproachRate.ModBar.AccentColour == Color4.White);
+        }
+
+        [Test]
+        public void TestManiaFirstBarText()
+        {
+            AddStep("set beatmap", () => advancedStats.Beatmap = new BeatmapInfo
+            {
+                Ruleset = rulesets.GetRuleset(3),
+                BaseDifficulty = new BeatmapDifficulty
+                {
+                    CircleSize = 5,
+                    DrainRate = 4.3f,
+                    OverallDifficulty = 4.5f,
+                    ApproachRate = 3.1f
+                },
+                StarDifficulty = 8
+            });
+
+            AddAssert("first bar text is Key Count", () => advancedStats.ChildrenOfType<SpriteText>().First().Text == "Key Count");
+        }
+
+        [Test]
+        public void TestEasyMod()
+        {
+            AddStep("set beatmap", () => advancedStats.Beatmap = exampleBeatmapInfo);
+
+            AddStep("select EZ mod", () =>
+            {
+                var ruleset = advancedStats.Beatmap.Ruleset.CreateInstance();
+                SelectedMods.Value = new[] { ruleset.GetAllMods().OfType<ModEasy>().Single() };
+            });
+
+            AddAssert("circle size bar is blue", () => advancedStats.FirstValue.ModBar.AccentColour == colours.BlueDark);
+            AddAssert("HP drain bar is blue", () => advancedStats.HpDrain.ModBar.AccentColour == colours.BlueDark);
+            AddAssert("accuracy bar is blue", () => advancedStats.Accuracy.ModBar.AccentColour == colours.BlueDark);
+            AddAssert("approach rate bar is blue", () => advancedStats.ApproachRate.ModBar.AccentColour == colours.BlueDark);
+        }
+
+        [Test]
+        public void TestHardRockMod()
+        {
+            AddStep("set beatmap", () => advancedStats.Beatmap = exampleBeatmapInfo);
+
+            AddStep("select HR mod", () =>
+            {
+                var ruleset = advancedStats.Beatmap.Ruleset.CreateInstance();
+                SelectedMods.Value = new[] { ruleset.GetAllMods().OfType<ModHardRock>().Single() };
+            });
+
+            AddAssert("circle size bar is red", () => advancedStats.FirstValue.ModBar.AccentColour == colours.Red);
+            AddAssert("HP drain bar is red", () => advancedStats.HpDrain.ModBar.AccentColour == colours.Red);
+            AddAssert("accuracy bar is red", () => advancedStats.Accuracy.ModBar.AccentColour == colours.Red);
+            AddAssert("approach rate bar is red", () => advancedStats.ApproachRate.ModBar.AccentColour == colours.Red);
+        }
+
+        private class TestAdvancedStats : AdvancedStats
+        {
+            public new StatisticRow FirstValue => base.FirstValue;
+            public new StatisticRow HpDrain => base.HpDrain;
+            public new StatisticRow Accuracy => base.Accuracy;
+            public new StatisticRow ApproachRate => base.ApproachRate;
+        }
+    }
+}
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapDetails.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapDetails.cs
index 6aa5a76490..acf037198f 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapDetails.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapDetails.cs
@@ -3,14 +3,8 @@
 
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Testing;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Rulesets;
-using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Select;
 
 namespace osu.Game.Tests.Visual.SongSelect
@@ -180,27 +174,5 @@ namespace osu.Game.Tests.Visual.SongSelect
                 OnlineBeatmapID = 162,
             });
         }
-
-        [Resolved]
-        private RulesetStore rulesets { get; set; }
-
-        [Resolved]
-        private OsuColour colours { get; set; }
-
-        [Test]
-        public void TestModAdjustments()
-        {
-            TestAllMetrics();
-
-            Ruleset ruleset = rulesets.AvailableRulesets.First().CreateInstance();
-
-            AddStep("with EZ mod", () => SelectedMods.Value = new[] { ruleset.GetAllMods().First(m => m is ModEasy) });
-
-            AddAssert("first bar coloured blue", () => details.ChildrenOfType<Bar>().Skip(1).First().AccentColour == colours.BlueDark);
-
-            AddStep("with HR mod", () => SelectedMods.Value = new[] { ruleset.GetAllMods().First(m => m is ModHardRock) });
-
-            AddAssert("first bar coloured red", () => details.ChildrenOfType<Bar>().Skip(1).First().AccentColour == colours.Red);
-        }
     }
 }
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 56c400e869..81f2b8dc7b 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -26,7 +26,8 @@ namespace osu.Game.Screens.Select.Details
         [Resolved]
         private IBindable<IReadOnlyList<Mod>> mods { get; set; }
 
-        private readonly StatisticRow firstValue, hpDrain, accuracy, approachRate, starDifficulty;
+        protected readonly StatisticRow FirstValue, HpDrain, Accuracy, ApproachRate;
+        private readonly StatisticRow starDifficulty;
 
         private BeatmapInfo beatmap;
 
@@ -52,10 +53,10 @@ namespace osu.Game.Screens.Select.Details
                 Spacing = new Vector2(4f),
                 Children = new[]
                 {
-                    firstValue = new StatisticRow(), //circle size/key amount
-                    hpDrain = new StatisticRow { Title = "HP Drain" },
-                    accuracy = new StatisticRow { Title = "Accuracy" },
-                    approachRate = new StatisticRow { Title = "Approach Rate" },
+                    FirstValue = new StatisticRow(), //circle size/key amount
+                    HpDrain = new StatisticRow { Title = "HP Drain" },
+                    Accuracy = new StatisticRow { Title = "Accuracy" },
+                    ApproachRate = new StatisticRow { Title = "Approach Rate" },
                     starDifficulty = new StatisticRow(10, true) { Title = "Star Difficulty" },
                 },
             };
@@ -122,24 +123,24 @@ namespace osu.Game.Screens.Select.Details
                 case 3:
                     // Account for mania differences locally for now
                     // Eventually this should be handled in a more modular way, allowing rulesets to return arbitrary difficulty attributes
-                    firstValue.Title = "Key Count";
-                    firstValue.Value = (baseDifficulty?.CircleSize ?? 0, null);
+                    FirstValue.Title = "Key Count";
+                    FirstValue.Value = (baseDifficulty?.CircleSize ?? 0, null);
                     break;
 
                 default:
-                    firstValue.Title = "Circle Size";
-                    firstValue.Value = (baseDifficulty?.CircleSize ?? 0, adjustedDifficulty?.CircleSize);
+                    FirstValue.Title = "Circle Size";
+                    FirstValue.Value = (baseDifficulty?.CircleSize ?? 0, adjustedDifficulty?.CircleSize);
                     break;
             }
 
             starDifficulty.Value = ((float)(Beatmap?.StarDifficulty ?? 0), null);
 
-            hpDrain.Value = (baseDifficulty?.DrainRate ?? 0, adjustedDifficulty?.DrainRate);
-            accuracy.Value = (baseDifficulty?.OverallDifficulty ?? 0, adjustedDifficulty?.OverallDifficulty);
-            approachRate.Value = (baseDifficulty?.ApproachRate ?? 0, adjustedDifficulty?.ApproachRate);
+            HpDrain.Value = (baseDifficulty?.DrainRate ?? 0, adjustedDifficulty?.DrainRate);
+            Accuracy.Value = (baseDifficulty?.OverallDifficulty ?? 0, adjustedDifficulty?.OverallDifficulty);
+            ApproachRate.Value = (baseDifficulty?.ApproachRate ?? 0, adjustedDifficulty?.ApproachRate);
         }
 
-        private class StatisticRow : Container, IHasAccentColour
+        public class StatisticRow : Container, IHasAccentColour
         {
             private const float value_width = 25;
             private const float name_width = 70;
@@ -147,7 +148,8 @@ namespace osu.Game.Screens.Select.Details
             private readonly float maxValue;
             private readonly bool forceDecimalPlaces;
             private readonly OsuSpriteText name, valueText;
-            private readonly Bar bar, modBar;
+            private readonly Bar bar;
+            public readonly Bar ModBar;
 
             [Resolved]
             private OsuColour colours { get; set; }
@@ -173,14 +175,14 @@ namespace osu.Game.Screens.Select.Details
                     bar.Length = value.baseValue / maxValue;
 
                     valueText.Text = (value.adjustedValue ?? value.baseValue).ToString(forceDecimalPlaces ? "0.00" : "0.##");
-                    modBar.Length = (value.adjustedValue ?? 0) / maxValue;
+                    ModBar.Length = (value.adjustedValue ?? 0) / maxValue;
 
                     if (value.adjustedValue > value.baseValue)
-                        modBar.AccentColour = valueText.Colour = colours.Red;
+                        ModBar.AccentColour = valueText.Colour = colours.Red;
                     else if (value.adjustedValue < value.baseValue)
-                        modBar.AccentColour = valueText.Colour = colours.BlueDark;
+                        ModBar.AccentColour = valueText.Colour = colours.BlueDark;
                     else
-                        modBar.AccentColour = valueText.Colour = Color4.White;
+                        ModBar.AccentColour = valueText.Colour = Color4.White;
                 }
             }
 
@@ -217,7 +219,7 @@ namespace osu.Game.Screens.Select.Details
                         BackgroundColour = Color4.White.Opacity(0.5f),
                         Padding = new MarginPadding { Left = name_width + 10, Right = value_width + 10 },
                     },
-                    modBar = new Bar
+                    ModBar = new Bar
                     {
                         Origin = Anchor.CentreLeft,
                         Anchor = Anchor.CentreLeft,

From e90ae667b7e2481ad867fabae6df1e1969064012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 1 Feb 2020 16:08:24 +0100
Subject: [PATCH 0119/1142] Add failing tests

---
 .../SongSelect/TestSceneAdvancedStats.cs      | 76 +++++++++++++++----
 1 file changed, 63 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs
index c08e974544..3d3517ada4 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneAdvancedStats.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             BaseDifficulty = new BeatmapDifficulty
             {
                 CircleSize = 7.2f,
-                DrainRate = 1,
+                DrainRate = 3,
                 OverallDifficulty = 5.7f,
                 ApproachRate = 3.5f
             },
@@ -55,10 +55,10 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("no mods selected", () => SelectedMods.Value = Array.Empty<Mod>());
 
             AddAssert("first bar text is Circle Size", () => advancedStats.ChildrenOfType<SpriteText>().First().Text == "Circle Size");
-            AddAssert("circle size bar is white", () => advancedStats.FirstValue.ModBar.AccentColour == Color4.White);
-            AddAssert("HP drain bar is white", () => advancedStats.HpDrain.ModBar.AccentColour == Color4.White);
-            AddAssert("accuracy bar is white", () => advancedStats.Accuracy.ModBar.AccentColour == Color4.White);
-            AddAssert("approach rate bar is white", () => advancedStats.ApproachRate.ModBar.AccentColour == Color4.White);
+            AddAssert("circle size bar is white", () => barIsWhite(advancedStats.FirstValue));
+            AddAssert("HP drain bar is white", () => barIsWhite(advancedStats.HpDrain));
+            AddAssert("accuracy bar is white", () => barIsWhite(advancedStats.Accuracy));
+            AddAssert("approach rate bar is white", () => barIsWhite(advancedStats.ApproachRate));
         }
 
         [Test]
@@ -91,10 +91,10 @@ namespace osu.Game.Tests.Visual.SongSelect
                 SelectedMods.Value = new[] { ruleset.GetAllMods().OfType<ModEasy>().Single() };
             });
 
-            AddAssert("circle size bar is blue", () => advancedStats.FirstValue.ModBar.AccentColour == colours.BlueDark);
-            AddAssert("HP drain bar is blue", () => advancedStats.HpDrain.ModBar.AccentColour == colours.BlueDark);
-            AddAssert("accuracy bar is blue", () => advancedStats.Accuracy.ModBar.AccentColour == colours.BlueDark);
-            AddAssert("approach rate bar is blue", () => advancedStats.ApproachRate.ModBar.AccentColour == colours.BlueDark);
+            AddAssert("circle size bar is blue", () => barIsBlue(advancedStats.FirstValue));
+            AddAssert("HP drain bar is blue", () => barIsBlue(advancedStats.HpDrain));
+            AddAssert("accuracy bar is blue", () => barIsBlue(advancedStats.Accuracy));
+            AddAssert("approach rate bar is blue", () => barIsBlue(advancedStats.ApproachRate));
         }
 
         [Test]
@@ -108,12 +108,62 @@ namespace osu.Game.Tests.Visual.SongSelect
                 SelectedMods.Value = new[] { ruleset.GetAllMods().OfType<ModHardRock>().Single() };
             });
 
-            AddAssert("circle size bar is red", () => advancedStats.FirstValue.ModBar.AccentColour == colours.Red);
-            AddAssert("HP drain bar is red", () => advancedStats.HpDrain.ModBar.AccentColour == colours.Red);
-            AddAssert("accuracy bar is red", () => advancedStats.Accuracy.ModBar.AccentColour == colours.Red);
-            AddAssert("approach rate bar is red", () => advancedStats.ApproachRate.ModBar.AccentColour == colours.Red);
+            AddAssert("circle size bar is red", () => barIsRed(advancedStats.FirstValue));
+            AddAssert("HP drain bar is red", () => barIsRed(advancedStats.HpDrain));
+            AddAssert("accuracy bar is red", () => barIsRed(advancedStats.Accuracy));
+            AddAssert("approach rate bar is red", () => barIsRed(advancedStats.ApproachRate));
         }
 
+        [Test]
+        public void TestUnchangedDifficultyAdjustMod()
+        {
+            AddStep("set beatmap", () => advancedStats.Beatmap = exampleBeatmapInfo);
+
+            AddStep("select unchanged Difficulty Adjust mod", () =>
+            {
+                var ruleset = advancedStats.Beatmap.Ruleset.CreateInstance();
+                var difficultyAdjustMod = ruleset.GetAllMods().OfType<ModDifficultyAdjust>().Single();
+                difficultyAdjustMod.ReadFromDifficulty(advancedStats.Beatmap.BaseDifficulty);
+                SelectedMods.Value = new[] { difficultyAdjustMod };
+            });
+
+            AddAssert("circle size bar is white", () => barIsWhite(advancedStats.FirstValue));
+            AddAssert("HP drain bar is white", () => barIsWhite(advancedStats.HpDrain));
+            AddAssert("accuracy bar is white", () => barIsWhite(advancedStats.Accuracy));
+            AddAssert("approach rate bar is white", () => barIsWhite(advancedStats.ApproachRate));
+        }
+
+        [Test]
+        public void TestChangedDifficultyAdjustMod()
+        {
+            AddStep("set beatmap", () => advancedStats.Beatmap = exampleBeatmapInfo);
+
+            AddStep("select changed Difficulty Adjust mod", () =>
+            {
+                var ruleset = advancedStats.Beatmap.Ruleset.CreateInstance();
+                var difficultyAdjustMod = ruleset.GetAllMods().OfType<ModDifficultyAdjust>().Single();
+                var originalDifficulty = advancedStats.Beatmap.BaseDifficulty;
+                var adjustedDifficulty = new BeatmapDifficulty
+                {
+                    CircleSize = originalDifficulty.CircleSize,
+                    DrainRate = originalDifficulty.DrainRate - 0.5f,
+                    OverallDifficulty = originalDifficulty.OverallDifficulty,
+                    ApproachRate = originalDifficulty.ApproachRate + 2.2f,
+                };
+                difficultyAdjustMod.ReadFromDifficulty(adjustedDifficulty);
+                SelectedMods.Value = new[] { difficultyAdjustMod };
+            });
+
+            AddAssert("circle size bar is white", () => barIsWhite(advancedStats.FirstValue));
+            AddAssert("drain rate bar is blue", () => barIsBlue(advancedStats.HpDrain));
+            AddAssert("accuracy bar is white", () => barIsWhite(advancedStats.Accuracy));
+            AddAssert("approach rate bar is red", () => barIsRed(advancedStats.ApproachRate));
+        }
+
+        private bool barIsWhite(AdvancedStats.StatisticRow row) => row.ModBar.AccentColour == Color4.White;
+        private bool barIsBlue(AdvancedStats.StatisticRow row) => row.ModBar.AccentColour == colours.BlueDark;
+        private bool barIsRed(AdvancedStats.StatisticRow row) => row.ModBar.AccentColour == colours.Red;
+
         private class TestAdvancedStats : AdvancedStats
         {
             public new StatisticRow FirstValue => base.FirstValue;

From 0bfadfbbf1fbb713e10f252001285b43cbae6343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 1 Feb 2020 16:16:15 +0100
Subject: [PATCH 0120/1142] Apply precision when comparing adjusted values

In some cases, applying the Difficulty Adjust mod without actually
changing any of the settings previously caused the bar in song select
beatmap details to appear red/blue instead of staying white.

This was caused by not accounting for floating-point imprecisions when
determining bar colour in AdvancedStats. To resolve, first check
equality with tolerance, and only then apply blue/red colours if that
equality check does not hold.
---
 osu.Game/Screens/Select/Details/AdvancedStats.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 81f2b8dc7b..7ab91677a9 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -16,6 +16,7 @@ using System.Collections.Generic;
 using osu.Game.Rulesets.Mods;
 using System.Linq;
 using osu.Framework.Threading;
+using osu.Framework.Utils;
 using osu.Game.Configuration;
 using osu.Game.Overlays.Settings;
 
@@ -177,12 +178,12 @@ namespace osu.Game.Screens.Select.Details
                     valueText.Text = (value.adjustedValue ?? value.baseValue).ToString(forceDecimalPlaces ? "0.00" : "0.##");
                     ModBar.Length = (value.adjustedValue ?? 0) / maxValue;
 
-                    if (value.adjustedValue > value.baseValue)
+                    if (Precision.AlmostEquals(value.baseValue, value.adjustedValue ?? value.baseValue, 0.05f))
+                        ModBar.AccentColour = valueText.Colour = Color4.White;
+                    else if (value.adjustedValue > value.baseValue)
                         ModBar.AccentColour = valueText.Colour = colours.Red;
                     else if (value.adjustedValue < value.baseValue)
                         ModBar.AccentColour = valueText.Colour = colours.BlueDark;
-                    else
-                        ModBar.AccentColour = valueText.Colour = Color4.White;
                 }
             }
 

From 9f4261111b3347719009e7ea21dff8c895791548 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Sat, 1 Feb 2020 16:55:30 +0100
Subject: [PATCH 0121/1142] Match osu-stable behaviour and size

---
 .../Objects/Drawables/Pieces/SliderBall.cs         | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
index ef7b077480..1fa27b6ff6 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
@@ -24,6 +24,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
         private readonly Slider slider;
         public readonly Drawable FollowCircle;
+        public readonly Drawable InternalFollowCircle;
         private readonly DrawableSlider drawableSlider;
 
         public SliderBall(Slider slider, DrawableSlider drawableSlider = null)
@@ -38,6 +39,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
             Children = new[]
             {
+                InternalFollowCircle = new CircularContainer
+                {
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Alpha = 0
+                },
                 FollowCircle = new FollowCircleContainer
                 {
                     Origin = Anchor.Centre,
@@ -95,7 +103,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
                 tracking = value;
 
-                FollowCircle.ScaleTo(tracking ? 2f : 1, 300, Easing.OutQuint);
+                // Cursor input is checked against the internal circle, which scales instantly to match osu-stable behaviour
+                InternalFollowCircle.ScaleTo(tracking ? 2.4f : 1f);
+                FollowCircle.ScaleTo(tracking ? 2f : 1f, 300, Easing.OutQuint);
                 FollowCircle.FadeTo(tracking ? 1f : 0, 300, Easing.OutQuint);
             }
         }
@@ -149,7 +159,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                 // in valid time range
                 Time.Current >= slider.StartTime && Time.Current < slider.EndTime &&
                 // in valid position range
-                lastScreenSpaceMousePosition.HasValue && FollowCircle.ReceivePositionalInputAt(lastScreenSpaceMousePosition.Value) &&
+                lastScreenSpaceMousePosition.HasValue && InternalFollowCircle.ReceivePositionalInputAt(lastScreenSpaceMousePosition.Value) &&
                 // valid action
                 (actions?.Any(isValidTrackingAction) ?? false);
         }

From 2d42a83bb9bd718bac9e6ce5c5dce41632f6f455 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sat, 1 Feb 2020 11:24:29 -0800
Subject: [PATCH 0122/1142] Fix mod select overlay overflowing toolbar at max
 ui scale

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs |  4 +--
 osu.Game/Screens/Select/SongSelect.cs      | 41 +++++++++++++++-------
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 38f5d54714..af772bc2fa 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -66,7 +66,6 @@ namespace osu.Game.Overlays.Mods
             Waves.ThirdWaveColour = OsuColour.FromHex(@"005774");
             Waves.FourthWaveColour = OsuColour.FromHex(@"003a4e");
 
-            Height = 510;
             Padding = new MarginPadding { Horizontal = -OsuScreen.HORIZONTAL_OVERFLOW_PADDING };
 
             Children = new Drawable[]
@@ -85,8 +84,7 @@ namespace osu.Game.Overlays.Mods
                         new Triangles
                         {
                             TriangleScale = 5,
-                            RelativeSizeAxes = Axes.X,
-                            Height = Height, //set the height from the start to ensure correct triangle density.
+                            RelativeSizeAxes = Axes.Both,
                             ColourLight = new Color4(53, 66, 82, 255),
                             ColourDark = new Color4(41, 54, 70, 255),
                         },
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index f9f015643d..8647012ee7 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -221,23 +221,38 @@ namespace osu.Game.Screens.Select
 
             if (ShowFooter)
             {
-                AddRangeInternal(new[]
+                AddRangeInternal(new Drawable[]
                 {
-                    FooterPanels = new Container
+                    new GridContainer // used for max width implementation
                     {
-                        Anchor = Anchor.BottomLeft,
-                        Origin = Anchor.BottomLeft,
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Margin = new MarginPadding { Bottom = Footer.HEIGHT },
-                        Children = new Drawable[]
+                        RelativeSizeAxes = Axes.Both,
+                        RowDimensions = new[]
                         {
-                            BeatmapOptions = new BeatmapOptionsOverlay(),
-                            ModSelect = new ModSelectOverlay
+                            new Dimension(),
+                            new Dimension(GridSizeMode.Relative, 1f, maxSize: 560),
+                        },
+                        Content = new[]
+                        {
+                            null,
+                            new Drawable[]
                             {
-                                RelativeSizeAxes = Axes.X,
-                                Origin = Anchor.BottomCentre,
-                                Anchor = Anchor.BottomCentre,
+                                FooterPanels = new Container
+                                {
+                                    Anchor = Anchor.BottomLeft,
+                                    Origin = Anchor.BottomLeft,
+                                    RelativeSizeAxes = Axes.Both,
+                                    Padding = new MarginPadding { Bottom = Footer.HEIGHT },
+                                    Children = new Drawable[]
+                                    {
+                                        BeatmapOptions = new BeatmapOptionsOverlay(),
+                                        ModSelect = new ModSelectOverlay
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Origin = Anchor.BottomCentre,
+                                            Anchor = Anchor.BottomCentre,
+                                        }
+                                    }
+                                }
                             }
                         }
                     },

From 609ee260302563751370d7e47ad5939cb887e673 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sat, 1 Feb 2020 11:41:41 -0800
Subject: [PATCH 0123/1142] Fix mod select overlay not showing up in test

---
 .../Visual/UserInterface/TestSceneModSelectOverlay.cs           | 1 -
 osu.Game/Overlays/Mods/ModSelectOverlay.cs                      | 2 ++
 osu.Game/Screens/Select/SongSelect.cs                           | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
index 12ee4ceb2e..dfc684d376 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
@@ -60,7 +60,6 @@ namespace osu.Game.Tests.Visual.UserInterface
             {
                 modSelect = new TestModSelectOverlay
                 {
-                    RelativeSizeAxes = Axes.X,
                     Origin = Anchor.BottomCentre,
                     Anchor = Anchor.BottomCentre,
                 },
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index af772bc2fa..2868fe1d79 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -66,6 +66,8 @@ namespace osu.Game.Overlays.Mods
             Waves.ThirdWaveColour = OsuColour.FromHex(@"005774");
             Waves.FourthWaveColour = OsuColour.FromHex(@"003a4e");
 
+            RelativeSizeAxes = Axes.Both;
+
             Padding = new MarginPadding { Horizontal = -OsuScreen.HORIZONTAL_OVERFLOW_PADDING };
 
             Children = new Drawable[]
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 8647012ee7..3f80c90b9d 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -247,7 +247,6 @@ namespace osu.Game.Screens.Select
                                         BeatmapOptions = new BeatmapOptionsOverlay(),
                                         ModSelect = new ModSelectOverlay
                                         {
-                                            RelativeSizeAxes = Axes.Both,
                                             Origin = Anchor.BottomCentre,
                                             Anchor = Anchor.BottomCentre,
                                         }

From 583fee074fa2ef266f5595501646c7b383b1a0fa Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sat, 1 Feb 2020 11:50:24 -0800
Subject: [PATCH 0124/1142] Fix mod select not showing up in mod settings test

---
 osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
index e2ce2341e5..ba0970e123 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
@@ -74,7 +74,6 @@ namespace osu.Game.Tests.Visual.UserInterface
 
                 Child = modSelect = new TestModSelectOverlay
                 {
-                    RelativeSizeAxes = Axes.X,
                     Origin = Anchor.BottomCentre,
                     Anchor = Anchor.BottomCentre,
                 };

From e894acf53ca21b2d8eb8ce13c7850623b22e2e29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 1 Feb 2020 22:48:46 +0100
Subject: [PATCH 0125/1142] Make star filter range bindables BindableDoubles

Due to using Bindable<double>s previously, song select's filter control
would not apply tolerance when checking IsDefault, therefore wrongly
hiding maps with star ratings above 10.1.
---
 osu.Game/Screens/Select/FilterControl.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index c851b201d7..6a03cfb68e 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -149,8 +149,8 @@ namespace osu.Game.Screens.Select
         private readonly IBindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
 
         private readonly Bindable<bool> showConverted = new Bindable<bool>();
-        private readonly Bindable<double> minimumStars = new Bindable<double>();
-        private readonly Bindable<double> maximumStars = new Bindable<double>();
+        private readonly Bindable<double> minimumStars = new BindableDouble();
+        private readonly Bindable<double> maximumStars = new BindableDouble();
 
         public readonly Box Background;
 

From 434c0d92e4ff952b57806b73609b30b327f029f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 1 Feb 2020 22:50:29 +0100
Subject: [PATCH 0126/1142] Use Bindable{Float,Double}s everywhere

To avoid further floating-point comparison bugs, remove all usages of
Bindable<{float,double}>, replacing them with their
Bindable<Float,Double> counterparts.
---
 .../Objects/Drawables/Connections/FollowPointConnection.cs    | 2 +-
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs  | 2 +-
 .../Objects/Drawables/DrawableRepeatPoint.cs                  | 2 +-
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs     | 2 +-
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs | 2 +-
 osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs                 | 2 +-
 osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs         | 2 +-
 osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs                  | 2 +-
 .../Visual/Background/TestSceneUserDimBackgrounds.cs          | 4 ++--
 osu.Game/Rulesets/Objects/HitObject.cs                        | 2 +-
 osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs       | 4 ++--
 osu.Game/Tests/Visual/ScrollingTestContainer.cs               | 2 +-
 12 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
index 6c4fbbac17..a5e89210f6 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
         /// <summary>
         /// The start time of <see cref="Start"/>.
         /// </summary>
-        public readonly Bindable<double> StartTime = new Bindable<double>();
+        public readonly Bindable<double> StartTime = new BindableDouble();
 
         /// <summary>
         /// The <see cref="DrawableOsuHitObject"/> which <see cref="FollowPoint"/>s will exit from.
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 3162f4b379..4ef63bb2a0 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private readonly IBindable<Vector2> positionBindable = new Bindable<Vector2>();
         private readonly IBindable<int> stackHeightBindable = new Bindable<int>();
-        private readonly IBindable<float> scaleBindable = new Bindable<float>();
+        private readonly IBindable<float> scaleBindable = new BindableFloat();
 
         public OsuAction? HitAction => HitArea.HitAction;
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableRepeatPoint.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableRepeatPoint.cs
index 20b31c68f2..8fdcd060e7 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableRepeatPoint.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableRepeatPoint.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             InternalChild = scaleContainer = new ReverseArrowPiece();
         }
 
-        private readonly IBindable<float> scaleBindable = new Bindable<float>();
+        private readonly IBindable<float> scaleBindable = new BindableFloat();
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index cd3c572ba0..7403649184 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private readonly IBindable<Vector2> positionBindable = new Bindable<Vector2>();
         private readonly IBindable<int> stackHeightBindable = new Bindable<int>();
-        private readonly IBindable<float> scaleBindable = new Bindable<float>();
+        private readonly IBindable<float> scaleBindable = new BindableFloat();
 
         public DrawableSlider(Slider s)
             : base(s)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
index 9d4d9958a1..60b5c335d6 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTick.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             };
         }
 
-        private readonly IBindable<float> scaleBindable = new Bindable<float>();
+        private readonly IBindable<float> scaleBindable = new BindableFloat();
 
         [BackgroundDependencyLoader]
         private void load()
diff --git a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
index 0ba712a83f..15af141c99 100644
--- a/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public double Radius => OBJECT_RADIUS * Scale;
 
-        public readonly Bindable<float> ScaleBindable = new Bindable<float>(1);
+        public readonly Bindable<float> ScaleBindable = new BindableFloat(1);
 
         public float Scale
         {
diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
index a463542e64..79b5d1b7f8 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             autoCursorScale = config.GetBindable<bool>(OsuSetting.AutoCursorSize);
             autoCursorScale.ValueChanged += _ => calculateScale();
 
-            CursorScale = new Bindable<float>();
+            CursorScale = new BindableFloat();
             CursorScale.ValueChanged += e => ActiveCursor.Scale = cursorTrail.Scale = new Vector2(e.NewValue);
 
             calculateScale();
diff --git a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
index ca3030db3e..abba444c73 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Osu.UI
             {
                 Add(localCursorContainer = new OsuCursorContainer());
 
-                localCursorScale = new Bindable<float>();
+                localCursorScale = new BindableFloat();
                 localCursorScale.BindTo(localCursorContainer.CursorScale);
                 localCursorScale.BindValueChanged(scale => cursorScaleContainer.Scale = new Vector2(scale.NewValue), true);
             }
diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index 589ec7e8aa..29bcc7df9e 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -302,8 +302,8 @@ namespace osu.Game.Tests.Visual.Background
             }
 
             public readonly Bindable<bool> DimEnabled = new Bindable<bool>();
-            public readonly Bindable<double> DimLevel = new Bindable<double>();
-            public readonly Bindable<double> BlurLevel = new Bindable<double>();
+            public readonly Bindable<double> DimLevel = new BindableDouble();
+            public readonly Bindable<double> BlurLevel = new BindableDouble();
 
             public new BeatmapCarousel Carousel => base.Carousel;
 
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index bd96441ebb..c09844e0c6 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Objects
         /// </summary>
         public event Action DefaultsApplied;
 
-        public readonly Bindable<double> StartTimeBindable = new Bindable<double>();
+        public readonly Bindable<double> StartTimeBindable = new BindableDouble();
 
         /// <summary>
         /// The time at which the HitObject starts.
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
index 3ced9ee753..50fd127093 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Screens.Backgrounds
         /// <summary>
         /// The amount of blur to be applied in addition to user-specified blur.
         /// </summary>
-        public readonly Bindable<float> BlurAmount = new Bindable<float>();
+        public readonly Bindable<float> BlurAmount = new BindableFloat();
 
         internal readonly IBindable<bool> IsBreakTime = new Bindable<bool>();
 
@@ -119,7 +119,7 @@ namespace osu.Game.Screens.Backgrounds
             /// <remarks>
             /// Used in contexts where there can potentially be both user and screen-specified blurring occuring at the same time, such as in <see cref="PlayerLoader"/>
             /// </remarks>
-            public readonly Bindable<float> BlurAmount = new Bindable<float>();
+            public readonly Bindable<float> BlurAmount = new BindableFloat();
 
             public Background Background
             {
diff --git a/osu.Game/Tests/Visual/ScrollingTestContainer.cs b/osu.Game/Tests/Visual/ScrollingTestContainer.cs
index bdad3d278c..161ebe7030 100644
--- a/osu.Game/Tests/Visual/ScrollingTestContainer.cs
+++ b/osu.Game/Tests/Visual/ScrollingTestContainer.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Tests.Visual
             public readonly Bindable<ScrollingDirection> Direction = new Bindable<ScrollingDirection>();
             IBindable<ScrollingDirection> IScrollingInfo.Direction => Direction;
 
-            public readonly Bindable<double> TimeRange = new Bindable<double>(1000) { Value = 1000 };
+            public readonly Bindable<double> TimeRange = new BindableDouble(1000) { Value = 1000 };
             IBindable<double> IScrollingInfo.TimeRange => TimeRange;
 
             public readonly TestScrollAlgorithm Algorithm = new TestScrollAlgorithm();

From 36116f8c45f06ffa0256f6e2ba53a67182a74753 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 2 Feb 2020 12:03:51 +0300
Subject: [PATCH 0127/1142] Refactor ruleset presentation

---
 .../TestSceneUserProfileRecentSection.cs      | 16 ++++++++++
 .../Requests/Responses/APIRecentActivity.cs   | 31 +------------------
 .../Sections/Recent/DrawableRecentActivity.cs | 26 ++++++++++++----
 3 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileRecentSection.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileRecentSection.cs
index 532aaa9c92..06091f3c81 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileRecentSection.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileRecentSection.cs
@@ -136,6 +136,22 @@ namespace osu.Game.Tests.Visual.Online
                     Beatmap = dummyBeatmap,
                 },
                 new APIRecentActivity
+                {
+                    User = dummyUser,
+                    Type = RecentActivityType.Rank,
+                    Rank = 1,
+                    Mode = "vitaru",
+                    Beatmap = dummyBeatmap,
+                },
+                new APIRecentActivity
+                {
+                    User = dummyUser,
+                    Type = RecentActivityType.Rank,
+                    Rank = 1,
+                    Mode = "fruits",
+                    Beatmap = dummyBeatmap,
+                },
+                new APIRecentActivity
                 {
                     User = dummyUser,
                     Type = RecentActivityType.RankLost,
diff --git a/osu.Game/Online/API/Requests/Responses/APIRecentActivity.cs b/osu.Game/Online/API/Requests/Responses/APIRecentActivity.cs
index b416085217..8695d09570 100644
--- a/osu.Game/Online/API/Requests/Responses/APIRecentActivity.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIRecentActivity.cs
@@ -41,37 +41,8 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty("count")]
         public int Count;
 
-        public string Mode;
-
         [JsonProperty("mode")]
-        private string mode
-        {
-            set
-            {
-                switch (value)
-                {
-                    default:
-                        Mode = value;
-                        return;
-
-                    case "osu":
-                        Mode = "osu!";
-                        return;
-
-                    case "mania":
-                        Mode = "osu!mania";
-                        return;
-
-                    case "taiko":
-                        Mode = "osu!taiko";
-                        return;
-
-                    case "fruits":
-                        Mode = "osu!catch";
-                        return;
-                }
-            }
-        }
+        public string Mode;
 
         [JsonProperty("beatmap")]
         public RecentActivityBeatmap Beatmap;
diff --git a/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs b/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
index 3f8ab93abd..5a315b59b4 100644
--- a/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
+++ b/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -12,6 +13,7 @@ using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Chat;
 using osu.Game.Online.Leaderboards;
+using osu.Game.Rulesets;
 
 namespace osu.Game.Overlays.Profile.Sections.Recent
 {
@@ -19,7 +21,11 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
     {
         private const int font_size = 14;
 
-        private IAPIProvider api;
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
 
         private readonly APIRecentActivity activity;
 
@@ -31,10 +37,8 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
         }
 
         [BackgroundDependencyLoader]
-        private void load(IAPIProvider api, OverlayColourProvider colourProvider)
+        private void load(OverlayColourProvider colourProvider)
         {
-            this.api = api;
-
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
             AddInternal(new GridContainer
@@ -118,6 +122,16 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
             }
         }
 
+        private string getRulesetName()
+        {
+            var shortName = activity.Mode;
+
+            if (rulesets.AvailableRulesets.Select(r => r.ShortName).Contains(shortName))
+                return rulesets.AvailableRulesets.FirstOrDefault(r => r.ShortName == shortName).Name;
+
+            return shortName;
+        }
+
         private string getLinkArgument(string url) => MessageFormatter.GetLinkDetails($"{api.Endpoint}{url}").Argument;
 
         private FontUsage getLinkFont(FontWeight fontWeight = FontWeight.Regular)
@@ -185,14 +199,14 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
                     addUserLink();
                     addText($" achieved rank #{activity.Rank} on ");
                     addBeatmapLink();
-                    addText($" ({activity.Mode})");
+                    addText($" ({getRulesetName()})");
                     break;
 
                 case RecentActivityType.RankLost:
                     addUserLink();
                     addText(" has lost first place on ");
                     addBeatmapLink();
-                    addText($" ({activity.Mode})");
+                    addText($" ({getRulesetName()})");
                     break;
 
                 case RecentActivityType.UserSupportAgain:

From a70385f2b26058cec6da3d7ebb7d150cbe54967c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 2 Feb 2020 12:19:09 +0300
Subject: [PATCH 0128/1142] Simplify getRulesetName

---
 .../Profile/Sections/Recent/DrawableRecentActivity.cs        | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs b/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
index 5a315b59b4..f538833eb0 100644
--- a/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
+++ b/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
@@ -126,10 +126,7 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
         {
             var shortName = activity.Mode;
 
-            if (rulesets.AvailableRulesets.Select(r => r.ShortName).Contains(shortName))
-                return rulesets.AvailableRulesets.FirstOrDefault(r => r.ShortName == shortName).Name;
-
-            return shortName;
+            return rulesets.AvailableRulesets.FirstOrDefault(r => r.ShortName == shortName)?.Name ?? shortName;
         }
 
         private string getLinkArgument(string url) => MessageFormatter.GetLinkDetails($"{api.Endpoint}{url}").Argument;

From e2589b2dcb6cdaaef86485ce04484635c7d0ed92 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Sun, 2 Feb 2020 11:24:28 +0100
Subject: [PATCH 0129/1142] Rename drawable

---
 .../Objects/Drawables/Pieces/SliderBall.cs            | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
index 1fa27b6ff6..4599044912 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
         private readonly Slider slider;
         public readonly Drawable FollowCircle;
-        public readonly Drawable InternalFollowCircle;
+        public readonly Drawable TrackingArea;
         private readonly DrawableSlider drawableSlider;
 
         public SliderBall(Slider slider, DrawableSlider drawableSlider = null)
@@ -39,7 +39,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
             Children = new[]
             {
-                InternalFollowCircle = new CircularContainer
+                // This is separate from the visible followcircle to ensure consistent internal tracking area (needed to match osu-stable)
+                TrackingArea = new CircularContainer
                 {
                     Origin = Anchor.Centre,
                     Anchor = Anchor.Centre,
@@ -103,8 +104,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
                 tracking = value;
 
-                // Cursor input is checked against the internal circle, which scales instantly to match osu-stable behaviour
-                InternalFollowCircle.ScaleTo(tracking ? 2.4f : 1f);
+                // Tracking area is bigger than the visible followcircle and scales instantly to match osu-stable
+                TrackingArea.ScaleTo(tracking ? 2.4f : 1f);
                 FollowCircle.ScaleTo(tracking ? 2f : 1f, 300, Easing.OutQuint);
                 FollowCircle.FadeTo(tracking ? 1f : 0, 300, Easing.OutQuint);
             }
@@ -159,7 +160,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                 // in valid time range
                 Time.Current >= slider.StartTime && Time.Current < slider.EndTime &&
                 // in valid position range
-                lastScreenSpaceMousePosition.HasValue && InternalFollowCircle.ReceivePositionalInputAt(lastScreenSpaceMousePosition.Value) &&
+                lastScreenSpaceMousePosition.HasValue && TrackingArea.ReceivePositionalInputAt(lastScreenSpaceMousePosition.Value) &&
                 // valid action
                 (actions?.Any(isValidTrackingAction) ?? false);
         }

From 52aae684116fbed2109b168dcb2a534da491fb88 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Sun, 2 Feb 2020 17:52:34 +0700
Subject: [PATCH 0130/1142] Adjust profile scores to closer match osu-web

---
 .../Profile/Sections/Ranks/DrawableProfileScore.cs  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
index 5196bef48d..13f4d9a3a5 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
@@ -23,7 +23,8 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
     public class DrawableProfileScore : CompositeDrawable
     {
         private const int performance_width = 80;
-        private const int content_padding = 10;
+        private const int content_padding_left = 10;
+        private const int content_padding_right = 30;
 
         protected readonly ScoreInfo Score;
 
@@ -51,7 +52,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                     new Container
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Padding = new MarginPadding { Left = content_padding, Right = performance_width + content_padding },
+                        Padding = new MarginPadding { Left = content_padding_left, Right = performance_width + content_padding_right },
                         Children = new Drawable[]
                         {
                             new FillFlowContainer
@@ -142,17 +143,21 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                         {
                             new Box
                             {
+                                Anchor = Anchor.TopRight,
+                                Origin = Anchor.TopRight,
                                 RelativeSizeAxes = Axes.Both,
-                                Size = new Vector2(1, 0.5f),
+                                Size = new Vector2(1.06f, 0.5f),
                                 Colour = Color4.Black.Opacity(0.5f),
                                 Shear = new Vector2(-0.45f, 0),
                                 EdgeSmoothness = new Vector2(2, 0),
                             },
                             new Box
                             {
+                                Anchor = Anchor.TopRight,
+                                Origin = Anchor.TopRight,
                                 RelativeSizeAxes = Axes.Both,
                                 RelativePositionAxes = Axes.Y,
-                                Size = new Vector2(1, -0.5f),
+                                Size = new Vector2(1.06f, -0.5f),
                                 Position = new Vector2(0, 1),
                                 Colour = Color4.Black.Opacity(0.5f),
                                 Shear = new Vector2(0.45f, 0),

From abccf05155906d24c0b1757f89f3ac0b5f206a11 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 2 Feb 2020 14:46:50 +0300
Subject: [PATCH 0131/1142] Update visibility of each key counter instead of
 this container

For isolating changing visibility of the key counter display based on config and internal values from just fading the container.
---
 osu.Game/Screens/Play/KeyCounterDisplay.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/KeyCounterDisplay.cs b/osu.Game/Screens/Play/KeyCounterDisplay.cs
index 9c107f0293..5672042a98 100644
--- a/osu.Game/Screens/Play/KeyCounterDisplay.cs
+++ b/osu.Game/Screens/Play/KeyCounterDisplay.cs
@@ -5,6 +5,7 @@ using System;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
@@ -100,7 +101,9 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        private void updateVisibility() => this.FadeTo(Visible.Value || configVisibility.Value ? 1 : 0, duration);
+        private void updateVisibility() =>
+            // Change visibility of all key counters internally to isolate from showing them by fading in this container.
+            Children.ForEach(k => k.FadeTo(Visible.Value || ConfigVisibility.Value ? 1 : 0, duration));
 
         public override bool HandleNonPositionalInput => receptor == null;
         public override bool HandlePositionalInput => receptor == null;

From 6a11c3a8f9edcdf04b386215d5601e6fba9ba2d3 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 2 Feb 2020 14:48:07 +0300
Subject: [PATCH 0132/1142] Expose ConfigVisibility bindable for testing
 purposes

---
 osu.Game/Screens/Play/KeyCounterDisplay.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/KeyCounterDisplay.cs b/osu.Game/Screens/Play/KeyCounterDisplay.cs
index 5672042a98..d7b4913d3c 100644
--- a/osu.Game/Screens/Play/KeyCounterDisplay.cs
+++ b/osu.Game/Screens/Play/KeyCounterDisplay.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Screens.Play
         private const double key_fade_time = 80;
 
         public readonly Bindable<bool> Visible = new Bindable<bool>(true);
-        private readonly Bindable<bool> configVisibility = new Bindable<bool>();
+        protected readonly Bindable<bool> ConfigVisibility = new Bindable<bool>();
 
         public KeyCounterDisplay()
         {
@@ -43,7 +43,7 @@ namespace osu.Game.Screens.Play
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            config.BindWith(OsuSetting.KeyOverlay, configVisibility);
+            config.BindWith(OsuSetting.KeyOverlay, ConfigVisibility);
         }
 
         protected override void LoadComplete()
@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Play
             base.LoadComplete();
 
             Visible.BindValueChanged(_ => updateVisibility());
-            configVisibility.BindValueChanged(_ => updateVisibility(), true);
+            ConfigVisibility.BindValueChanged(_ => updateVisibility(), true);
         }
 
         private bool isCounting = true;

From 6103674b5481055f2a34cb2f44d09889583793bb Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 2 Feb 2020 14:50:05 +0300
Subject: [PATCH 0133/1142] Add tests for changing HUD visibility on hidden key
 counter configuration

---
 .../Visual/Gameplay/TestSceneHUDOverlay.cs    | 57 ++++++++++++++++++-
 1 file changed, 54 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index ee58219cd3..e34e87d8df 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -2,18 +2,21 @@
 // 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.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneHUDOverlay : ManualInputManagerTestScene
     {
-        private HUDOverlay hudOverlay;
+        private TestHUDOverlay hudOverlay;
 
         private Drawable hideTarget => hudOverlay.KeyCounter; // best way of checking hideTargets without exposing.
 
@@ -28,6 +31,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("showhud is set", () => hudOverlay.ShowHud.Value);
 
             AddAssert("hidetarget is visible", () => hideTarget.IsPresent);
+            AddAssert("key counters are visible", () => hudOverlay.KeyCounter.All(k => k.IsPresent));
             AddAssert("pause button is visible", () => hudOverlay.HoldToQuit.IsPresent);
         }
 
@@ -50,6 +54,9 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddUntilStep("hidetarget is hidden", () => !hideTarget.IsPresent);
             AddAssert("pause button is still visible", () => hudOverlay.HoldToQuit.IsPresent);
+
+            // Key counters should not be affected by this, only the key counter container will be hidden as checked above.
+            AddAssert("key counters not affected", () => hudOverlay.KeyCounter.All(k => k.IsPresent));
         }
 
         [Test]
@@ -68,14 +75,58 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("config unchanged", () => originalConfigValue == config.Get<bool>(OsuSetting.ShowInterface));
         }
 
-        private void createNew(Action<HUDOverlay> action = null)
+        [Test]
+        public void TestChangeHUDVisibilityOnHiddenKeyCounter()
+        {
+            createNew();
+
+            AddStep("set keycounter visible false", () =>
+            {
+                hudOverlay.KeyCounter.ConfigVisibility.Value = false;
+                hudOverlay.KeyCounter.Visible.Value = false;
+            });
+
+            AddStep("set showhud false", () => hudOverlay.ShowHud.Value = false);
+            AddUntilStep("hidetarget is hidden", () => !hideTarget.IsPresent);
+            AddAssert("key counters hidden", () => hudOverlay.KeyCounter.All(k => !k.IsPresent));
+
+            AddStep("set showhud true", () => hudOverlay.ShowHud.Value = true);
+            AddUntilStep("hidetarget is visible", () => hideTarget.IsPresent);
+            AddAssert("key counters still hidden", () => hudOverlay.KeyCounter.All(k => !k.IsPresent));
+        }
+
+        private void createNew(Action<TestHUDOverlay> action = null)
         {
             AddStep("create overlay", () =>
             {
-                Child = hudOverlay = new HUDOverlay(null, null, null, Array.Empty<Mod>());
+                Child = hudOverlay = new TestHUDOverlay();
 
                 action?.Invoke(hudOverlay);
             });
         }
+
+        private class TestHUDOverlay : HUDOverlay
+        {
+            public new TestKeyCounterDisplay KeyCounter => (TestKeyCounterDisplay)base.KeyCounter;
+
+            protected override KeyCounterDisplay CreateKeyCounter() => new TestKeyCounterDisplay
+            {
+                Anchor = Anchor.BottomRight,
+                Origin = Anchor.BottomRight,
+                Margin = new MarginPadding(10),
+            };
+
+            public TestHUDOverlay()
+                : base(null, null, null, Array.Empty<Mod>())
+            {
+                // Add any key just to display the key counter visually.
+                KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
+            }
+        }
+
+        private class TestKeyCounterDisplay : KeyCounterDisplay
+        {
+            public new Bindable<bool> ConfigVisibility => base.ConfigVisibility;
+        }
     }
 }

From f7abfdb40e8fcea47b3ddfc8bb33550f9bc60ba7 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Sun, 2 Feb 2020 14:33:48 +0100
Subject: [PATCH 0134/1142] Remove unnecessary parameter

---
 osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
index 4599044912..a81ac3f4ff 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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;
@@ -44,8 +44,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                 {
                     Origin = Anchor.Centre,
                     Anchor = Anchor.Centre,
-                    RelativeSizeAxes = Axes.Both,
-                    Alpha = 0
+                    RelativeSizeAxes = Axes.Both
                 },
                 FollowCircle = new FollowCircleContainer
                 {

From 35032e2ddd1b0d76bd1615c25dd17de7cd3cee10 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Sun, 2 Feb 2020 14:34:06 +0100
Subject: [PATCH 0135/1142] Make variables private

---
 .../Objects/Drawables/Pieces/SliderBall.cs     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
index a81ac3f4ff..b89b0cafc4 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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;
@@ -23,8 +23,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
         public Func<OsuAction?> GetInitialHitAction;
 
         private readonly Slider slider;
-        public readonly Drawable FollowCircle;
-        public readonly Drawable TrackingArea;
+        private readonly Drawable followCircle;
+        private readonly Drawable trackingArea;
         private readonly DrawableSlider drawableSlider;
 
         public SliderBall(Slider slider, DrawableSlider drawableSlider = null)
@@ -40,13 +40,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
             Children = new[]
             {
                 // This is separate from the visible followcircle to ensure consistent internal tracking area (needed to match osu-stable)
-                TrackingArea = new CircularContainer
+                trackingArea = new CircularContainer
                 {
                     Origin = Anchor.Centre,
                     Anchor = Anchor.Centre,
                     RelativeSizeAxes = Axes.Both
                 },
-                FollowCircle = new FollowCircleContainer
+                followCircle = new FollowCircleContainer
                 {
                     Origin = Anchor.Centre,
                     Anchor = Anchor.Centre,
@@ -104,9 +104,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                 tracking = value;
 
                 // Tracking area is bigger than the visible followcircle and scales instantly to match osu-stable
-                TrackingArea.ScaleTo(tracking ? 2.4f : 1f);
-                FollowCircle.ScaleTo(tracking ? 2f : 1f, 300, Easing.OutQuint);
-                FollowCircle.FadeTo(tracking ? 1f : 0, 300, Easing.OutQuint);
+                trackingArea.ScaleTo(tracking ? 2.4f : 1f);
+                followCircle.ScaleTo(tracking ? 2f : 1f, 300, Easing.OutQuint);
+                followCircle.FadeTo(tracking ? 1f : 0, 300, Easing.OutQuint);
             }
         }
 
@@ -159,7 +159,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                 // in valid time range
                 Time.Current >= slider.StartTime && Time.Current < slider.EndTime &&
                 // in valid position range
-                lastScreenSpaceMousePosition.HasValue && TrackingArea.ReceivePositionalInputAt(lastScreenSpaceMousePosition.Value) &&
+                lastScreenSpaceMousePosition.HasValue && trackingArea.ReceivePositionalInputAt(lastScreenSpaceMousePosition.Value) &&
                 // valid action
                 (actions?.Any(isValidTrackingAction) ?? false);
         }

From 122fd63ac467912b80ffea3d9d1d90637ba47dcc Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Sun, 2 Feb 2020 21:05:20 +0700
Subject: [PATCH 0136/1142] Inline single-use constants

---
 .../Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
index 13f4d9a3a5..7400bed04e 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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;
@@ -23,8 +23,6 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
     public class DrawableProfileScore : CompositeDrawable
     {
         private const int performance_width = 80;
-        private const int content_padding_left = 10;
-        private const int content_padding_right = 30;
 
         protected readonly ScoreInfo Score;
 
@@ -52,7 +50,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                     new Container
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Padding = new MarginPadding { Left = content_padding_left, Right = performance_width + content_padding_right },
+                        Padding = new MarginPadding { Left = 10, Right = performance_width + 30 },
                         Children = new Drawable[]
                         {
                             new FillFlowContainer

From a641069ec2b9ef3b7f47da143084facfecaaa719 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Sun, 2 Feb 2020 21:07:23 +0700
Subject: [PATCH 0137/1142] Change profile score background colour

---
 osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs  | 4 ++--
 .../Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs b/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs
index 717ec4fb1a..f65c909155 100644
--- a/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs
@@ -44,8 +44,8 @@ namespace osu.Game.Overlays.Profile.Sections
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
         {
-            background.Colour = idleColour = colourProvider.Background4;
-            hoverColour = colourProvider.Background3;
+            background.Colour = idleColour = colourProvider.Background3;
+            hoverColour = colourProvider.Background2;
         }
 
         protected override bool OnHover(HoverEvent e)
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
index 7400bed04e..55ed80cc04 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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;
@@ -145,7 +145,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                                 Origin = Anchor.TopRight,
                                 RelativeSizeAxes = Axes.Both,
                                 Size = new Vector2(1.06f, 0.5f),
-                                Colour = Color4.Black.Opacity(0.5f),
+                                Colour = colourProvider.Background4,
                                 Shear = new Vector2(-0.45f, 0),
                                 EdgeSmoothness = new Vector2(2, 0),
                             },
@@ -157,7 +157,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                                 RelativePositionAxes = Axes.Y,
                                 Size = new Vector2(1.06f, -0.5f),
                                 Position = new Vector2(0, 1),
-                                Colour = Color4.Black.Opacity(0.5f),
+                                Colour = colourProvider.Background4,
                                 Shear = new Vector2(0.45f, 0),
                                 EdgeSmoothness = new Vector2(2, 0),
                             },

From 30a5835bdbc24abc82d09f8e6832d5aa9aaf37a5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 2 Feb 2020 23:07:39 +0900
Subject: [PATCH 0138/1142] Combine link flows and simplify new line addition

---
 .../Profile/Header/BottomHeaderContainer.cs   | 80 ++++++++-----------
 1 file changed, 34 insertions(+), 46 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
index 469f9caf4a..bca72666de 100644
--- a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
@@ -15,7 +15,6 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Users;
 using osuTK;
 using osuTK.Graphics;
-using static osu.Framework.Graphics.Containers.TextFlowContainer;
 
 namespace osu.Game.Overlays.Profile.Header
 {
@@ -23,8 +22,7 @@ namespace osu.Game.Overlays.Profile.Header
     {
         public readonly Bindable<User> User = new Bindable<User>();
 
-        private LinkFlowContainer topLinkContainer;
-        private LinkFlowContainer bottomLinkContainer;
+        private LinkFlowContainer linkContainer;
 
         private Color4 iconColour;
 
@@ -45,26 +43,12 @@ namespace osu.Game.Overlays.Profile.Header
                     RelativeSizeAxes = Axes.Both,
                     Colour = colourProvider.Background4
                 },
-                new FillFlowContainer
+                linkContainer = new LinkFlowContainer(text => text.Font = text.Font.With(size: 12))
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
-                    Direction = FillDirection.Vertical,
                     Padding = new MarginPadding { Horizontal = UserProfileOverlay.CONTENT_X_MARGIN, Vertical = 10 },
                     Spacing = new Vector2(0, 10),
-                    Children = new Drawable[]
-                    {
-                        topLinkContainer = new LinkFlowContainer(text => text.Font = text.Font.With(size: 12))
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                        },
-                        bottomLinkContainer = new LinkFlowContainer(text => text.Font = text.Font.With(size: 12))
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                        }
-                    }
                 }
             };
 
@@ -73,44 +57,43 @@ namespace osu.Game.Overlays.Profile.Header
 
         private void updateDisplay(User user)
         {
-            topLinkContainer.Clear();
-            bottomLinkContainer.Clear();
+            linkContainer.Clear();
 
             if (user == null) return;
 
             if (user.JoinDate.ToUniversalTime().Year < 2008)
-                topLinkContainer.AddText("Here since the beginning");
+                linkContainer.AddText("Here since the beginning");
             else
             {
-                topLinkContainer.AddText("Joined ");
-                topLinkContainer.AddText(new DrawableDate(user.JoinDate), embolden);
+                linkContainer.AddText("Joined ");
+                linkContainer.AddText(new DrawableDate(user.JoinDate), embolden);
             }
 
-            addSpacer(topLinkContainer);
+            addSpacer(linkContainer);
 
             if (user.IsOnline)
             {
-                topLinkContainer.AddText("Currently online");
-                addSpacer(topLinkContainer);
+                linkContainer.AddText("Currently online");
+                addSpacer(linkContainer);
             }
             else if (user.LastVisit.HasValue)
             {
-                topLinkContainer.AddText("Last seen ");
-                topLinkContainer.AddText(new DrawableDate(user.LastVisit.Value), embolden);
+                linkContainer.AddText("Last seen ");
+                linkContainer.AddText(new DrawableDate(user.LastVisit.Value), embolden);
 
-                addSpacer(topLinkContainer);
+                addSpacer(linkContainer);
             }
 
             if (user.PlayStyles?.Length > 0)
             {
-                topLinkContainer.AddText("Plays with ");
-                topLinkContainer.AddText(string.Join(", ", user.PlayStyles.Select(style => style.GetDescription())), embolden);
+                linkContainer.AddText("Plays with ");
+                linkContainer.AddText(string.Join(", ", user.PlayStyles.Select(style => style.GetDescription())), embolden);
 
-                addSpacer(topLinkContainer);
+                addSpacer(linkContainer);
             }
 
-            topLinkContainer.AddText("Contributed ");
-            topLinkContainer.AddLink($@"{user.PostCount:#,##0} forum posts", $"https://osu.ppy.sh/users/{user.Id}/posts", creationParameters: embolden);
+            linkContainer.AddText("Contributed ");
+            linkContainer.AddLink($@"{user.PostCount:#,##0} forum posts", $"https://osu.ppy.sh/users/{user.Id}/posts", creationParameters: embolden);
 
             string websiteWithoutProtocol = user.Website;
 
@@ -123,46 +106,51 @@ namespace osu.Game.Overlays.Profile.Header
                 }
             }
 
+            requireNewLineOnAddInfo = true;
+
             tryAddInfo(FontAwesome.Solid.MapMarker, user.Location);
             tryAddInfo(OsuIcon.Heart, user.Interests);
             tryAddInfo(FontAwesome.Solid.Suitcase, user.Occupation);
-            bottomLinkContainer.NewLine();
+
+            requireNewLineOnAddInfo = true;
+
             if (!string.IsNullOrEmpty(user.Twitter))
                 tryAddInfo(FontAwesome.Brands.Twitter, "@" + user.Twitter, $@"https://twitter.com/{user.Twitter}");
             tryAddInfo(FontAwesome.Brands.Discord, user.Discord);
             tryAddInfo(FontAwesome.Brands.Skype, user.Skype, @"skype:" + user.Skype + @"?chat");
             tryAddInfo(FontAwesome.Brands.Lastfm, user.Lastfm, $@"https://last.fm/users/{user.Lastfm}");
             tryAddInfo(FontAwesome.Solid.Link, websiteWithoutProtocol, user.Website);
-
-            // Hide the container to prevent adding unnecessary padding if it has no children other than the NewLineContainer
-            if (bottomLinkContainer.Children.All(child => child is NewLineContainer))
-                bottomLinkContainer.Hide();
-            else
-                // this is needed if user gets changed without the whole header being reloaded
-                bottomLinkContainer.Show();
         }
 
         private void addSpacer(OsuTextFlowContainer textFlow) => textFlow.AddArbitraryDrawable(new Container { Width = 15 });
 
+        private bool requireNewLineOnAddInfo;
+
         private void tryAddInfo(IconUsage icon, string content, string link = null)
         {
             if (string.IsNullOrEmpty(content)) return;
 
+            if (requireNewLineOnAddInfo)
+            {
+                linkContainer.NewLine();
+                requireNewLineOnAddInfo = false;
+            }
+
             // newlines could be contained in API returned user content.
             content = content.Replace("\n", " ");
 
-            bottomLinkContainer.AddIcon(icon, text =>
+            linkContainer.AddIcon(icon, text =>
             {
                 text.Font = text.Font.With(size: 10);
                 text.Colour = iconColour;
             });
 
             if (link != null)
-                bottomLinkContainer.AddLink(" " + content, link, creationParameters: embolden);
+                linkContainer.AddLink(" " + content, link, creationParameters: embolden);
             else
-                bottomLinkContainer.AddText(" " + content, embolden);
+                linkContainer.AddText(" " + content, embolden);
 
-            addSpacer(bottomLinkContainer);
+            addSpacer(linkContainer);
         }
 
         private void embolden(SpriteText text) => text.Font = text.Font.With(weight: FontWeight.Bold);

From 79efcbd6f315c4cc6e6d723d09f544d75838dde7 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Sun, 2 Feb 2020 21:08:16 +0700
Subject: [PATCH 0139/1142] Fix performance background width

---
 .../Sections/Ranks/DrawableProfileScore.cs    | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
index 55ed80cc04..07a85be041 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
@@ -1,10 +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;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -16,14 +16,16 @@ using osu.Game.Online.Leaderboards;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Profile.Sections.Ranks
 {
     public class DrawableProfileScore : CompositeDrawable
     {
+        private const int height = 40;
         private const int performance_width = 80;
 
+        private const float performance_background_shear = 0.45f;
+
         protected readonly ScoreInfo Score;
 
         [Resolved]
@@ -37,12 +39,14 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
             Score = score;
 
             RelativeSizeAxes = Axes.X;
-            Height = 40;
+            Height = height;
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
+            float performance_background_width = performance_width + (height / 4f * MathF.Tan(performance_background_shear));
+
             AddInternal(new ProfileItemContainer
             {
                 Children = new Drawable[]
@@ -143,22 +147,24 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                             {
                                 Anchor = Anchor.TopRight,
                                 Origin = Anchor.TopRight,
-                                RelativeSizeAxes = Axes.Both,
-                                Size = new Vector2(1.06f, 0.5f),
+                                RelativeSizeAxes = Axes.Y,
+                                Width = performance_background_width,
+                                Height = 0.5f,
                                 Colour = colourProvider.Background4,
-                                Shear = new Vector2(-0.45f, 0),
+                                Shear = new Vector2(-performance_background_shear, 0),
                                 EdgeSmoothness = new Vector2(2, 0),
                             },
                             new Box
                             {
                                 Anchor = Anchor.TopRight,
                                 Origin = Anchor.TopRight,
-                                RelativeSizeAxes = Axes.Both,
+                                RelativeSizeAxes = Axes.Y,
                                 RelativePositionAxes = Axes.Y,
-                                Size = new Vector2(1.06f, -0.5f),
+                                Width = performance_background_width,
+                                Height = -0.5f,
                                 Position = new Vector2(0, 1),
                                 Colour = colourProvider.Background4,
-                                Shear = new Vector2(0.45f, 0),
+                                Shear = new Vector2(performance_background_shear, 0),
                                 EdgeSmoothness = new Vector2(2, 0),
                             },
                             createDrawablePerformance().With(d =>

From aa13b605a4877458470173f33ddd0946b26a781a Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Sun, 2 Feb 2020 21:34:35 +0700
Subject: [PATCH 0140/1142] Fix inconsistent local variable naming

---
 .../Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
index 07a85be041..930f9b8a43 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
         [BackgroundDependencyLoader]
         private void load()
         {
-            float performance_background_width = performance_width + (height / 4f * MathF.Tan(performance_background_shear));
+            float performanceBackgroundWidth = performance_width + (height / 4f * MathF.Tan(performance_background_shear));
 
             AddInternal(new ProfileItemContainer
             {
@@ -148,7 +148,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                                 Anchor = Anchor.TopRight,
                                 Origin = Anchor.TopRight,
                                 RelativeSizeAxes = Axes.Y,
-                                Width = performance_background_width,
+                                Width = performanceBackgroundWidth,
                                 Height = 0.5f,
                                 Colour = colourProvider.Background4,
                                 Shear = new Vector2(-performance_background_shear, 0),
@@ -160,7 +160,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                                 Origin = Anchor.TopRight,
                                 RelativeSizeAxes = Axes.Y,
                                 RelativePositionAxes = Axes.Y,
-                                Width = performance_background_width,
+                                Width = performanceBackgroundWidth,
                                 Height = -0.5f,
                                 Position = new Vector2(0, 1),
                                 Colour = colourProvider.Background4,

From 0a186fe7229380551c663cb828f299bb6634a5b3 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Sun, 2 Feb 2020 22:37:58 +0700
Subject: [PATCH 0141/1142] Avoid calculating constants in load()

---
 .../Profile/Sections/Ranks/DrawableProfileScore.cs         | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
index 930f9b8a43..1905728442 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
@@ -25,6 +25,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
         private const int performance_width = 80;
 
         private const float performance_background_shear = 0.45f;
+        private float performance_background_width = performance_width + (height / 4f * MathF.Tan(performance_background_shear));
 
         protected readonly ScoreInfo Score;
 
@@ -45,8 +46,6 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
         [BackgroundDependencyLoader]
         private void load()
         {
-            float performanceBackgroundWidth = performance_width + (height / 4f * MathF.Tan(performance_background_shear));
-
             AddInternal(new ProfileItemContainer
             {
                 Children = new Drawable[]
@@ -148,7 +147,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                                 Anchor = Anchor.TopRight,
                                 Origin = Anchor.TopRight,
                                 RelativeSizeAxes = Axes.Y,
-                                Width = performanceBackgroundWidth,
+                                Width = performance_background_width,
                                 Height = 0.5f,
                                 Colour = colourProvider.Background4,
                                 Shear = new Vector2(-performance_background_shear, 0),
@@ -160,7 +159,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                                 Origin = Anchor.TopRight,
                                 RelativeSizeAxes = Axes.Y,
                                 RelativePositionAxes = Axes.Y,
-                                Width = performanceBackgroundWidth,
+                                Width = performance_background_width,
                                 Height = -0.5f,
                                 Position = new Vector2(0, 1),
                                 Colour = colourProvider.Background4,

From 28e340c4860b72a5a4ca6a35415a8af8d032d45f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 2 Feb 2020 18:39:39 +0300
Subject: [PATCH 0142/1142] Inherit Container and fade the key flow instead of
 individual children

---
 .../Visual/Gameplay/TestSceneHUDOverlay.cs     | 15 +++++++--------
 osu.Game/Screens/Play/KeyCounterDisplay.cs     | 18 +++++++++++++-----
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index e34e87d8df..11064d0ffd 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -2,11 +2,10 @@
 // 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.Framework.Graphics.Containers;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play;
@@ -31,7 +30,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("showhud is set", () => hudOverlay.ShowHud.Value);
 
             AddAssert("hidetarget is visible", () => hideTarget.IsPresent);
-            AddAssert("key counters are visible", () => hudOverlay.KeyCounter.All(k => k.IsPresent));
+            AddAssert("key counter flow is visible", () => hudOverlay.KeyCounter.KeyFlow.IsPresent);
             AddAssert("pause button is visible", () => hudOverlay.HoldToQuit.IsPresent);
         }
 
@@ -55,8 +54,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddUntilStep("hidetarget is hidden", () => !hideTarget.IsPresent);
             AddAssert("pause button is still visible", () => hudOverlay.HoldToQuit.IsPresent);
 
-            // Key counters should not be affected by this, only the key counter container will be hidden as checked above.
-            AddAssert("key counters not affected", () => hudOverlay.KeyCounter.All(k => k.IsPresent));
+            // Key counter flow container should not be affected by this, only the key counter display will be hidden as checked above.
+            AddAssert("key counter flow not affected", () => hudOverlay.KeyCounter.KeyFlow.IsPresent);
         }
 
         [Test]
@@ -88,11 +87,11 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("set showhud false", () => hudOverlay.ShowHud.Value = false);
             AddUntilStep("hidetarget is hidden", () => !hideTarget.IsPresent);
-            AddAssert("key counters hidden", () => hudOverlay.KeyCounter.All(k => !k.IsPresent));
+            AddAssert("key counters hidden", () => !hudOverlay.KeyCounter.KeyFlow.IsPresent);
 
             AddStep("set showhud true", () => hudOverlay.ShowHud.Value = true);
             AddUntilStep("hidetarget is visible", () => hideTarget.IsPresent);
-            AddAssert("key counters still hidden", () => hudOverlay.KeyCounter.All(k => !k.IsPresent));
+            AddAssert("key counters still hidden", () => !hudOverlay.KeyCounter.KeyFlow.IsPresent);
         }
 
         private void createNew(Action<TestHUDOverlay> action = null)
@@ -126,7 +125,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private class TestKeyCounterDisplay : KeyCounterDisplay
         {
-            public new Bindable<bool> ConfigVisibility => base.ConfigVisibility;
+            public new Container<KeyCounter> KeyFlow => base.KeyFlow;
         }
     }
 }
diff --git a/osu.Game/Screens/Play/KeyCounterDisplay.cs b/osu.Game/Screens/Play/KeyCounterDisplay.cs
index d7b4913d3c..b03f663371 100644
--- a/osu.Game/Screens/Play/KeyCounterDisplay.cs
+++ b/osu.Game/Screens/Play/KeyCounterDisplay.cs
@@ -5,7 +5,6 @@ using System;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
@@ -15,7 +14,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play
 {
-    public class KeyCounterDisplay : FillFlowContainer<KeyCounter>
+    public class KeyCounterDisplay : Container<KeyCounter>
     {
         private const int duration = 100;
         private const double key_fade_time = 80;
@@ -23,10 +22,19 @@ namespace osu.Game.Screens.Play
         public readonly Bindable<bool> Visible = new Bindable<bool>(true);
         protected readonly Bindable<bool> ConfigVisibility = new Bindable<bool>();
 
+        protected readonly FillFlowContainer<KeyCounter> KeyFlow;
+
+        protected override Container<KeyCounter> Content => KeyFlow;
+
         public KeyCounterDisplay()
         {
-            Direction = FillDirection.Horizontal;
             AutoSizeAxes = Axes.Both;
+
+            InternalChild = KeyFlow = new FillFlowContainer<KeyCounter>
+            {
+                Direction = FillDirection.Horizontal,
+                AutoSizeAxes = Axes.Both,
+            };
         }
 
         public override void Add(KeyCounter key)
@@ -102,8 +110,8 @@ namespace osu.Game.Screens.Play
         }
 
         private void updateVisibility() =>
-            // Change visibility of all key counters internally to isolate from showing them by fading in this container.
-            Children.ForEach(k => k.FadeTo(Visible.Value || ConfigVisibility.Value ? 1 : 0, duration));
+            // Isolate changing visibility of the key counters from fading this component.
+            KeyFlow.FadeTo(Visible.Value || alwaysShow.Value ? 1 : 0, duration);
 
         public override bool HandleNonPositionalInput => receptor == null;
         public override bool HandlePositionalInput => receptor == null;

From 0f449d1b9945902bee4913488fec8bfe2a44bc45 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 2 Feb 2020 18:46:59 +0300
Subject: [PATCH 0143/1142] Set config value instead

---
 osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index 11064d0ffd..7ce6153ba5 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -77,11 +77,14 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Test]
         public void TestChangeHUDVisibilityOnHiddenKeyCounter()
         {
+            bool keyCounterVisibleValue = false;
+
             createNew();
+            AddStep("save keycounter visible value", () => keyCounterVisibleValue = config.Get<bool>(OsuSetting.KeyOverlay));
 
             AddStep("set keycounter visible false", () =>
             {
-                hudOverlay.KeyCounter.ConfigVisibility.Value = false;
+                config.Set<bool>(OsuSetting.KeyOverlay, false);
                 hudOverlay.KeyCounter.Visible.Value = false;
             });
 
@@ -92,6 +95,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("set showhud true", () => hudOverlay.ShowHud.Value = true);
             AddUntilStep("hidetarget is visible", () => hideTarget.IsPresent);
             AddAssert("key counters still hidden", () => !hudOverlay.KeyCounter.KeyFlow.IsPresent);
+
+            AddStep("return value", () => config.Set<bool>(OsuSetting.KeyOverlay, keyCounterVisibleValue));
         }
 
         private void createNew(Action<TestHUDOverlay> action = null)
@@ -125,7 +130,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private class TestKeyCounterDisplay : KeyCounterDisplay
         {
-            public new Container<KeyCounter> KeyFlow => base.KeyFlow;
+            public new FillFlowContainer<KeyCounter> KeyFlow => base.KeyFlow;
         }
     }
 }

From 4cdf4b223c1c0141ca7627096386dba16d26655b Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sun, 2 Feb 2020 18:47:12 +0300
Subject: [PATCH 0144/1142] Rename to alwaysShow and add XMLDoc

---
 osu.Game/Screens/Play/KeyCounterDisplay.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/KeyCounterDisplay.cs b/osu.Game/Screens/Play/KeyCounterDisplay.cs
index b03f663371..b5d8c99e67 100644
--- a/osu.Game/Screens/Play/KeyCounterDisplay.cs
+++ b/osu.Game/Screens/Play/KeyCounterDisplay.cs
@@ -19,8 +19,13 @@ namespace osu.Game.Screens.Play
         private const int duration = 100;
         private const double key_fade_time = 80;
 
+        /// <summary>
+        /// Whether to always show key counter regardless of <see cref="Visible"/>.
+        /// This is bound to <see cref="OsuSetting.KeyOverlay"/> configuration setting bindable.
+        /// </summary>
+        private readonly Bindable<bool> alwaysShow = new Bindable<bool>();
+
         public readonly Bindable<bool> Visible = new Bindable<bool>(true);
-        protected readonly Bindable<bool> ConfigVisibility = new Bindable<bool>();
 
         protected readonly FillFlowContainer<KeyCounter> KeyFlow;
 
@@ -51,7 +56,7 @@ namespace osu.Game.Screens.Play
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            config.BindWith(OsuSetting.KeyOverlay, ConfigVisibility);
+            config.BindWith(OsuSetting.KeyOverlay, alwaysShow);
         }
 
         protected override void LoadComplete()
@@ -59,7 +64,7 @@ namespace osu.Game.Screens.Play
             base.LoadComplete();
 
             Visible.BindValueChanged(_ => updateVisibility());
-            ConfigVisibility.BindValueChanged(_ => updateVisibility(), true);
+            alwaysShow.BindValueChanged(_ => updateVisibility(), true);
         }
 
         private bool isCounting = true;

From 1f53778d623244d17ac616943be992da7710f532 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Sun, 2 Feb 2020 16:59:17 +0100
Subject: [PATCH 0145/1142] Add explanation to comment

---
 osu.Game/Overlays/Profile/Header/Components/RankGraph.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
index 83c6d80dae..ffc060b3f1 100644
--- a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
@@ -270,7 +270,8 @@ namespace osu.Game.Overlays.Profile.Header.Components
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
             {
-                // To match osu-web, background and text should both be coloured using OverlayColourProvider
+                // Temporary colour since it's currently impossible to change it without bugs (see https://github.com/ppy/osu-framework/issues/3231)
+                // If above is fixed, this should use OverlayColourProvider
                 background.Colour = colours.Gray1;
             }
 

From 7e162d9798d7e88fc27cdebe04bcdcc7dbdbd719 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Sun, 2 Feb 2020 17:03:41 +0100
Subject: [PATCH 0146/1142] Fix failing test

---
 osu.Game.Tests/Visual/Online/TestSceneRankGraph.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankGraph.cs b/osu.Game.Tests/Visual/Online/TestSceneRankGraph.cs
index c70cc4ae4e..8f7e7498a9 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankGraph.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankGraph.cs
@@ -4,11 +4,13 @@
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
+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.UserInterface;
+using osu.Game.Overlays;
 using osu.Game.Overlays.Profile.Header.Components;
 using osu.Game.Users;
 using osuTK;
@@ -24,6 +26,9 @@ namespace osu.Game.Tests.Visual.Online
             typeof(LineGraph)
         };
 
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Pink);
+
         public TestSceneRankGraph()
         {
             RankGraph graph;

From 878489651c456b6747960b6e724c7305400f71b3 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Sun, 2 Feb 2020 23:04:11 +0700
Subject: [PATCH 0147/1142] Make performance_background_width readonly

---
 .../Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
index 1905728442..f55d469e22 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
         private const int performance_width = 80;
 
         private const float performance_background_shear = 0.45f;
-        private float performance_background_width = performance_width + (height / 4f * MathF.Tan(performance_background_shear));
+        private readonly float performance_background_width = performance_width + (height / 4f * MathF.Tan(performance_background_shear));
 
         protected readonly ScoreInfo Score;
 

From 030d02594cc955a19fb1d2a4c2ccb3b8f8243d99 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Sun, 2 Feb 2020 17:10:11 +0100
Subject: [PATCH 0148/1142] Allow non-italic DrawableDate

---
 osu.Game/Graphics/DrawableDate.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/DrawableDate.cs b/osu.Game/Graphics/DrawableDate.cs
index 925c7981e0..0224c77ee8 100644
--- a/osu.Game/Graphics/DrawableDate.cs
+++ b/osu.Game/Graphics/DrawableDate.cs
@@ -29,9 +29,9 @@ namespace osu.Game.Graphics
             }
         }
 
-        public DrawableDate(DateTimeOffset date, float textSize = OsuFont.DEFAULT_FONT_SIZE)
+        public DrawableDate(DateTimeOffset date, float textSize = OsuFont.DEFAULT_FONT_SIZE, bool italic = true)
         {
-            Font = OsuFont.GetFont(weight: FontWeight.Regular, size: textSize, italics: true);
+            Font = OsuFont.GetFont(weight: FontWeight.Regular, size: textSize, italics: italic);
             Date = date;
         }
 

From d15942d1270a803947bb4dcf0811560d32efa71a Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Sun, 2 Feb 2020 17:21:22 +0100
Subject: [PATCH 0149/1142] Revert containers merge and rework
 bottomLinkContainer visibility logic

---
 .../Profile/Header/BottomHeaderContainer.cs   | 101 ++++++++++--------
 1 file changed, 57 insertions(+), 44 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
index bca72666de..065bef8329 100644
--- a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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;
@@ -22,7 +22,8 @@ namespace osu.Game.Overlays.Profile.Header
     {
         public readonly Bindable<User> User = new Bindable<User>();
 
-        private LinkFlowContainer linkContainer;
+        private LinkFlowContainer topLinkContainer;
+        private LinkFlowContainer bottomLinkContainer;
 
         private Color4 iconColour;
 
@@ -43,12 +44,26 @@ namespace osu.Game.Overlays.Profile.Header
                     RelativeSizeAxes = Axes.Both,
                     Colour = colourProvider.Background4
                 },
-                linkContainer = new LinkFlowContainer(text => text.Font = text.Font.With(size: 12))
+                new FillFlowContainer
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Vertical,
                     Padding = new MarginPadding { Horizontal = UserProfileOverlay.CONTENT_X_MARGIN, Vertical = 10 },
                     Spacing = new Vector2(0, 10),
+                    Children = new Drawable[]
+                    {
+                        topLinkContainer = new LinkFlowContainer(text => text.Font = text.Font.With(size: 12))
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                        },
+                        bottomLinkContainer = new LinkFlowContainer(text => text.Font = text.Font.With(size: 12))
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                        }
+                    }
                 }
             };
 
@@ -57,43 +72,44 @@ namespace osu.Game.Overlays.Profile.Header
 
         private void updateDisplay(User user)
         {
-            linkContainer.Clear();
+            topLinkContainer.Clear();
+            bottomLinkContainer.Clear();
 
             if (user == null) return;
 
             if (user.JoinDate.ToUniversalTime().Year < 2008)
-                linkContainer.AddText("Here since the beginning");
+                topLinkContainer.AddText("Here since the beginning");
             else
             {
-                linkContainer.AddText("Joined ");
-                linkContainer.AddText(new DrawableDate(user.JoinDate), embolden);
+                topLinkContainer.AddText("Joined ");
+                topLinkContainer.AddText(new DrawableDate(user.JoinDate), embolden);
             }
 
-            addSpacer(linkContainer);
+            addSpacer(topLinkContainer);
 
             if (user.IsOnline)
             {
-                linkContainer.AddText("Currently online");
-                addSpacer(linkContainer);
+                topLinkContainer.AddText("Currently online");
+                addSpacer(topLinkContainer);
             }
             else if (user.LastVisit.HasValue)
             {
-                linkContainer.AddText("Last seen ");
-                linkContainer.AddText(new DrawableDate(user.LastVisit.Value), embolden);
+                topLinkContainer.AddText("Last seen ");
+                topLinkContainer.AddText(new DrawableDate(user.LastVisit.Value), embolden);
 
-                addSpacer(linkContainer);
+                addSpacer(topLinkContainer);
             }
 
             if (user.PlayStyles?.Length > 0)
             {
-                linkContainer.AddText("Plays with ");
-                linkContainer.AddText(string.Join(", ", user.PlayStyles.Select(style => style.GetDescription())), embolden);
+                topLinkContainer.AddText("Plays with ");
+                topLinkContainer.AddText(string.Join(", ", user.PlayStyles.Select(style => style.GetDescription())), embolden);
 
-                addSpacer(linkContainer);
+                addSpacer(topLinkContainer);
             }
 
-            linkContainer.AddText("Contributed ");
-            linkContainer.AddLink($@"{user.PostCount:#,##0} forum posts", $"https://osu.ppy.sh/users/{user.Id}/posts", creationParameters: embolden);
+            topLinkContainer.AddText("Contributed ");
+            topLinkContainer.AddLink($@"{user.PostCount:#,##0} forum posts", $"https://osu.ppy.sh/users/{user.Id}/posts", creationParameters: embolden);
 
             string websiteWithoutProtocol = user.Website;
 
@@ -106,51 +122,48 @@ namespace osu.Game.Overlays.Profile.Header
                 }
             }
 
-            requireNewLineOnAddInfo = true;
-
-            tryAddInfo(FontAwesome.Solid.MapMarker, user.Location);
-            tryAddInfo(OsuIcon.Heart, user.Interests);
-            tryAddInfo(FontAwesome.Solid.Suitcase, user.Occupation);
-
-            requireNewLineOnAddInfo = true;
+            bool anyInfoAdded = false;
 
+            anyInfoAdded |= tryAddInfo(FontAwesome.Solid.MapMarker, user.Location);
+            anyInfoAdded |= tryAddInfo(OsuIcon.Heart, user.Interests);
+            anyInfoAdded |= tryAddInfo(FontAwesome.Solid.Suitcase, user.Occupation);
+            bottomLinkContainer.NewLine();
             if (!string.IsNullOrEmpty(user.Twitter))
-                tryAddInfo(FontAwesome.Brands.Twitter, "@" + user.Twitter, $@"https://twitter.com/{user.Twitter}");
-            tryAddInfo(FontAwesome.Brands.Discord, user.Discord);
-            tryAddInfo(FontAwesome.Brands.Skype, user.Skype, @"skype:" + user.Skype + @"?chat");
-            tryAddInfo(FontAwesome.Brands.Lastfm, user.Lastfm, $@"https://last.fm/users/{user.Lastfm}");
-            tryAddInfo(FontAwesome.Solid.Link, websiteWithoutProtocol, user.Website);
+                anyInfoAdded |= tryAddInfo(FontAwesome.Brands.Twitter, "@" + user.Twitter, $@"https://twitter.com/{user.Twitter}");
+            anyInfoAdded |= tryAddInfo(FontAwesome.Brands.Discord, user.Discord);
+            anyInfoAdded |= tryAddInfo(FontAwesome.Brands.Skype, user.Skype, @"skype:" + user.Skype + @"?chat");
+            anyInfoAdded |= tryAddInfo(FontAwesome.Brands.Lastfm, user.Lastfm, $@"https://last.fm/users/{user.Lastfm}");
+            anyInfoAdded |= tryAddInfo(FontAwesome.Solid.Link, websiteWithoutProtocol, user.Website);
+
+            // If no information was added to the bottomLinkContainer, hide it to avoid unwanted padding
+            if (anyInfoAdded)
+                bottomLinkContainer.Show();
+            else
+                bottomLinkContainer.Hide();
         }
 
         private void addSpacer(OsuTextFlowContainer textFlow) => textFlow.AddArbitraryDrawable(new Container { Width = 15 });
 
-        private bool requireNewLineOnAddInfo;
-
-        private void tryAddInfo(IconUsage icon, string content, string link = null)
+        private bool tryAddInfo(IconUsage icon, string content, string link = null)
         {
-            if (string.IsNullOrEmpty(content)) return;
-
-            if (requireNewLineOnAddInfo)
-            {
-                linkContainer.NewLine();
-                requireNewLineOnAddInfo = false;
-            }
+            if (string.IsNullOrEmpty(content)) return false;
 
             // newlines could be contained in API returned user content.
             content = content.Replace("\n", " ");
 
-            linkContainer.AddIcon(icon, text =>
+            bottomLinkContainer.AddIcon(icon, text =>
             {
                 text.Font = text.Font.With(size: 10);
                 text.Colour = iconColour;
             });
 
             if (link != null)
-                linkContainer.AddLink(" " + content, link, creationParameters: embolden);
+                bottomLinkContainer.AddLink(" " + content, link, creationParameters: embolden);
             else
-                linkContainer.AddText(" " + content, embolden);
+                bottomLinkContainer.AddText(" " + content, embolden);
 
-            addSpacer(linkContainer);
+            addSpacer(bottomLinkContainer);
+            return true;
         }
 
         private void embolden(SpriteText text) => text.Font = text.Font.With(weight: FontWeight.Bold);

From 3cc1b811ef21a648eeda60c51aa751fdc6db3431 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Sun, 2 Feb 2020 17:22:48 +0100
Subject: [PATCH 0150/1142] Make dates non-italic to match osu-web

---
 osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
index 065bef8329..3dcd65d64e 100644
--- a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Overlays.Profile.Header
             else
             {
                 topLinkContainer.AddText("Joined ");
-                topLinkContainer.AddText(new DrawableDate(user.JoinDate), embolden);
+                topLinkContainer.AddText(new DrawableDate(user.JoinDate, italic: false), embolden);
             }
 
             addSpacer(topLinkContainer);
@@ -95,7 +95,7 @@ namespace osu.Game.Overlays.Profile.Header
             else if (user.LastVisit.HasValue)
             {
                 topLinkContainer.AddText("Last seen ");
-                topLinkContainer.AddText(new DrawableDate(user.LastVisit.Value), embolden);
+                topLinkContainer.AddText(new DrawableDate(user.LastVisit.Value, italic: false), embolden);
 
                 addSpacer(topLinkContainer);
             }

From 72107c27c99cb568d8457dfe01f3ce2d271ffbc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 2 Feb 2020 17:39:58 +0100
Subject: [PATCH 0151/1142] Only add newline if necessary

---
 osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
index 3dcd65d64e..4643ca709b 100644
--- a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
@@ -127,7 +127,10 @@ namespace osu.Game.Overlays.Profile.Header
             anyInfoAdded |= tryAddInfo(FontAwesome.Solid.MapMarker, user.Location);
             anyInfoAdded |= tryAddInfo(OsuIcon.Heart, user.Interests);
             anyInfoAdded |= tryAddInfo(FontAwesome.Solid.Suitcase, user.Occupation);
-            bottomLinkContainer.NewLine();
+
+            if (anyInfoAdded)
+                bottomLinkContainer.NewLine();
+
             if (!string.IsNullOrEmpty(user.Twitter))
                 anyInfoAdded |= tryAddInfo(FontAwesome.Brands.Twitter, "@" + user.Twitter, $@"https://twitter.com/{user.Twitter}");
             anyInfoAdded |= tryAddInfo(FontAwesome.Brands.Discord, user.Discord);

From c479d0efa48be274e36ffa55359bfff6716ab30d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 2 Feb 2020 17:41:42 +0100
Subject: [PATCH 0152/1142] Simplify show/hide logic

---
 osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
index 4643ca709b..c27b5f4b4a 100644
--- a/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
@@ -139,10 +139,7 @@ namespace osu.Game.Overlays.Profile.Header
             anyInfoAdded |= tryAddInfo(FontAwesome.Solid.Link, websiteWithoutProtocol, user.Website);
 
             // If no information was added to the bottomLinkContainer, hide it to avoid unwanted padding
-            if (anyInfoAdded)
-                bottomLinkContainer.Show();
-            else
-                bottomLinkContainer.Hide();
+            bottomLinkContainer.Alpha = anyInfoAdded ? 1 : 0;
         }
 
         private void addSpacer(OsuTextFlowContainer textFlow) => textFlow.AddArbitraryDrawable(new Container { Width = 15 });

From fd7fccbb62c50a7201d88218c4375f1cd984a648 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Sun, 2 Feb 2020 19:16:54 +0100
Subject: [PATCH 0153/1142] Add tests

---
 .../TestSceneSliderInput.cs                   | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index b6fc9821a4..675c9fd0e7 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -44,6 +44,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         private const double time_during_slide_2 = 3000;
         private const double time_during_slide_3 = 3500;
         private const double time_during_slide_4 = 3800;
+        private const double time_slider_end = 4000;
 
         private List<JudgementResult> judgementResults;
         private bool allJudgedFired;
@@ -284,6 +285,47 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert("Tracking acquired", assertMidSliderJudgements);
         }
 
+
+        /// <summary>
+        /// Scenario:
+        /// - Press a key on the slider head
+        /// - While holding the key, move cursor close to the edge of tracking area
+        /// - Keep the cursor on the edge of tracking area until the slider ends
+        /// Expected Result:
+        /// A passing test case will have the slider track the cursor throughout the whole test.
+        /// </summary>
+        [Test]
+        public void TestTrackingAreaEdge()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton }, Time = time_slider_start },
+                new OsuReplayFrame { Position = new Vector2(0, OsuHitObject.OBJECT_RADIUS * 1.199f), Actions = { OsuAction.LeftButton }, Time = time_slider_start + 100 },
+                new OsuReplayFrame { Position = new Vector2(25, OsuHitObject.OBJECT_RADIUS * 1.199f), Actions = { OsuAction.LeftButton }, Time = time_slider_end },
+            });
+            AddAssert("Tracking kept", assertGreatJudge);
+        }
+
+        /// <summary>
+        /// Scenario:
+        /// - Press a key on the slider head
+        /// - While holding the key, move cursor just outside the tracking area
+        /// - Keep the cursor just outside the tracking area until the slider ends
+        /// Expected Result:
+        /// A passing test case will have the slider drop the tracking on frame 2.
+        /// </summary>
+        [Test]
+        public void TestTrackingAreaOutsideEdge()
+        {
+            performTest(new List<ReplayFrame>
+            {
+                new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton }, Time = time_slider_start },
+                new OsuReplayFrame { Position = new Vector2(0, OsuHitObject.OBJECT_RADIUS * 1.2f), Actions = { OsuAction.LeftButton }, Time = time_slider_start + 100 },
+                new OsuReplayFrame { Position = new Vector2(25, OsuHitObject.OBJECT_RADIUS * 1.2f), Actions = { OsuAction.LeftButton }, Time = time_slider_end },
+            });
+            AddAssert("Tracking dropped", assertMidSliderJudgementFail);
+        }
+
         private bool assertGreatJudge() => judgementResults.Last().Type == HitResult.Great;
 
         private bool assertHeadMissTailTracked() => judgementResults[^2].Type == HitResult.Great && judgementResults.First().Type == HitResult.Miss;

From c7f1d4a8a0874b6e59b58bbaccb10456966320b0 Mon Sep 17 00:00:00 2001
From: Tree <thewildtree@outlook.com>
Date: Sun, 2 Feb 2020 19:29:26 +0100
Subject: [PATCH 0154/1142] Remove unnecessary newline

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 675c9fd0e7..38dcc3b23e 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -285,7 +285,6 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert("Tracking acquired", assertMidSliderJudgements);
         }
 
-
         /// <summary>
         /// Scenario:
         /// - Press a key on the slider head

From 162a3713a33bbec70b4b4c3f260cf9167dc881ae Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Sun, 2 Feb 2020 21:25:35 +0100
Subject: [PATCH 0155/1142] Modify tests to avoid fails in CLI testing

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 675c9fd0e7..7dc81059eb 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -300,8 +300,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             performTest(new List<ReplayFrame>
             {
                 new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton }, Time = time_slider_start },
-                new OsuReplayFrame { Position = new Vector2(0, OsuHitObject.OBJECT_RADIUS * 1.199f), Actions = { OsuAction.LeftButton }, Time = time_slider_start + 100 },
-                new OsuReplayFrame { Position = new Vector2(25, OsuHitObject.OBJECT_RADIUS * 1.199f), Actions = { OsuAction.LeftButton }, Time = time_slider_end },
+                new OsuReplayFrame { Position = new Vector2(0, OsuHitObject.OBJECT_RADIUS * 1.19f), Actions = { OsuAction.LeftButton }, Time = time_slider_start + 100 },
+                new OsuReplayFrame { Position = new Vector2(25, OsuHitObject.OBJECT_RADIUS * 1.19f), Actions = { OsuAction.LeftButton }, Time = time_slider_end },
             });
             AddAssert("Tracking kept", assertGreatJudge);
         }
@@ -320,8 +320,8 @@ namespace osu.Game.Rulesets.Osu.Tests
             performTest(new List<ReplayFrame>
             {
                 new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton }, Time = time_slider_start },
-                new OsuReplayFrame { Position = new Vector2(0, OsuHitObject.OBJECT_RADIUS * 1.2f), Actions = { OsuAction.LeftButton }, Time = time_slider_start + 100 },
-                new OsuReplayFrame { Position = new Vector2(25, OsuHitObject.OBJECT_RADIUS * 1.2f), Actions = { OsuAction.LeftButton }, Time = time_slider_end },
+                new OsuReplayFrame { Position = new Vector2(0, OsuHitObject.OBJECT_RADIUS * 1.21f), Actions = { OsuAction.LeftButton }, Time = time_slider_start + 100 },
+                new OsuReplayFrame { Position = new Vector2(25, OsuHitObject.OBJECT_RADIUS * 1.21f), Actions = { OsuAction.LeftButton }, Time = time_slider_end },
             });
             AddAssert("Tracking dropped", assertMidSliderJudgementFail);
         }

From edb4c0f7528dfee3d20290166d82ca375626c550 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 Feb 2020 10:24:53 +0900
Subject: [PATCH 0156/1142] Add blank lines for conformity

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 4b18b961ad..eaa714d68a 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -302,6 +302,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Position = new Vector2(0, OsuHitObject.OBJECT_RADIUS * 1.19f), Actions = { OsuAction.LeftButton }, Time = time_slider_start + 100 },
                 new OsuReplayFrame { Position = new Vector2(25, OsuHitObject.OBJECT_RADIUS * 1.19f), Actions = { OsuAction.LeftButton }, Time = time_slider_end },
             });
+
             AddAssert("Tracking kept", assertGreatJudge);
         }
 
@@ -322,6 +323,7 @@ namespace osu.Game.Rulesets.Osu.Tests
                 new OsuReplayFrame { Position = new Vector2(0, OsuHitObject.OBJECT_RADIUS * 1.21f), Actions = { OsuAction.LeftButton }, Time = time_slider_start + 100 },
                 new OsuReplayFrame { Position = new Vector2(25, OsuHitObject.OBJECT_RADIUS * 1.21f), Actions = { OsuAction.LeftButton }, Time = time_slider_end },
             });
+
             AddAssert("Tracking dropped", assertMidSliderJudgementFail);
         }
 

From ff17c76a20180b5789f03b5b217b11aa315a8b42 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Mon, 3 Feb 2020 08:26:12 +0700
Subject: [PATCH 0157/1142] Fix modifiers for performance_background_width

---
 .../Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
index f55d469e22..c9f787bb26 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
         private const int performance_width = 80;
 
         private const float performance_background_shear = 0.45f;
-        private readonly float performance_background_width = performance_width + (height / 4f * MathF.Tan(performance_background_shear));
+        private static readonly float performance_background_width = performance_width + (height / 4f * MathF.Tan(performance_background_shear));
 
         protected readonly ScoreInfo Score;
 

From 2253ed4c0d13544ab4ef802c666acfd6a004bb87 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 Feb 2020 10:29:40 +0900
Subject: [PATCH 0158/1142] Move path length to a constant

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index eaa714d68a..2ad2c544e5 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -300,7 +300,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton }, Time = time_slider_start },
                 new OsuReplayFrame { Position = new Vector2(0, OsuHitObject.OBJECT_RADIUS * 1.19f), Actions = { OsuAction.LeftButton }, Time = time_slider_start + 100 },
-                new OsuReplayFrame { Position = new Vector2(25, OsuHitObject.OBJECT_RADIUS * 1.19f), Actions = { OsuAction.LeftButton }, Time = time_slider_end },
+                new OsuReplayFrame { Position = new Vector2(slider_path_length, OsuHitObject.OBJECT_RADIUS * 1.19f), Actions = { OsuAction.LeftButton }, Time = time_slider_end },
             });
 
             AddAssert("Tracking kept", assertGreatJudge);
@@ -321,7 +321,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton }, Time = time_slider_start },
                 new OsuReplayFrame { Position = new Vector2(0, OsuHitObject.OBJECT_RADIUS * 1.21f), Actions = { OsuAction.LeftButton }, Time = time_slider_start + 100 },
-                new OsuReplayFrame { Position = new Vector2(25, OsuHitObject.OBJECT_RADIUS * 1.21f), Actions = { OsuAction.LeftButton }, Time = time_slider_end },
+                new OsuReplayFrame { Position = new Vector2(slider_path_length, OsuHitObject.OBJECT_RADIUS * 1.21f), Actions = { OsuAction.LeftButton }, Time = time_slider_end },
             });
 
             AddAssert("Tracking dropped", assertMidSliderJudgementFail);
@@ -337,6 +337,8 @@ namespace osu.Game.Rulesets.Osu.Tests
 
         private ScoreAccessibleReplayPlayer currentPlayer;
 
+        private const float slider_path_length = 25;
+
         private void performTest(List<ReplayFrame> frames)
         {
             AddStep("load player", () =>
@@ -352,8 +354,8 @@ namespace osu.Game.Rulesets.Osu.Tests
                             Path = new SliderPath(PathType.PerfectCurve, new[]
                             {
                                 Vector2.Zero,
-                                new Vector2(25, 0),
-                            }, 25),
+                                new Vector2(slider_path_length, 0),
+                            }, slider_path_length),
                         }
                     },
                     BeatmapInfo =

From 9426f786e91adefae97c64397ed9356fc2125d8c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 Feb 2020 10:33:56 +0900
Subject: [PATCH 0159/1142] Use slightly closer values

---
 osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 2ad2c544e5..33d79d9cbc 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -300,7 +300,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton }, Time = time_slider_start },
                 new OsuReplayFrame { Position = new Vector2(0, OsuHitObject.OBJECT_RADIUS * 1.19f), Actions = { OsuAction.LeftButton }, Time = time_slider_start + 100 },
-                new OsuReplayFrame { Position = new Vector2(slider_path_length, OsuHitObject.OBJECT_RADIUS * 1.19f), Actions = { OsuAction.LeftButton }, Time = time_slider_end },
+                new OsuReplayFrame { Position = new Vector2(slider_path_length, OsuHitObject.OBJECT_RADIUS * 1.199f), Actions = { OsuAction.LeftButton }, Time = time_slider_end },
             });
 
             AddAssert("Tracking kept", assertGreatJudge);
@@ -321,7 +321,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             {
                 new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton }, Time = time_slider_start },
                 new OsuReplayFrame { Position = new Vector2(0, OsuHitObject.OBJECT_RADIUS * 1.21f), Actions = { OsuAction.LeftButton }, Time = time_slider_start + 100 },
-                new OsuReplayFrame { Position = new Vector2(slider_path_length, OsuHitObject.OBJECT_RADIUS * 1.21f), Actions = { OsuAction.LeftButton }, Time = time_slider_end },
+                new OsuReplayFrame { Position = new Vector2(slider_path_length, OsuHitObject.OBJECT_RADIUS * 1.201f), Actions = { OsuAction.LeftButton }, Time = time_slider_end },
             });
 
             AddAssert("Tracking dropped", assertMidSliderJudgementFail);

From 84fcf45aaead75d4f43efe54b890760ed50c551a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 Feb 2020 11:55:14 +0900
Subject: [PATCH 0160/1142] Make slider tracking match what is on screen

---
 .../TestSceneSliderInput.cs                        |  4 ++--
 .../Objects/Drawables/Pieces/SliderBall.cs         | 14 ++------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
index 33d79d9cbc..94df239267 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSliderInput.cs
@@ -299,7 +299,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             performTest(new List<ReplayFrame>
             {
                 new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton }, Time = time_slider_start },
-                new OsuReplayFrame { Position = new Vector2(0, OsuHitObject.OBJECT_RADIUS * 1.19f), Actions = { OsuAction.LeftButton }, Time = time_slider_start + 100 },
+                new OsuReplayFrame { Position = new Vector2(0, OsuHitObject.OBJECT_RADIUS * 1.19f), Actions = { OsuAction.LeftButton }, Time = time_slider_start + 250 },
                 new OsuReplayFrame { Position = new Vector2(slider_path_length, OsuHitObject.OBJECT_RADIUS * 1.199f), Actions = { OsuAction.LeftButton }, Time = time_slider_end },
             });
 
@@ -320,7 +320,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             performTest(new List<ReplayFrame>
             {
                 new OsuReplayFrame { Position = new Vector2(0, 0), Actions = { OsuAction.LeftButton }, Time = time_slider_start },
-                new OsuReplayFrame { Position = new Vector2(0, OsuHitObject.OBJECT_RADIUS * 1.21f), Actions = { OsuAction.LeftButton }, Time = time_slider_start + 100 },
+                new OsuReplayFrame { Position = new Vector2(0, OsuHitObject.OBJECT_RADIUS * 1.21f), Actions = { OsuAction.LeftButton }, Time = time_slider_start + 250 },
                 new OsuReplayFrame { Position = new Vector2(slider_path_length, OsuHitObject.OBJECT_RADIUS * 1.201f), Actions = { OsuAction.LeftButton }, Time = time_slider_end },
             });
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
index b89b0cafc4..0dc5c9b4a0 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
@@ -24,7 +24,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
         private readonly Slider slider;
         private readonly Drawable followCircle;
-        private readonly Drawable trackingArea;
         private readonly DrawableSlider drawableSlider;
 
         public SliderBall(Slider slider, DrawableSlider drawableSlider = null)
@@ -39,13 +38,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
             Children = new[]
             {
-                // This is separate from the visible followcircle to ensure consistent internal tracking area (needed to match osu-stable)
-                trackingArea = new CircularContainer
-                {
-                    Origin = Anchor.Centre,
-                    Anchor = Anchor.Centre,
-                    RelativeSizeAxes = Axes.Both
-                },
                 followCircle = new FollowCircleContainer
                 {
                     Origin = Anchor.Centre,
@@ -103,9 +95,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
                 tracking = value;
 
-                // Tracking area is bigger than the visible followcircle and scales instantly to match osu-stable
-                trackingArea.ScaleTo(tracking ? 2.4f : 1f);
-                followCircle.ScaleTo(tracking ? 2f : 1f, 300, Easing.OutQuint);
+                followCircle.ScaleTo(tracking ? 2.4f : 1f, 300, Easing.OutQuint);
                 followCircle.FadeTo(tracking ? 1f : 0, 300, Easing.OutQuint);
             }
         }
@@ -159,7 +149,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                 // in valid time range
                 Time.Current >= slider.StartTime && Time.Current < slider.EndTime &&
                 // in valid position range
-                lastScreenSpaceMousePosition.HasValue && trackingArea.ReceivePositionalInputAt(lastScreenSpaceMousePosition.Value) &&
+                lastScreenSpaceMousePosition.HasValue && followCircle.ReceivePositionalInputAt(lastScreenSpaceMousePosition.Value) &&
                 // valid action
                 (actions?.Any(isValidTrackingAction) ?? false);
         }

From 9680c0941fa1b751b1dd0a4ab48235e6b15081ba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 Feb 2020 12:46:11 +0900
Subject: [PATCH 0161/1142] Move private helper methods to botom of file

---
 .../Sections/Recent/DrawableRecentActivity.cs | 44 +++++++++----------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs b/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
index f538833eb0..8782e82642 100644
--- a/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
+++ b/osu.Game/Overlays/Profile/Sections/Recent/DrawableRecentActivity.cs
@@ -122,30 +122,6 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
             }
         }
 
-        private string getRulesetName()
-        {
-            var shortName = activity.Mode;
-
-            return rulesets.AvailableRulesets.FirstOrDefault(r => r.ShortName == shortName)?.Name ?? shortName;
-        }
-
-        private string getLinkArgument(string url) => MessageFormatter.GetLinkDetails($"{api.Endpoint}{url}").Argument;
-
-        private FontUsage getLinkFont(FontWeight fontWeight = FontWeight.Regular)
-            => OsuFont.GetFont(size: font_size, weight: fontWeight, italics: true);
-
-        private void addUserLink()
-            => content.AddLink(activity.User?.Username, LinkAction.OpenUserProfile, getLinkArgument(activity.User?.Url), creationParameters: t => t.Font = getLinkFont(FontWeight.Bold));
-
-        private void addBeatmapLink()
-            => content.AddLink(activity.Beatmap?.Title, LinkAction.OpenBeatmap, getLinkArgument(activity.Beatmap?.Url), creationParameters: t => t.Font = getLinkFont());
-
-        private void addBeatmapsetLink()
-            => content.AddLink(activity.Beatmapset?.Title, LinkAction.OpenBeatmapSet, getLinkArgument(activity.Beatmapset?.Url), creationParameters: t => t.Font = getLinkFont());
-
-        private void addText(string text)
-            => content.AddText(text, t => t.Font = OsuFont.GetFont(size: font_size, weight: FontWeight.SemiBold));
-
         private void createMessage()
         {
             switch (activity.Type)
@@ -227,5 +203,25 @@ namespace osu.Game.Overlays.Profile.Sections.Recent
                     break;
             }
         }
+
+        private string getRulesetName() =>
+            rulesets.AvailableRulesets.FirstOrDefault(r => r.ShortName == activity.Mode)?.Name ?? activity.Mode;
+
+        private void addUserLink()
+            => content.AddLink(activity.User?.Username, LinkAction.OpenUserProfile, getLinkArgument(activity.User?.Url), creationParameters: t => t.Font = getLinkFont(FontWeight.Bold));
+
+        private void addBeatmapLink()
+            => content.AddLink(activity.Beatmap?.Title, LinkAction.OpenBeatmap, getLinkArgument(activity.Beatmap?.Url), creationParameters: t => t.Font = getLinkFont());
+
+        private void addBeatmapsetLink()
+            => content.AddLink(activity.Beatmapset?.Title, LinkAction.OpenBeatmapSet, getLinkArgument(activity.Beatmapset?.Url), creationParameters: t => t.Font = getLinkFont());
+
+        private string getLinkArgument(string url) => MessageFormatter.GetLinkDetails($"{api.Endpoint}{url}").Argument;
+
+        private FontUsage getLinkFont(FontWeight fontWeight = FontWeight.Regular)
+            => OsuFont.GetFont(size: font_size, weight: fontWeight, italics: true);
+
+        private void addText(string text)
+            => content.AddText(text, t => t.Font = OsuFont.GetFont(size: font_size, weight: FontWeight.SemiBold));
     }
 }

From d9d8712360b3093c76bf0cb6f7f1f3922de45578 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 Feb 2020 15:13:21 +0900
Subject: [PATCH 0162/1142] Refactor class layout for readability

---
 osu.Game/Overlays/OverlayRulesetTabItem.cs | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/OverlayRulesetTabItem.cs b/osu.Game/Overlays/OverlayRulesetTabItem.cs
index 5b53d9d1fa..f8a9d14f62 100644
--- a/osu.Game/Overlays/OverlayRulesetTabItem.cs
+++ b/osu.Game/Overlays/OverlayRulesetTabItem.cs
@@ -17,11 +17,6 @@ namespace osu.Game.Overlays
 {
     public class OverlayRulesetTabItem : TabItem<RulesetInfo>
     {
-        protected readonly OsuSpriteText Text;
-        private readonly FillFlowContainer content;
-
-        protected override Container<Drawable> Content => content;
-
         private Color4 accentColour;
 
         protected virtual Color4 AccentColour
@@ -30,13 +25,17 @@ namespace osu.Game.Overlays
             set
             {
                 accentColour = value;
-                Text.FadeColour(value, 120, Easing.OutQuint);
+                text.FadeColour(value, 120, Easing.OutQuint);
             }
         }
 
+        protected override Container<Drawable> Content { get; }
+
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; }
 
+        private readonly OsuSpriteText text;
+
         public OverlayRulesetTabItem(RulesetInfo value)
             : base(value)
         {
@@ -44,12 +43,12 @@ namespace osu.Game.Overlays
 
             AddRangeInternal(new Drawable[]
             {
-                content = new FillFlowContainer
+                Content = new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
                     Direction = FillDirection.Horizontal,
                     Spacing = new Vector2(3, 0),
-                    Child = Text = new OsuSpriteText
+                    Child = text = new OsuSpriteText
                     {
                         Origin = Anchor.Centre,
                         Anchor = Anchor.Centre,
@@ -87,7 +86,7 @@ namespace osu.Game.Overlays
 
         private void updateState()
         {
-            Text.Font = Text.Font.With(weight: Active.Value ? FontWeight.Bold : FontWeight.Medium);
+            text.Font = text.Font.With(weight: Active.Value ? FontWeight.Bold : FontWeight.Medium);
             AccentColour = IsHovered || Active.Value ? Color4.White : colourProvider.Highlight1;
         }
     }

From 9183c78319bf3629d67e8c0346e0e5640ca83219 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 Feb 2020 16:04:32 +0900
Subject: [PATCH 0163/1142] Fix crash on exiting song select with ctrl-enter
 autoplay

---
 .../SongSelect/TestScenePlaySongSelect.cs     | 27 ++++++++++++++++++-
 osu.Game/Screens/Select/PlaySongSelect.cs     |  4 +--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index c01dee2959..80192b9ebc 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -23,6 +23,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Taiko;
+using osu.Game.Screens.Play;
 using osu.Game.Screens.Select;
 using osu.Game.Screens.Select.Carousel;
 using osu.Game.Screens.Select.Filter;
@@ -77,7 +78,6 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private OsuConfigManager config;
 
-        [SetUpSteps]
         public override void SetUpSteps()
         {
             base.SetUpSteps();
@@ -426,6 +426,31 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("start not requested", () => !startRequested);
         }
 
+        [Test]
+        public void TestAutoplayViaCtrlEnter()
+        {
+            addRulesetImportStep(0);
+
+            createSongSelect();
+
+            AddStep("press ctrl+enter", () =>
+            {
+                InputManager.PressKey(Key.ControlLeft);
+                InputManager.PressKey(Key.Enter);
+
+                InputManager.ReleaseKey(Key.ControlLeft);
+                InputManager.ReleaseKey(Key.Enter);
+            });
+
+            AddUntilStep("wait for player", () => Stack.CurrentScreen is PlayerLoader);
+
+            AddAssert("autoplay enabled", () => songSelect.Mods.Value.FirstOrDefault() is ModAutoplay);
+
+            AddUntilStep("wait for return to ss", () => songSelect.IsCurrentScreen());
+
+            AddAssert("mod disabled", () => songSelect.Mods.Value.Count == 0);
+        }
+
         [Test]
         public void TestHideSetSelectsCorrectBeatmap()
         {
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 9368bac69f..18f13c5e1d 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -33,6 +33,8 @@ namespace osu.Game.Screens.Select
 
         public override void OnResuming(IScreen last)
         {
+            base.OnResuming(last);
+
             player = null;
 
             if (removeAutoModOnResume)
@@ -41,8 +43,6 @@ namespace osu.Game.Screens.Select
                 ModSelect.DeselectTypes(new[] { autoType }, true);
                 removeAutoModOnResume = false;
             }
-
-            base.OnResuming(last);
         }
 
         protected override bool OnStart()

From 81ab6d43b6cc0be470910f11d478f56d2e3c5032 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 3 Feb 2020 11:09:46 +0300
Subject: [PATCH 0164/1142] Add ability to create ruleset selector in
 OverlayHeader

---
 .../UserInterface/TestSceneOverlayHeader.cs   |  4 ++-
 osu.Game/Overlays/OverlayHeader.cs            | 35 +++++++++++++++----
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
index c899ccb9eb..1cd68d1fdd 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneOverlayHeader.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             addHeader("Orange OverlayHeader (no background)", new TestNoBackgroundHeader(), OverlayColourScheme.Orange);
             addHeader("Blue OverlayHeader", new TestNoControlHeader(), OverlayColourScheme.Blue);
-            addHeader("Green TabControlOverlayHeader (string)", new TestStringTabControlHeader(), OverlayColourScheme.Green);
+            addHeader("Green TabControlOverlayHeader (string) with ruleset selector", new TestStringTabControlHeader(), OverlayColourScheme.Green);
             addHeader("Pink TabControlOverlayHeader (enum)", new TestEnumTabControlHeader(), OverlayColourScheme.Pink);
             addHeader("Red BreadcrumbControlOverlayHeader (no background)", new TestBreadcrumbControlHeader(), OverlayColourScheme.Red);
         }
@@ -116,6 +116,8 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             protected override ScreenTitle CreateTitle() => new TestTitle();
 
+            protected override Drawable CreateTitleContent() => new OverlayRulesetSelector();
+
             public TestStringTabControlHeader()
             {
                 TabControl.AddItem("tab1");
diff --git a/osu.Game/Overlays/OverlayHeader.cs b/osu.Game/Overlays/OverlayHeader.cs
index 5596f71dd0..36ac47bb87 100644
--- a/osu.Game/Overlays/OverlayHeader.cs
+++ b/osu.Game/Overlays/OverlayHeader.cs
@@ -50,14 +50,29 @@ namespace osu.Game.Overlays
                                         RelativeSizeAxes = Axes.Both,
                                         Colour = Color4.Gray,
                                     },
-                                    title = CreateTitle().With(title =>
+                                    new Container
                                     {
-                                        title.Margin = new MarginPadding
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y,
+                                        Padding = new MarginPadding
                                         {
+                                            Horizontal = UserProfileOverlay.CONTENT_X_MARGIN,
                                             Vertical = 10,
-                                            Left = UserProfileOverlay.CONTENT_X_MARGIN
-                                        };
-                                    })
+                                        },
+                                        Children = new[]
+                                        {
+                                            title = CreateTitle().With(title =>
+                                            {
+                                                Anchor = Anchor.CentreLeft;
+                                                Origin = Anchor.CentreLeft;
+                                            }),
+                                            CreateTitleContent().With(content =>
+                                            {
+                                                content.Anchor = Anchor.CentreRight;
+                                                content.Origin = Anchor.CentreRight;
+                                            })
+                                        }
+                                    }
                                 }
                             },
                         }
@@ -75,10 +90,16 @@ namespace osu.Game.Overlays
         }
 
         [NotNull]
-        protected virtual Drawable CreateContent() => Drawable.Empty();
+        protected virtual Drawable CreateContent() => Empty();
 
         [NotNull]
-        protected virtual Drawable CreateBackground() => Drawable.Empty();
+        protected virtual Drawable CreateBackground() => Empty();
+
+        /// <summary>
+        /// Creates a <see cref="Drawable"/> on the opposite side of the <see cref="ScreenTitle"/>. Used mostly to create <see cref="OverlayRulesetSelector"/>.
+        /// </summary>
+        [NotNull]
+        protected virtual Drawable CreateTitleContent() => Empty();
 
         protected abstract ScreenTitle CreateTitle();
     }

From 91aa66bcb29b6e5a43a5ef0f921fdf497c1c16a4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 3 Feb 2020 08:16:18 +0000
Subject: [PATCH 0165/1142] Bump Sentry from 1.2.0 to 2.0.1

Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 1.2.0 to 2.0.1.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/1.2.0...2.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Game/osu.Game.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index b38b7ff9b1..ce58be52ee 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2020.131.0" />
-    <PackageReference Include="Sentry" Version="1.2.0" />
+    <PackageReference Include="Sentry" Version="2.0.1" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />

From ce6e97096cd3889b2807a22934736d6760a6ca56 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 3 Feb 2020 11:44:31 +0300
Subject: [PATCH 0166/1142] Fix broken overlays

oops
---
 osu.Game/Overlays/OverlayHeader.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/OverlayHeader.cs b/osu.Game/Overlays/OverlayHeader.cs
index 36ac47bb87..bedf8e5435 100644
--- a/osu.Game/Overlays/OverlayHeader.cs
+++ b/osu.Game/Overlays/OverlayHeader.cs
@@ -63,8 +63,8 @@ namespace osu.Game.Overlays
                                         {
                                             title = CreateTitle().With(title =>
                                             {
-                                                Anchor = Anchor.CentreLeft;
-                                                Origin = Anchor.CentreLeft;
+                                                title.Anchor = Anchor.CentreLeft;
+                                                title.Origin = Anchor.CentreLeft;
                                             }),
                                             CreateTitleContent().With(content =>
                                             {

From 032c2c2afe281d1a68e86612096ff5a6dbd9bd75 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 3 Feb 2020 14:16:26 +0300
Subject: [PATCH 0167/1142] Refactor BeatmapRulesetSelector

---
 .../Online/TestSceneBeatmapRulesetSelector.cs |   4 +
 .../BeatmapSet/BeatmapRulesetSelector.cs      |  17 +-
 .../BeatmapSet/BeatmapRulesetTabItem.cs       | 150 ++++++------------
 osu.Game/Overlays/BeatmapSet/Header.cs        |   6 +-
 osu.Game/Overlays/OverlayRulesetTabItem.cs    |  16 +-
 5 files changed, 65 insertions(+), 128 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapRulesetSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapRulesetSelector.cs
index 1f8df438fb..8b077c8de3 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapRulesetSelector.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapRulesetSelector.cs
@@ -5,6 +5,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Beatmaps;
+using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapSet;
 using osu.Game.Rulesets;
 using System;
@@ -21,6 +22,9 @@ namespace osu.Game.Tests.Visual.Online
             typeof(BeatmapRulesetTabItem),
         };
 
+        [Cached]
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+
         private readonly TestRulesetSelector selector;
 
         public TestSceneBeatmapRulesetSelector()
diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapRulesetSelector.cs b/osu.Game/Overlays/BeatmapSet/BeatmapRulesetSelector.cs
index a0bedc848e..005d21726b 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapRulesetSelector.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapRulesetSelector.cs
@@ -2,17 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
-using osuTK;
 using System.Linq;
 
 namespace osu.Game.Overlays.BeatmapSet
 {
-    public class BeatmapRulesetSelector : RulesetSelector
+    public class BeatmapRulesetSelector : OverlayRulesetSelector
     {
         private readonly Bindable<BeatmapSetInfo> beatmapSet = new Bindable<BeatmapSetInfo>();
 
@@ -28,21 +25,9 @@ namespace osu.Game.Overlays.BeatmapSet
             }
         }
 
-        public BeatmapRulesetSelector()
-        {
-            AutoSizeAxes = Axes.Both;
-        }
-
         protected override TabItem<RulesetInfo> CreateTabItem(RulesetInfo value) => new BeatmapRulesetTabItem(value)
         {
             BeatmapSet = { BindTarget = beatmapSet }
         };
-
-        protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
-        {
-            AutoSizeAxes = Axes.Both,
-            Direction = FillDirection.Horizontal,
-            Spacing = new Vector2(10, 0),
-        };
     }
 }
diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapRulesetTabItem.cs b/osu.Game/Overlays/BeatmapSet/BeatmapRulesetTabItem.cs
index cdea49afe7..3e473df621 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapRulesetTabItem.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapRulesetTabItem.cs
@@ -3,143 +3,87 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
-using osuTK;
-using osuTK.Graphics;
 using System.Linq;
 
 namespace osu.Game.Overlays.BeatmapSet
 {
-    public class BeatmapRulesetTabItem : TabItem<RulesetInfo>
+    public class BeatmapRulesetTabItem : OverlayRulesetTabItem
     {
-        private readonly OsuSpriteText name, count;
-        private readonly Box bar;
-
         public readonly Bindable<BeatmapSetInfo> BeatmapSet = new Bindable<BeatmapSetInfo>();
 
         public override bool PropagatePositionalInputSubTree => Enabled.Value && !Active.Value && base.PropagatePositionalInputSubTree;
 
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; }
+
+        private OsuSpriteText count;
+        private Container countContainer;
+
         public BeatmapRulesetTabItem(RulesetInfo value)
             : base(value)
         {
-            AutoSizeAxes = Axes.Both;
+        }
 
-            FillFlowContainer nameContainer;
-
-            Children = new Drawable[]
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Content.Add(countContainer = new Container
             {
-                nameContainer = new FillFlowContainer
+                AutoSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Masking = true,
+                CornerRadius = 4f,
+                Children = new Drawable[]
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    AutoSizeAxes = Axes.Both,
-                    Direction = FillDirection.Horizontal,
-                    Margin = new MarginPadding { Bottom = 7.5f },
-                    Spacing = new Vector2(2.5f),
-                    Children = new Drawable[]
+                    new Box
                     {
-                        name = new OsuSpriteText
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Text = value.Name,
-                            Font = OsuFont.Default.With(size: 18),
-                        },
-                        new Container
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            AutoSizeAxes = Axes.Both,
-                            Masking = true,
-                            CornerRadius = 4f,
-                            Children = new Drawable[]
-                            {
-                                new Box
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Colour = Color4.Black.Opacity(0.5f),
-                                },
-                                count = new OsuSpriteText
-                                {
-                                    Alpha = 0,
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    Margin = new MarginPadding { Horizontal = 5f },
-                                    Font = OsuFont.Default.With(weight: FontWeight.SemiBold),
-                                }
-                            }
-                        }
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = colourProvider.Background6
+                    },
+                    count = new OsuSpriteText
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Margin = new MarginPadding { Horizontal = 5f },
+                        Font = OsuFont.Default.With(weight: FontWeight.SemiBold),
+                        Colour = colourProvider.Foreground1,
                     }
-                },
-                bar = new Box
-                {
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.BottomCentre,
-                    RelativeSizeAxes = Axes.X,
-                },
-                new HoverClickSounds(),
-            };
+                }
+            });
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
 
             BeatmapSet.BindValueChanged(setInfo =>
             {
                 var beatmapsCount = setInfo.NewValue?.Beatmaps.Count(b => b.Ruleset.Equals(Value)) ?? 0;
 
                 count.Text = beatmapsCount.ToString();
-                count.Alpha = beatmapsCount > 0 ? 1f : 0f;
+                countContainer.FadeTo(beatmapsCount > 0 ? 1 : 0);
 
                 Enabled.Value = beatmapsCount > 0;
             }, true);
 
-            Enabled.BindValueChanged(v => nameContainer.Alpha = v.NewValue ? 1f : 0.5f, true);
+            Enabled.BindValueChanged(enabled =>
+            {
+                if (enabled.NewValue)
+                {
+                    UpdateState();
+                    return;
+                }
+
+                AccentColour = colourProvider.Foreground1;
+            }, true);
         }
-
-        [Resolved]
-        private OsuColour colour { get; set; }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            count.Colour = colour.Gray9;
-            bar.Colour = colour.Blue;
-
-            updateState();
-        }
-
-        private void updateState()
-        {
-            var isHoveredOrActive = IsHovered || Active.Value;
-
-            bar.ResizeHeightTo(isHoveredOrActive ? 4 : 0, 200, Easing.OutQuint);
-
-            name.Colour = isHoveredOrActive ? colour.GrayE : colour.GrayC;
-            name.Font = name.Font.With(weight: Active.Value ? FontWeight.Bold : FontWeight.Regular);
-        }
-
-        #region Hovering and activation logic
-
-        protected override void OnActivated() => updateState();
-
-        protected override void OnDeactivated() => updateState();
-
-        protected override bool OnHover(HoverEvent e)
-        {
-            updateState();
-            return false;
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e) => updateState();
-
-        #endregion
     }
 }
diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index 7b42e7e459..c787df01ae 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Overlays.BeatmapSet
                 new Container
                 {
                     RelativeSizeAxes = Axes.X,
-                    Height = tabs_height,
+                    AutoSizeAxes = Axes.Y,
                     Children = new Drawable[]
                     {
                         tabsBg = new Box
@@ -84,8 +84,8 @@ namespace osu.Game.Overlays.BeatmapSet
                         RulesetSelector = new BeatmapRulesetSelector
                         {
                             Current = ruleset,
-                            Anchor = Anchor.BottomCentre,
-                            Origin = Anchor.BottomCentre,
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
                         }
                     },
                 },
diff --git a/osu.Game/Overlays/OverlayRulesetTabItem.cs b/osu.Game/Overlays/OverlayRulesetTabItem.cs
index f8a9d14f62..5e6ac57886 100644
--- a/osu.Game/Overlays/OverlayRulesetTabItem.cs
+++ b/osu.Game/Overlays/OverlayRulesetTabItem.cs
@@ -64,29 +64,33 @@ namespace osu.Game.Overlays
         [BackgroundDependencyLoader]
         private void load()
         {
-            updateState();
+            UpdateState();
         }
 
         protected override bool OnHover(HoverEvent e)
         {
             base.OnHover(e);
-            updateState();
+            UpdateState();
             return true;
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
             base.OnHoverLost(e);
-            updateState();
+            UpdateState();
         }
 
-        protected override void OnActivated() => updateState();
+        protected override void OnActivated() => UpdateState();
 
-        protected override void OnDeactivated() => updateState();
+        protected override void OnDeactivated() => UpdateState();
 
-        private void updateState()
+        protected void UpdateState()
         {
             text.Font = text.Font.With(weight: Active.Value ? FontWeight.Bold : FontWeight.Medium);
+
+            if (!Enabled.Value)
+                return;
+
             AccentColour = IsHovered || Active.Value ? Color4.White : colourProvider.Highlight1;
         }
     }

From fa453bc3e158d3a604407d1a44fc1f09a5aed600 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 3 Feb 2020 14:35:07 +0300
Subject: [PATCH 0168/1142] Refactor beatmap header

---
 .../Overlays/BeatmapSet/BeatmapSetHeader.cs   |  34 +++
 osu.Game/Overlays/BeatmapSet/Header.cs        | 248 +++++++++---------
 2 files changed, 151 insertions(+), 131 deletions(-)
 create mode 100644 osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs

diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
new file mode 100644
index 0000000000..bf9f3ccc17
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
@@ -0,0 +1,34 @@
+// 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.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets;
+
+namespace osu.Game.Overlays.BeatmapSet
+{
+    public class BeatmapSetHeader : OverlayHeader
+    {
+        public readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
+        public BeatmapRulesetSelector RulesetSelector;
+
+        protected override ScreenTitle CreateTitle() => new BeatmapHeaderTitle();
+
+        protected override Drawable CreateTitleContent() => RulesetSelector = new BeatmapRulesetSelector
+        {
+            Current = Ruleset
+        };
+
+        private class BeatmapHeaderTitle : ScreenTitle
+        {
+            public BeatmapHeaderTitle()
+            {
+                Title = @"beatmap";
+                Section = @"info";
+            }
+
+            protected override Drawable CreateIcon() => new ScreenTitleTextureIcon(@"Icons/changelog");
+        }
+    }
+}
diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index c787df01ae..7c5c5a9d55 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -26,11 +26,9 @@ namespace osu.Game.Overlays.BeatmapSet
     public class Header : BeatmapDownloadTrackingComposite
     {
         private const float transition_duration = 200;
-        private const float tabs_height = 50;
         private const float buttons_height = 45;
         private const float buttons_spacing = 5;
 
-        private readonly Box tabsBg;
         private readonly UpdateableBeatmapSetCover cover;
         private readonly OsuSpriteText title, artist;
         private readonly AuthorInfo author;
@@ -41,14 +39,13 @@ namespace osu.Game.Overlays.BeatmapSet
 
         public bool DownloadButtonsVisible => downloadButtonsContainer.Any();
 
-        public readonly BeatmapRulesetSelector RulesetSelector;
+        public BeatmapRulesetSelector RulesetSelector => beatmapSetHeader.RulesetSelector;
         public readonly BeatmapPicker Picker;
 
         private readonly FavouriteButton favouriteButton;
-
         private readonly FillFlowContainer fadeContent;
-
         private readonly LoadingAnimation loading;
+        private readonly BeatmapSetHeader beatmapSetHeader;
 
         [Cached(typeof(IBindable<RulesetInfo>))]
         private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
@@ -69,154 +66,145 @@ namespace osu.Game.Overlays.BeatmapSet
                 Offset = new Vector2(0f, 1f),
             };
 
-            InternalChildren = new Drawable[]
+            InternalChild = new FillFlowContainer
             {
-                new Container
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Children = new Drawable[]
                 {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Children = new Drawable[]
+                    beatmapSetHeader = new BeatmapSetHeader
                     {
-                        tabsBg = new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                        RulesetSelector = new BeatmapRulesetSelector
-                        {
-                            Current = ruleset,
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                        }
+                        Ruleset = { BindTarget = ruleset },
                     },
-                },
-                new Container
-                {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Padding = new MarginPadding { Top = tabs_height },
-                    Children = new Drawable[]
+                    new Container
                     {
-                        new Container
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Children = new Drawable[]
                         {
-                            RelativeSizeAxes = Axes.Both,
-                            Children = new Drawable[]
+                            new Container
                             {
-                                cover = new UpdateableBeatmapSetCover
+                                RelativeSizeAxes = Axes.Both,
+                                Children = new Drawable[]
                                 {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Masking = true,
-                                },
-                                new Box
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Colour = ColourInfo.GradientVertical(Color4.Black.Opacity(0.3f), Color4.Black.Opacity(0.8f)),
-                                },
-                            },
-                        },
-                        new Container
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Padding = new MarginPadding
-                            {
-                                Top = 20,
-                                Bottom = 30,
-                                Left = BeatmapSetOverlay.X_PADDING,
-                                Right = BeatmapSetOverlay.X_PADDING + BeatmapSetOverlay.RIGHT_WIDTH,
-                            },
-                            Children = new Drawable[]
-                            {
-                                fadeContent = new FillFlowContainer
-                                {
-                                    RelativeSizeAxes = Axes.X,
-                                    AutoSizeAxes = Axes.Y,
-                                    Direction = FillDirection.Vertical,
-                                    Children = new Drawable[]
+                                    cover = new UpdateableBeatmapSetCover
                                     {
-                                        new Container
+                                        RelativeSizeAxes = Axes.Both,
+                                        Masking = true,
+                                    },
+                                    new Box
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        Colour = ColourInfo.GradientVertical(Color4.Black.Opacity(0.3f), Color4.Black.Opacity(0.8f)),
+                                    },
+                                },
+                            },
+                            new Container
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                                Padding = new MarginPadding
+                                {
+                                    Top = 20,
+                                    Bottom = 30,
+                                    Left = BeatmapSetOverlay.X_PADDING,
+                                    Right = BeatmapSetOverlay.X_PADDING + BeatmapSetOverlay.RIGHT_WIDTH,
+                                },
+                                Children = new Drawable[]
+                                {
+                                    fadeContent = new FillFlowContainer
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y,
+                                        Direction = FillDirection.Vertical,
+                                        Children = new Drawable[]
                                         {
-                                            RelativeSizeAxes = Axes.X,
-                                            AutoSizeAxes = Axes.Y,
-                                            Child = Picker = new BeatmapPicker(),
-                                        },
-                                        new FillFlowContainer
-                                        {
-                                            Direction = FillDirection.Horizontal,
-                                            AutoSizeAxes = Axes.Both,
-                                            Children = new Drawable[]
+                                            new Container
                                             {
-                                                title = new OsuSpriteText
-                                                {
-                                                    Font = OsuFont.GetFont(size: 37, weight: FontWeight.Bold, italics: true)
-                                                },
-                                                externalLink = new ExternalLinkButton
-                                                {
-                                                    Anchor = Anchor.BottomLeft,
-                                                    Origin = Anchor.BottomLeft,
-                                                    Margin = new MarginPadding { Left = 3, Bottom = 4 }, //To better lineup with the font
-                                                },
-                                            }
-                                        },
-                                        artist = new OsuSpriteText { Font = OsuFont.GetFont(size: 25, weight: FontWeight.SemiBold, italics: true) },
-                                        new Container
-                                        {
-                                            RelativeSizeAxes = Axes.X,
-                                            AutoSizeAxes = Axes.Y,
-                                            Margin = new MarginPadding { Top = 20 },
-                                            Child = author = new AuthorInfo(),
-                                        },
-                                        beatmapAvailability = new BeatmapAvailability(),
-                                        new Container
-                                        {
-                                            RelativeSizeAxes = Axes.X,
-                                            Height = buttons_height,
-                                            Margin = new MarginPadding { Top = 10 },
-                                            Children = new Drawable[]
+                                                RelativeSizeAxes = Axes.X,
+                                                AutoSizeAxes = Axes.Y,
+                                                Child = Picker = new BeatmapPicker(),
+                                            },
+                                            new FillFlowContainer
                                             {
-                                                favouriteButton = new FavouriteButton
+                                                Direction = FillDirection.Horizontal,
+                                                AutoSizeAxes = Axes.Both,
+                                                Children = new Drawable[]
                                                 {
-                                                    BeatmapSet = { BindTarget = BeatmapSet }
-                                                },
-                                                downloadButtonsContainer = new FillFlowContainer
+                                                    title = new OsuSpriteText
+                                                    {
+                                                        Font = OsuFont.GetFont(size: 37, weight: FontWeight.Bold, italics: true)
+                                                    },
+                                                    externalLink = new ExternalLinkButton
+                                                    {
+                                                        Anchor = Anchor.BottomLeft,
+                                                        Origin = Anchor.BottomLeft,
+                                                        Margin = new MarginPadding { Left = 3, Bottom = 4 }, //To better lineup with the font
+                                                    },
+                                                }
+                                            },
+                                            artist = new OsuSpriteText { Font = OsuFont.GetFont(size: 25, weight: FontWeight.SemiBold, italics: true) },
+                                            new Container
+                                            {
+                                                RelativeSizeAxes = Axes.X,
+                                                AutoSizeAxes = Axes.Y,
+                                                Margin = new MarginPadding { Top = 20 },
+                                                Child = author = new AuthorInfo(),
+                                            },
+                                            beatmapAvailability = new BeatmapAvailability(),
+                                            new Container
+                                            {
+                                                RelativeSizeAxes = Axes.X,
+                                                Height = buttons_height,
+                                                Margin = new MarginPadding { Top = 10 },
+                                                Children = new Drawable[]
                                                 {
-                                                    RelativeSizeAxes = Axes.Both,
-                                                    Padding = new MarginPadding { Left = buttons_height + buttons_spacing },
-                                                    Spacing = new Vector2(buttons_spacing),
+                                                    favouriteButton = new FavouriteButton
+                                                    {
+                                                        BeatmapSet = { BindTarget = BeatmapSet }
+                                                    },
+                                                    downloadButtonsContainer = new FillFlowContainer
+                                                    {
+                                                        RelativeSizeAxes = Axes.Both,
+                                                        Padding = new MarginPadding { Left = buttons_height + buttons_spacing },
+                                                        Spacing = new Vector2(buttons_spacing),
+                                                    },
                                                 },
                                             },
                                         },
                                     },
-                                },
-                            }
-                        },
-                        loading = new LoadingAnimation
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Scale = new Vector2(1.5f),
-                        },
-                        new FillFlowContainer
-                        {
-                            Anchor = Anchor.BottomRight,
-                            Origin = Anchor.BottomRight,
-                            AutoSizeAxes = Axes.Both,
-                            Margin = new MarginPadding { Top = BeatmapSetOverlay.TOP_PADDING, Right = BeatmapSetOverlay.X_PADDING },
-                            Direction = FillDirection.Vertical,
-                            Spacing = new Vector2(10),
-                            Children = new Drawable[]
+                                }
+                            },
+                            loading = new LoadingAnimation
                             {
-                                onlineStatusPill = new BeatmapSetOnlineStatusPill
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Scale = new Vector2(1.5f),
+                            },
+                            new FillFlowContainer
+                            {
+                                Anchor = Anchor.BottomRight,
+                                Origin = Anchor.BottomRight,
+                                AutoSizeAxes = Axes.Both,
+                                Margin = new MarginPadding { Top = BeatmapSetOverlay.TOP_PADDING, Right = BeatmapSetOverlay.X_PADDING },
+                                Direction = FillDirection.Vertical,
+                                Spacing = new Vector2(10),
+                                Children = new Drawable[]
                                 {
-                                    Anchor = Anchor.TopRight,
-                                    Origin = Anchor.TopRight,
-                                    TextSize = 14,
-                                    TextPadding = new MarginPadding { Horizontal = 25, Vertical = 8 }
+                                    onlineStatusPill = new BeatmapSetOnlineStatusPill
+                                    {
+                                        Anchor = Anchor.TopRight,
+                                        Origin = Anchor.TopRight,
+                                        TextSize = 14,
+                                        TextPadding = new MarginPadding { Horizontal = 25, Vertical = 8 }
+                                    },
+                                    Details = new Details(),
                                 },
-                                Details = new Details(),
                             },
                         },
                     },
-                },
+                }
             };
 
             Picker.Beatmap.ValueChanged += b =>
@@ -229,8 +217,6 @@ namespace osu.Game.Overlays.BeatmapSet
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            tabsBg.Colour = colours.Gray3;
-
             State.BindValueChanged(_ => updateDownloadButtons());
 
             BeatmapSet.BindValueChanged(setInfo =>

From 2abcc6ad69c4c9c64ebb15f227ff77e3463c1f06 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 3 Feb 2020 15:25:07 +0300
Subject: [PATCH 0169/1142] Simplify counter addition in BeatmapRulesetTabItem

---
 osu.Game/Overlays/BeatmapSet/BeatmapRulesetTabItem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapRulesetTabItem.cs b/osu.Game/Overlays/BeatmapSet/BeatmapRulesetTabItem.cs
index 3e473df621..df159977e6 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapRulesetTabItem.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapRulesetTabItem.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.BeatmapSet
         [BackgroundDependencyLoader]
         private void load()
         {
-            Content.Add(countContainer = new Container
+            Add(countContainer = new Container
             {
                 AutoSizeAxes = Axes.Both,
                 Anchor = Anchor.Centre,

From 351cb8ac1a8c9e00c587b4fa8b0f3a3684d5a629 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Mon, 3 Feb 2020 15:47:52 +0300
Subject: [PATCH 0170/1142] Rename Visible to HasReplayLoaded and change
 default value

Doesn't make sense to be true by default
---
 .../Visual/Gameplay/TestSceneHUDOverlay.cs     | 18 ++++++++----------
 osu.Game/Screens/Play/KeyCounterDisplay.cs     |  8 ++++----
 osu.Game/Screens/Play/Player.cs                |  2 +-
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index 7ce6153ba5..5887cc2435 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -30,8 +30,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("showhud is set", () => hudOverlay.ShowHud.Value);
 
             AddAssert("hidetarget is visible", () => hideTarget.IsPresent);
-            AddAssert("key counter flow is visible", () => hudOverlay.KeyCounter.KeyFlow.IsPresent);
             AddAssert("pause button is visible", () => hudOverlay.HoldToQuit.IsPresent);
+            AddAssert("key counter flow is hidden", () => !hudOverlay.KeyCounter.KeyFlow.IsPresent);
         }
 
         [Test]
@@ -45,17 +45,19 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [Test]
-        public void TestHideExternally()
+        public void TestChangeVisibilityExternally()
         {
             createNew();
 
             AddStep("set showhud false", () => hudOverlay.ShowHud.Value = false);
-
             AddUntilStep("hidetarget is hidden", () => !hideTarget.IsPresent);
+            AddAssert("key counter flow is hidden", () => !hudOverlay.KeyCounter.KeyFlow.IsPresent);
             AddAssert("pause button is still visible", () => hudOverlay.HoldToQuit.IsPresent);
 
-            // Key counter flow container should not be affected by this, only the key counter display will be hidden as checked above.
-            AddAssert("key counter flow not affected", () => hudOverlay.KeyCounter.KeyFlow.IsPresent);
+            AddStep("set showhud false", () => hudOverlay.ShowHud.Value = true);
+            AddUntilStep("hidetarget is visible", () => hideTarget.IsPresent);
+            AddAssert("key counter flow is still hidden", () => !hudOverlay.KeyCounter.KeyFlow.IsPresent);
+            AddAssert("pause button is still visible", () => hudOverlay.HoldToQuit.IsPresent);
         }
 
         [Test]
@@ -82,11 +84,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             createNew();
             AddStep("save keycounter visible value", () => keyCounterVisibleValue = config.Get<bool>(OsuSetting.KeyOverlay));
 
-            AddStep("set keycounter visible false", () =>
-            {
-                config.Set<bool>(OsuSetting.KeyOverlay, false);
-                hudOverlay.KeyCounter.Visible.Value = false;
-            });
+            AddStep("set keycounter visible false", () => config.Set<bool>(OsuSetting.KeyOverlay, false));
 
             AddStep("set showhud false", () => hudOverlay.ShowHud.Value = false);
             AddUntilStep("hidetarget is hidden", () => !hideTarget.IsPresent);
diff --git a/osu.Game/Screens/Play/KeyCounterDisplay.cs b/osu.Game/Screens/Play/KeyCounterDisplay.cs
index b5d8c99e67..4c4fcea879 100644
--- a/osu.Game/Screens/Play/KeyCounterDisplay.cs
+++ b/osu.Game/Screens/Play/KeyCounterDisplay.cs
@@ -20,12 +20,12 @@ namespace osu.Game.Screens.Play
         private const double key_fade_time = 80;
 
         /// <summary>
-        /// Whether to always show key counter regardless of <see cref="Visible"/>.
+        /// Whether to always show key counter regardless of any other condition.
         /// This is bound to <see cref="OsuSetting.KeyOverlay"/> configuration setting bindable.
         /// </summary>
         private readonly Bindable<bool> alwaysShow = new Bindable<bool>();
 
-        public readonly Bindable<bool> Visible = new Bindable<bool>(true);
+        public readonly Bindable<bool> HasReplayLoaded = new BindableBool();
 
         protected readonly FillFlowContainer<KeyCounter> KeyFlow;
 
@@ -63,7 +63,7 @@ namespace osu.Game.Screens.Play
         {
             base.LoadComplete();
 
-            Visible.BindValueChanged(_ => updateVisibility());
+            HasReplayLoaded.BindValueChanged(_ => updateVisibility());
             alwaysShow.BindValueChanged(_ => updateVisibility(), true);
         }
 
@@ -116,7 +116,7 @@ namespace osu.Game.Screens.Play
 
         private void updateVisibility() =>
             // Isolate changing visibility of the key counters from fading this component.
-            KeyFlow.FadeTo(Visible.Value || alwaysShow.Value ? 1 : 0, duration);
+            KeyFlow.FadeTo(HasReplayLoaded.Value || alwaysShow.Value ? 1 : 0, duration);
 
         public override bool HandleNonPositionalInput => receptor == null;
         public override bool HandlePositionalInput => receptor == null;
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 7228e22382..02fc5f81d5 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -219,7 +219,7 @@ namespace osu.Game.Screens.Play
                         IsPaused = { BindTarget = GameplayClockContainer.IsPaused }
                     },
                     PlayerSettingsOverlay = { PlaybackSettings = { UserPlaybackRate = { BindTarget = GameplayClockContainer.UserPlaybackRate } } },
-                    KeyCounter = { Visible = { BindTarget = DrawableRuleset.HasReplayLoaded } },
+                    KeyCounter = { HasReplayLoaded = { BindTarget = DrawableRuleset.HasReplayLoaded } },
                     RequestSeek = GameplayClockContainer.Seek,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre

From a365082a98283b3fef5f2d557a689e2bb4385a44 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 3 Feb 2020 22:18:07 +0900
Subject: [PATCH 0171/1142] Fix potential nullref in UserDimBackgrounds tests

---
 osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index 41b13b50df..6d014ca1ca 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -277,7 +277,7 @@ namespace osu.Game.Tests.Visual.Background
 
         private void setupUserSettings()
         {
-            AddUntilStep("Song select has selection", () => songSelect.Carousel.SelectedBeatmap != null);
+            AddUntilStep("Song select has selection", () => songSelect.Carousel?.SelectedBeatmap != null);
             AddStep("Set default user settings", () =>
             {
                 SelectedMods.Value = SelectedMods.Value.Concat(new[] { new OsuModNoFail() }).ToArray();

From 257b4052e89ed18030b24877fc656007a9dace54 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Mon, 3 Feb 2020 22:09:07 +0700
Subject: [PATCH 0172/1142] Add {ScoreInfo,UserStatistics}.Accuracy

---
 osu.Game/Scoring/ScoreInfo.cs    | 3 +++
 osu.Game/Users/UserStatistics.cs | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index c37bab9086..8787785861 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -31,6 +31,9 @@ namespace osu.Game.Scoring
         [Column(TypeName = "DECIMAL(1,4)")]
         public double Accuracy { get; set; }
 
+        [JsonIgnore]
+        public string DisplayAccuracy => Accuracy == 1 ? "100%" : $"{Accuracy:P2}";
+
         [JsonProperty(@"pp")]
         public double? PP { get; set; }
 
diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs
index 24f1f0b30e..9254eefb60 100644
--- a/osu.Game/Users/UserStatistics.cs
+++ b/osu.Game/Users/UserStatistics.cs
@@ -43,6 +43,9 @@ namespace osu.Game.Users
         [JsonProperty(@"hit_accuracy")]
         public decimal Accuracy;
 
+        [JsonIgnore]
+        public string DisplayAccuracy => $"{Accuracy:P2}";
+
         [JsonProperty(@"play_count")]
         public int PlayCount;
 

From 9898a926b2afca3823e81895aa03f3859693a7d6 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Mon, 3 Feb 2020 22:11:36 +0700
Subject: [PATCH 0173/1142] Use ScoreInfo.DisplayAccuracy everywhere

---
 osu.Game/Online/Leaderboards/LeaderboardScore.cs               | 2 +-
 osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs              | 2 +-
 .../Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs    | 2 +-
 .../Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs    | 2 +-
 .../Screens/Multi/Match/Components/MatchLeaderboardScore.cs    | 2 +-
 osu.Game/Screens/Ranking/Results.cs                            | 2 +-
 osu.Game/Screens/Select/LocalScoreDeleteDialog.cs              | 3 +--
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index c8b2f2327b..c9131883bb 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -277,7 +277,7 @@ namespace osu.Game.Online.Leaderboards
         protected virtual IEnumerable<LeaderboardScoreStatistic> GetStatistics(ScoreInfo model) => new[]
         {
             new LeaderboardScoreStatistic(FontAwesome.Solid.Link, "Max Combo", model.MaxCombo.ToString()),
-            new LeaderboardScoreStatistic(FontAwesome.Solid.Crosshairs, "Accuracy", string.Format(model.Accuracy % 1 == 0 ? @"{0:0%}" : @"{0:0.00%}", model.Accuracy))
+            new LeaderboardScoreStatistic(FontAwesome.Solid.Crosshairs, "Accuracy", model.DisplayAccuracy)
         };
 
         protected override bool OnHover(HoverEvent e)
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index f6723839b2..3a944882ab 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -116,7 +116,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 new OsuSpriteText
                 {
                     Margin = new MarginPadding { Right = horizontal_inset },
-                    Text = $@"{score.Accuracy:P2}",
+                    Text = score.DisplayAccuracy,
                     Font = OsuFont.GetFont(size: text_size),
                     Colour = score.Accuracy == 1 ? highAccuracyColour : Color4.White
                 },
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index b9664d7c2f..4f26e43fb2 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             set
             {
                 totalScoreColumn.Text = $@"{value.TotalScore:N0}";
-                accuracyColumn.Text = $@"{value.Accuracy:P2}";
+                accuracyColumn.Text = value.DisplayAccuracy;
                 maxComboColumn.Text = $@"{value.MaxCombo:N0}x";
                 ppColumn.Text = $@"{value.PP:N0}";
 
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
index c9f787bb26..0eee34a304 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
@@ -182,7 +182,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
 
         protected OsuSpriteText CreateDrawableAccuracy() => new OsuSpriteText
         {
-            Text = $"{Score.Accuracy:0.00%}",
+            Text = Score.DisplayAccuracy,
             Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true),
             Colour = colours.Yellow,
         };
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboardScore.cs b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboardScore.cs
index bab9672d65..73a40d9579 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboardScore.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchLeaderboardScore.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Screens.Multi.Match.Components
 
         protected override IEnumerable<LeaderboardScoreStatistic> GetStatistics(ScoreInfo model) => new[]
         {
-            new LeaderboardScoreStatistic(FontAwesome.Solid.Crosshairs, "Accuracy", string.Format(model.Accuracy % 1 == 0 ? @"{0:0%}" : @"{0:0.00%}", model.Accuracy)),
+            new LeaderboardScoreStatistic(FontAwesome.Solid.Crosshairs, "Accuracy", model.DisplayAccuracy),
             new LeaderboardScoreStatistic(FontAwesome.Solid.Sync, "Total Attempts", score.TotalAttempts.ToString()),
             new LeaderboardScoreStatistic(FontAwesome.Solid.Check, "Completed Beatmaps", score.CompletedBeatmaps.ToString()),
         };
diff --git a/osu.Game/Screens/Ranking/Results.cs b/osu.Game/Screens/Ranking/Results.cs
index d063988b3f..05f1872be9 100644
--- a/osu.Game/Screens/Ranking/Results.cs
+++ b/osu.Game/Screens/Ranking/Results.cs
@@ -211,7 +211,7 @@ namespace osu.Game.Screens.Ranking
                             {
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.BottomCentre,
-                                Text = $"{Score.Accuracy:P2}",
+                                Text = Score.DisplayAccuracy,
                                 Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 40),
                                 RelativePositionAxes = Axes.X,
                                 X = 0.9f,
diff --git a/osu.Game/Screens/Select/LocalScoreDeleteDialog.cs b/osu.Game/Screens/Select/LocalScoreDeleteDialog.cs
index 99e76124e8..085ea372c0 100644
--- a/osu.Game/Screens/Select/LocalScoreDeleteDialog.cs
+++ b/osu.Game/Screens/Select/LocalScoreDeleteDialog.cs
@@ -32,8 +32,7 @@ namespace osu.Game.Screens.Select
             BeatmapInfo beatmap = beatmapManager.QueryBeatmap(b => b.ID == score.BeatmapInfoID);
             Debug.Assert(beatmap != null);
 
-            string accuracy = string.Format(score.Accuracy == 1 ? "{0:0%}" : "{0:0.00%}", score.Accuracy);
-            BodyText = $"{score.User} ({accuracy}, {score.Rank})";
+            BodyText = $"{score.User} ({score.DisplayAccuracy}, {score.Rank})";
 
             Icon = FontAwesome.Regular.TrashAlt;
             HeaderText = "Confirm deletion of local score";

From 4dfdd98e8bda9e5c1f2c86351b1c0c2f23696ed8 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Mon, 3 Feb 2020 22:12:34 +0700
Subject: [PATCH 0174/1142] Use UserStatistics.DisplayAccuracy everywhere

---
 osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs | 2 +-
 osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index 19a24dd576..668de15c9e 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -178,7 +178,7 @@ namespace osu.Game.Overlays.Profile.Header
             if (user?.Statistics != null)
             {
                 userStats.Add(new UserStatsLine("Ranked Score", user.Statistics.RankedScore.ToString("#,##0")));
-                userStats.Add(new UserStatsLine("Hit Accuracy", Math.Round(user.Statistics.Accuracy, 2).ToString("#0.00'%'")));
+                userStats.Add(new UserStatsLine("Hit Accuracy", user.Statistics.DisplayAccuracy));
                 userStats.Add(new UserStatsLine("Play Count", user.Statistics.PlayCount.ToString("#,##0")));
                 userStats.Add(new UserStatsLine("Total Score", user.Statistics.TotalScore.ToString("#,##0")));
                 userStats.Add(new UserStatsLine("Total Hits", user.Statistics.TotalHits.ToString("#,##0")));
diff --git a/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs b/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs
index 019a278771..351c4df6b7 100644
--- a/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs
+++ b/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Overlays.Rankings.Tables
 
         protected sealed override Drawable[] CreateAdditionalContent(UserStatistics item) => new[]
         {
-            new ColoredRowText { Text = $@"{item.Accuracy:F2}%", },
+            new ColoredRowText { Text = item.DisplayAccuracy, },
             new ColoredRowText { Text = $@"{item.PlayCount:N0}", },
         }.Concat(CreateUniqueContent(item)).Concat(new[]
         {

From 698408bb6d147cc977f1b445afeeaf5957151314 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Mon, 3 Feb 2020 22:36:38 +0700
Subject: [PATCH 0175/1142] Remove redundant using directive

---
 osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index 668de15c9e..6ed4fc3187 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.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.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;

From 12574111e5375b56ebfae7af839b38d55be427d6 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 3 Feb 2020 19:44:10 +0300
Subject: [PATCH 0176/1142] Use ColourProvider colours

---
 .../Online/TestSceneRankingsSpotlightSelector.cs   |  4 ++++
 osu.Game/Overlays/Rankings/SpotlightSelector.cs    | 14 +++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
index 009fe7cc8c..e46c8a4a71 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
@@ -8,6 +8,7 @@ using osu.Framework.Allocation;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays;
 using osu.Game.Overlays.Rankings;
 
 namespace osu.Game.Tests.Visual.Online
@@ -21,6 +22,9 @@ namespace osu.Game.Tests.Visual.Online
 
         protected override bool UseOnlineAPI => true;
 
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
+
         [Resolved]
         private IAPIProvider api { get; set; }
 
diff --git a/osu.Game/Overlays/Rankings/SpotlightSelector.cs b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
index 4da3daa62a..e34c01113e 100644
--- a/osu.Game/Overlays/Rankings/SpotlightSelector.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
@@ -83,9 +83,9 @@ namespace osu.Game.Overlays.Rankings
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colourProvider)
         {
-            background.Colour = colours.GreySeafoam;
+            background.Colour = colourProvider.Dark3;
         }
 
         protected override void LoadComplete()
@@ -138,9 +138,9 @@ namespace osu.Game.Overlays.Rankings
             }
 
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
+            private void load(OverlayColourProvider colourProvider)
             {
-                valueText.Colour = colours.GreySeafoamLighter;
+                valueText.Colour = colourProvider.Content2;
             }
         }
 
@@ -151,10 +151,10 @@ namespace osu.Game.Overlays.Rankings
             protected override DropdownMenu CreateMenu() => menu = base.CreateMenu().With(m => m.MaxHeight = 400);
 
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
+            private void load(OverlayColourProvider colourProvider)
             {
-                menu.BackgroundColour = colours.Gray1;
-                AccentColour = colours.GreySeafoamDarker;
+                menu.BackgroundColour = colourProvider.Background5;
+                AccentColour = colourProvider.Background6;
             }
         }
     }

From 51ed289c597407867c7096345ed89b8a53d09d95 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Mon, 3 Feb 2020 19:59:58 +0300
Subject: [PATCH 0177/1142] Revert namings and behaviour changes

---
 .../Visual/Gameplay/TestSceneHUDOverlay.cs     | 18 ++++++++++--------
 osu.Game/Screens/Play/KeyCounterDisplay.cs     | 17 ++++++-----------
 osu.Game/Screens/Play/Player.cs                |  2 +-
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index 5887cc2435..7ce6153ba5 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -30,8 +30,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("showhud is set", () => hudOverlay.ShowHud.Value);
 
             AddAssert("hidetarget is visible", () => hideTarget.IsPresent);
+            AddAssert("key counter flow is visible", () => hudOverlay.KeyCounter.KeyFlow.IsPresent);
             AddAssert("pause button is visible", () => hudOverlay.HoldToQuit.IsPresent);
-            AddAssert("key counter flow is hidden", () => !hudOverlay.KeyCounter.KeyFlow.IsPresent);
         }
 
         [Test]
@@ -45,19 +45,17 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [Test]
-        public void TestChangeVisibilityExternally()
+        public void TestHideExternally()
         {
             createNew();
 
             AddStep("set showhud false", () => hudOverlay.ShowHud.Value = false);
+
             AddUntilStep("hidetarget is hidden", () => !hideTarget.IsPresent);
-            AddAssert("key counter flow is hidden", () => !hudOverlay.KeyCounter.KeyFlow.IsPresent);
             AddAssert("pause button is still visible", () => hudOverlay.HoldToQuit.IsPresent);
 
-            AddStep("set showhud false", () => hudOverlay.ShowHud.Value = true);
-            AddUntilStep("hidetarget is visible", () => hideTarget.IsPresent);
-            AddAssert("key counter flow is still hidden", () => !hudOverlay.KeyCounter.KeyFlow.IsPresent);
-            AddAssert("pause button is still visible", () => hudOverlay.HoldToQuit.IsPresent);
+            // Key counter flow container should not be affected by this, only the key counter display will be hidden as checked above.
+            AddAssert("key counter flow not affected", () => hudOverlay.KeyCounter.KeyFlow.IsPresent);
         }
 
         [Test]
@@ -84,7 +82,11 @@ namespace osu.Game.Tests.Visual.Gameplay
             createNew();
             AddStep("save keycounter visible value", () => keyCounterVisibleValue = config.Get<bool>(OsuSetting.KeyOverlay));
 
-            AddStep("set keycounter visible false", () => config.Set<bool>(OsuSetting.KeyOverlay, false));
+            AddStep("set keycounter visible false", () =>
+            {
+                config.Set<bool>(OsuSetting.KeyOverlay, false);
+                hudOverlay.KeyCounter.Visible.Value = false;
+            });
 
             AddStep("set showhud false", () => hudOverlay.ShowHud.Value = false);
             AddUntilStep("hidetarget is hidden", () => !hideTarget.IsPresent);
diff --git a/osu.Game/Screens/Play/KeyCounterDisplay.cs b/osu.Game/Screens/Play/KeyCounterDisplay.cs
index 4c4fcea879..5584bdc359 100644
--- a/osu.Game/Screens/Play/KeyCounterDisplay.cs
+++ b/osu.Game/Screens/Play/KeyCounterDisplay.cs
@@ -19,13 +19,8 @@ namespace osu.Game.Screens.Play
         private const int duration = 100;
         private const double key_fade_time = 80;
 
-        /// <summary>
-        /// Whether to always show key counter regardless of any other condition.
-        /// This is bound to <see cref="OsuSetting.KeyOverlay"/> configuration setting bindable.
-        /// </summary>
-        private readonly Bindable<bool> alwaysShow = new Bindable<bool>();
-
-        public readonly Bindable<bool> HasReplayLoaded = new BindableBool();
+        public readonly Bindable<bool> Visible = new Bindable<bool>(true);
+        private readonly Bindable<bool> configVisibility = new Bindable<bool>();
 
         protected readonly FillFlowContainer<KeyCounter> KeyFlow;
 
@@ -56,15 +51,15 @@ namespace osu.Game.Screens.Play
         [BackgroundDependencyLoader]
         private void load(OsuConfigManager config)
         {
-            config.BindWith(OsuSetting.KeyOverlay, alwaysShow);
+            config.BindWith(OsuSetting.KeyOverlay, configVisibility);
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            HasReplayLoaded.BindValueChanged(_ => updateVisibility());
-            alwaysShow.BindValueChanged(_ => updateVisibility(), true);
+            Visible.BindValueChanged(_ => updateVisibility());
+            configVisibility.BindValueChanged(_ => updateVisibility(), true);
         }
 
         private bool isCounting = true;
@@ -116,7 +111,7 @@ namespace osu.Game.Screens.Play
 
         private void updateVisibility() =>
             // Isolate changing visibility of the key counters from fading this component.
-            KeyFlow.FadeTo(HasReplayLoaded.Value || alwaysShow.Value ? 1 : 0, duration);
+            KeyFlow.FadeTo(AlwaysVisible.Value || configVisibility.Value ? 1 : 0, duration);
 
         public override bool HandleNonPositionalInput => receptor == null;
         public override bool HandlePositionalInput => receptor == null;
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 02fc5f81d5..7228e22382 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -219,7 +219,7 @@ namespace osu.Game.Screens.Play
                         IsPaused = { BindTarget = GameplayClockContainer.IsPaused }
                     },
                     PlayerSettingsOverlay = { PlaybackSettings = { UserPlaybackRate = { BindTarget = GameplayClockContainer.UserPlaybackRate } } },
-                    KeyCounter = { HasReplayLoaded = { BindTarget = DrawableRuleset.HasReplayLoaded } },
+                    KeyCounter = { Visible = { BindTarget = DrawableRuleset.HasReplayLoaded } },
                     RequestSeek = GameplayClockContainer.Seek,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre

From 4cd4055e7cb509d20e788ab261dd2dcb44519bfa Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Mon, 3 Feb 2020 20:00:43 +0300
Subject: [PATCH 0178/1142] Rename to AlwaysVisible and add XMLDoc

---
 osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs | 2 +-
 osu.Game/Screens/Play/KeyCounterDisplay.cs            | 9 +++++++--
 osu.Game/Screens/Play/Player.cs                       | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index 7ce6153ba5..2bafcc1197 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("set keycounter visible false", () =>
             {
                 config.Set<bool>(OsuSetting.KeyOverlay, false);
-                hudOverlay.KeyCounter.Visible.Value = false;
+                hudOverlay.KeyCounter.AlwaysVisible.Value = false;
             });
 
             AddStep("set showhud false", () => hudOverlay.ShowHud.Value = false);
diff --git a/osu.Game/Screens/Play/KeyCounterDisplay.cs b/osu.Game/Screens/Play/KeyCounterDisplay.cs
index 5584bdc359..2ed4afafd3 100644
--- a/osu.Game/Screens/Play/KeyCounterDisplay.cs
+++ b/osu.Game/Screens/Play/KeyCounterDisplay.cs
@@ -19,13 +19,18 @@ namespace osu.Game.Screens.Play
         private const int duration = 100;
         private const double key_fade_time = 80;
 
-        public readonly Bindable<bool> Visible = new Bindable<bool>(true);
         private readonly Bindable<bool> configVisibility = new Bindable<bool>();
 
         protected readonly FillFlowContainer<KeyCounter> KeyFlow;
 
         protected override Container<KeyCounter> Content => KeyFlow;
 
+        /// <summary>
+        /// Whether the key counter should be visible regardless of the configuration value.
+        /// This is true by default, but can be changed.
+        /// </summary>
+        public readonly Bindable<bool> AlwaysVisible = new Bindable<bool>(true);
+
         public KeyCounterDisplay()
         {
             AutoSizeAxes = Axes.Both;
@@ -58,7 +63,7 @@ namespace osu.Game.Screens.Play
         {
             base.LoadComplete();
 
-            Visible.BindValueChanged(_ => updateVisibility());
+            AlwaysVisible.BindValueChanged(_ => updateVisibility());
             configVisibility.BindValueChanged(_ => updateVisibility(), true);
         }
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 7228e22382..aecd35f7dc 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -219,7 +219,7 @@ namespace osu.Game.Screens.Play
                         IsPaused = { BindTarget = GameplayClockContainer.IsPaused }
                     },
                     PlayerSettingsOverlay = { PlaybackSettings = { UserPlaybackRate = { BindTarget = GameplayClockContainer.UserPlaybackRate } } },
-                    KeyCounter = { Visible = { BindTarget = DrawableRuleset.HasReplayLoaded } },
+                    KeyCounter = { AlwaysVisible = { BindTarget = DrawableRuleset.HasReplayLoaded } },
                     RequestSeek = GameplayClockContainer.Seek,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre

From b284170437d3174f27c07ec090f51201923f1ec5 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 3 Feb 2020 20:20:35 +0300
Subject: [PATCH 0179/1142] Basic implementation of new RankingsOverlayHeader

---
 .../Visual/Online/TestSceneRankingsHeader.cs  | 18 ++++---
 .../Overlays/Changelog/ChangelogHeader.cs     | 18 +++----
 osu.Game/Overlays/ChangelogOverlay.cs         |  2 +-
 osu.Game/Overlays/News/NewsHeader.cs          | 10 ++--
 .../Rankings/RankingsOverlayHeader.cs         | 48 +++++++++++++++++++
 osu.Game/Overlays/TabControlOverlayHeader.cs  |  9 +++-
 6 files changed, 79 insertions(+), 26 deletions(-)
 create mode 100644 osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs
index e708934bc3..ff2da39629 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs
@@ -3,8 +3,9 @@
 
 using System;
 using System.Collections.Generic;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
+using osu.Game.Overlays;
 using osu.Game.Overlays.Rankings;
 using osu.Game.Rulesets;
 using osu.Game.Users;
@@ -15,24 +16,21 @@ namespace osu.Game.Tests.Visual.Online
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
-            typeof(DismissableFlag),
-            typeof(HeaderTitle),
-            typeof(RankingsRulesetSelector),
-            typeof(RankingsScopeSelector),
-            typeof(RankingsHeader),
+            typeof(RankingsOverlayHeader),
         };
 
+        [Cached]
+        private readonly OverlayColourProvider overlayColour = new OverlayColourProvider(OverlayColourScheme.Green);
+
         public TestSceneRankingsHeader()
         {
             var countryBindable = new Bindable<Country>();
             var ruleset = new Bindable<RulesetInfo>();
             var scope = new Bindable<RankingsScope>();
 
-            Add(new RankingsHeader
+            Add(new RankingsOverlayHeader
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Scope = { BindTarget = scope },
+                Current = { BindTarget = scope },
                 Country = { BindTarget = countryBindable },
                 Ruleset = { BindTarget = ruleset },
                 Spotlights = new[]
diff --git a/osu.Game/Overlays/Changelog/ChangelogHeader.cs b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
index 4165a180da..8663ec586b 100644
--- a/osu.Game/Overlays/Changelog/ChangelogHeader.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Changelog
 {
     public class ChangelogHeader : BreadcrumbControlOverlayHeader
     {
-        public readonly Bindable<APIChangelogBuild> Current = new Bindable<APIChangelogBuild>();
+        public readonly Bindable<APIChangelogBuild> Build = new Bindable<APIChangelogBuild>();
 
         public Action ListingSelected;
 
@@ -25,18 +25,18 @@ namespace osu.Game.Overlays.Changelog
         public ChangelogHeader()
         {
             TabControl.AddItem(listing_string);
-            TabControl.Current.ValueChanged += e =>
+            Current.ValueChanged += e =>
             {
                 if (e.NewValue == listing_string)
                     ListingSelected?.Invoke();
             };
 
-            Current.ValueChanged += showBuild;
+            Build.ValueChanged += showBuild;
 
             Streams.Current.ValueChanged += e =>
             {
-                if (e.NewValue?.LatestBuild != null && !e.NewValue.Equals(Current.Value?.UpdateStream))
-                    Current.Value = e.NewValue.LatestBuild;
+                if (e.NewValue?.LatestBuild != null && !e.NewValue.Equals(Build.Value?.UpdateStream))
+                    Build.Value = e.NewValue.LatestBuild;
             };
         }
 
@@ -50,7 +50,7 @@ namespace osu.Game.Overlays.Changelog
             if (e.NewValue != null)
             {
                 TabControl.AddItem(e.NewValue.ToString());
-                TabControl.Current.Value = e.NewValue.ToString();
+                Current.Value = e.NewValue.ToString();
 
                 updateCurrentStream();
 
@@ -58,7 +58,7 @@ namespace osu.Game.Overlays.Changelog
             }
             else
             {
-                TabControl.Current.Value = listing_string;
+                Current.Value = listing_string;
                 Streams.Current.Value = null;
                 title.Version = null;
             }
@@ -86,10 +86,10 @@ namespace osu.Game.Overlays.Changelog
 
         private void updateCurrentStream()
         {
-            if (Current.Value == null)
+            if (Build.Value == null)
                 return;
 
-            Streams.Current.Value = Streams.Items.FirstOrDefault(s => s.Name == Current.Value.UpdateStream.Name);
+            Streams.Current.Value = Streams.Items.FirstOrDefault(s => s.Name == Build.Value.UpdateStream.Name);
         }
 
         private class ChangelogHeaderTitle : ScreenTitle
diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index 90ba206077..6a8cb29d3e 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Overlays
 
             sampleBack = audio.Samples.Get(@"UI/generic-select-soft");
 
-            Header.Current.BindTo(Current);
+            Header.Build.BindTo(Current);
 
             Current.BindValueChanged(e =>
             {
diff --git a/osu.Game/Overlays/News/NewsHeader.cs b/osu.Game/Overlays/News/NewsHeader.cs
index b525ba7a82..b55e3ffba0 100644
--- a/osu.Game/Overlays/News/NewsHeader.cs
+++ b/osu.Game/Overlays/News/NewsHeader.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.News
 
         private NewsHeaderTitle title;
 
-        public readonly Bindable<string> Current = new Bindable<string>(null);
+        public readonly Bindable<string> Post = new Bindable<string>(null);
 
         public Action ShowFrontPage;
 
@@ -22,13 +22,13 @@ namespace osu.Game.Overlays.News
         {
             TabControl.AddItem(front_page_string);
 
-            TabControl.Current.ValueChanged += e =>
+            Current.ValueChanged += e =>
             {
                 if (e.NewValue == front_page_string)
                     ShowFrontPage?.Invoke();
             };
 
-            Current.ValueChanged += showPost;
+            Post.ValueChanged += showPost;
         }
 
         private void showPost(ValueChangedEvent<string> e)
@@ -39,13 +39,13 @@ namespace osu.Game.Overlays.News
             if (e.NewValue != null)
             {
                 TabControl.AddItem(e.NewValue);
-                TabControl.Current.Value = e.NewValue;
+                Current.Value = e.NewValue;
 
                 title.IsReadingPost = true;
             }
             else
             {
-                TabControl.Current.Value = front_page_string;
+                Current.Value = front_page_string;
                 title.IsReadingPost = false;
             }
         }
diff --git a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
new file mode 100644
index 0000000000..e4199ba56d
--- /dev/null
+++ b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
@@ -0,0 +1,48 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Framework.Bindables;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets;
+using osu.Game.Users;
+using System.Collections.Generic;
+
+namespace osu.Game.Overlays.Rankings
+{
+    public class RankingsOverlayHeader : TabControlOverlayHeader<RankingsScope>
+    {
+        public readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
+        public readonly Bindable<Country> Country = new Bindable<Country>();
+
+        public IEnumerable<Spotlight> Spotlights { get; set; }
+
+        protected override ScreenTitle CreateTitle() => new RankingsTitle
+        {
+            Scope = { BindTarget = Current }
+        };
+
+        protected override Drawable CreateTitleContent() => new OverlayRulesetSelector
+        {
+            Current = Ruleset
+        };
+
+        private class RankingsTitle : ScreenTitle
+        {
+            public readonly Bindable<RankingsScope> Scope = new Bindable<RankingsScope>();
+
+            public RankingsTitle()
+            {
+                Title = "ranking";
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                Scope.BindValueChanged(scope => Section = scope.NewValue.ToString().ToLowerInvariant(), true);
+            }
+
+            protected override Drawable CreateIcon() => new ScreenTitleTextureIcon(@"Icons/rankings");
+        }
+    }
+}
diff --git a/osu.Game/Overlays/TabControlOverlayHeader.cs b/osu.Game/Overlays/TabControlOverlayHeader.cs
index b410739b25..5c3881c4ee 100644
--- a/osu.Game/Overlays/TabControlOverlayHeader.cs
+++ b/osu.Game/Overlays/TabControlOverlayHeader.cs
@@ -3,6 +3,7 @@
 
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -19,6 +20,8 @@ namespace osu.Game.Overlays
     /// <typeparam name="T">The type of item to be represented by tabs.</typeparam>
     public abstract class TabControlOverlayHeader<T> : OverlayHeader
     {
+        public readonly Bindable<T> Current = new Bindable<T>();
+
         protected OsuTabControl<T> TabControl;
 
         private readonly Box controlBackground;
@@ -35,7 +38,11 @@ namespace osu.Game.Overlays
                     {
                         RelativeSizeAxes = Axes.Both,
                     },
-                    TabControl = CreateTabControl().With(control => control.Margin = new MarginPadding { Left = UserProfileOverlay.CONTENT_X_MARGIN })
+                    TabControl = CreateTabControl().With(control =>
+                    {
+                        control.Margin = new MarginPadding { Left = UserProfileOverlay.CONTENT_X_MARGIN };
+                        control.Current = Current;
+                    })
                 }
             });
         }

From 588a77484b65e07d5a5a1cc225dca96771b62eb8 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 3 Feb 2020 20:32:20 +0300
Subject: [PATCH 0180/1142] Add ContryFilter to new header

---
 .../Online/TestSceneRankingsCountryFilter.cs       |  5 +++++
 .../Visual/Online/TestSceneRankingsHeader.cs       |  1 +
 osu.Game/Overlays/Rankings/CountryFilter.cs        |  4 ++--
 osu.Game/Overlays/Rankings/CountryPill.cs          |  8 ++++----
 .../Overlays/Rankings/RankingsOverlayHeader.cs     | 14 ++++++++++++++
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsCountryFilter.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsCountryFilter.cs
index 7ac65181f9..79862deb16 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsCountryFilter.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsCountryFilter.cs
@@ -11,6 +11,8 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osuTK.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays;
+using osu.Framework.Allocation;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -22,6 +24,9 @@ namespace osu.Game.Tests.Visual.Online
             typeof(CountryPill)
         };
 
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
+
         public TestSceneRankingsCountryFilter()
         {
             var countryBindable = new Bindable<Country>();
diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs
index ff2da39629..9837ae251d 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs
@@ -17,6 +17,7 @@ namespace osu.Game.Tests.Visual.Online
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(RankingsOverlayHeader),
+            typeof(CountryFilter),
         };
 
         [Cached]
diff --git a/osu.Game/Overlays/Rankings/CountryFilter.cs b/osu.Game/Overlays/Rankings/CountryFilter.cs
index 2b12457ccc..4bdefb06ef 100644
--- a/osu.Game/Overlays/Rankings/CountryFilter.cs
+++ b/osu.Game/Overlays/Rankings/CountryFilter.cs
@@ -76,9 +76,9 @@ namespace osu.Game.Overlays.Rankings
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colourProvider)
         {
-            background.Colour = colours.GreySeafoam;
+            background.Colour = colourProvider.Dark3;
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Overlays/Rankings/CountryPill.cs b/osu.Game/Overlays/Rankings/CountryPill.cs
index 410d316006..1b19bbd95e 100644
--- a/osu.Game/Overlays/Rankings/CountryPill.cs
+++ b/osu.Game/Overlays/Rankings/CountryPill.cs
@@ -100,9 +100,9 @@ namespace osu.Game.Overlays.Rankings
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colourProvider)
         {
-            background.Colour = colours.GreySeafoamDarker;
+            background.Colour = colourProvider.Background5;
         }
 
         protected override void LoadComplete()
@@ -154,9 +154,9 @@ namespace osu.Game.Overlays.Rankings
             }
 
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
+            private void load(OverlayColourProvider colourProvider)
             {
-                IdleColour = colours.GreySeafoamLighter;
+                IdleColour = colourProvider.Light2;
                 HoverColour = Color4.White;
             }
         }
diff --git a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
index e4199ba56d..b3f96604ea 100644
--- a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
+++ b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
@@ -7,6 +7,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 using osu.Game.Users;
 using System.Collections.Generic;
+using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Overlays.Rankings
 {
@@ -27,6 +28,19 @@ namespace osu.Game.Overlays.Rankings
             Current = Ruleset
         };
 
+        protected override Drawable CreateContent() => new Container
+        {
+            RelativeSizeAxes = Axes.X,
+            AutoSizeAxes = Axes.Y,
+            Children = new Drawable[]
+            {
+                new CountryFilter
+                {
+                    Current = Country
+                }
+            }
+        };
+
         private class RankingsTitle : ScreenTitle
         {
             public readonly Bindable<RankingsScope> Scope = new Bindable<RankingsScope>();

From dc1d0d0f32063952da5e149deb03193fbf284205 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 3 Feb 2020 20:47:41 +0300
Subject: [PATCH 0181/1142] Add spotlights selector to new header

---
 .../Rankings/RankingsOverlayHeader.cs         | 69 ++++++++++++++++++-
 1 file changed, 67 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
index b3f96604ea..f6d39c7df4 100644
--- a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
+++ b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
@@ -8,15 +8,22 @@ using osu.Game.Rulesets;
 using osu.Game.Users;
 using System.Collections.Generic;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Allocation;
 
 namespace osu.Game.Overlays.Rankings
 {
     public class RankingsOverlayHeader : TabControlOverlayHeader<RankingsScope>
     {
         public readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
+        public readonly Bindable<Spotlight> Spotlight = new Bindable<Spotlight>();
         public readonly Bindable<Country> Country = new Bindable<Country>();
 
-        public IEnumerable<Spotlight> Spotlights { get; set; }
+        public IEnumerable<Spotlight> Spotlights
+        {
+            get => spotlightsContainer.Spotlights;
+            set => spotlightsContainer.Spotlights = value;
+        }
 
         protected override ScreenTitle CreateTitle() => new RankingsTitle
         {
@@ -28,19 +35,35 @@ namespace osu.Game.Overlays.Rankings
             Current = Ruleset
         };
 
-        protected override Drawable CreateContent() => new Container
+        private SpotlightsContainer spotlightsContainer;
+
+        protected override Drawable CreateContent() => new FillFlowContainer
         {
             RelativeSizeAxes = Axes.X,
             AutoSizeAxes = Axes.Y,
+            Direction = FillDirection.Vertical,
             Children = new Drawable[]
             {
                 new CountryFilter
                 {
                     Current = Country
+                },
+                spotlightsContainer = new SpotlightsContainer
+                {
+                    Spotlight = { BindTarget = Spotlight }
                 }
             }
         };
 
+        protected override void LoadComplete()
+        {
+            Current.BindValueChanged(onCurrentChanged, true);
+            base.LoadComplete();
+        }
+
+        private void onCurrentChanged(ValueChangedEvent<RankingsScope> scope) =>
+            spotlightsContainer.FadeTo(scope.NewValue == RankingsScope.Spotlights ? 1 : 0, 200, Easing.OutQuint);
+
         private class RankingsTitle : ScreenTitle
         {
             public readonly Bindable<RankingsScope> Scope = new Bindable<RankingsScope>();
@@ -58,5 +81,47 @@ namespace osu.Game.Overlays.Rankings
 
             protected override Drawable CreateIcon() => new ScreenTitleTextureIcon(@"Icons/rankings");
         }
+
+        private class SpotlightsContainer : CompositeDrawable
+        {
+            public readonly Bindable<Spotlight> Spotlight = new Bindable<Spotlight>();
+
+            public IEnumerable<Spotlight> Spotlights
+            {
+                get => dropdown.Items;
+                set => dropdown.Items = value;
+            }
+
+            private readonly OsuDropdown<Spotlight> dropdown;
+            private readonly Box background;
+
+            public SpotlightsContainer()
+            {
+                Height = 100;
+                RelativeSizeAxes = Axes.X;
+                InternalChildren = new Drawable[]
+                {
+                    background = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                    },
+                    dropdown = new OsuDropdown<Spotlight>
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        RelativeSizeAxes = Axes.X,
+                        Width = 0.8f,
+                        Current = Spotlight,
+                        Y = 20,
+                    }
+                };
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                background.Colour = colourProvider.Dark3;
+            }
+        }
     }
 }

From 3b6ed3fb2756a9a61fff3c4174c03aed36aa5f69 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 3 Feb 2020 20:53:30 +0300
Subject: [PATCH 0182/1142] Use new header in the RankingsOverlay

---
 osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs | 3 ++-
 osu.Game/Overlays/RankingsOverlay.cs                     | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
index 568e36df4c..a769ebe4a9 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
@@ -25,7 +25,8 @@ namespace osu.Game.Tests.Visual.Online
             typeof(TableRowBackground),
             typeof(UserBasedTable),
             typeof(RankingsTable<>),
-            typeof(RankingsOverlay)
+            typeof(RankingsOverlay),
+            typeof(RankingsOverlayHeader)
         };
 
         [Cached]
diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index 1ab18b8c15..4a463e431c 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -55,12 +55,13 @@ namespace osu.Game.Overlays
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            new RankingsHeader
+                            new RankingsOverlayHeader
                             {
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
+                                Depth = -float.MaxValue,
                                 Country = { BindTarget = Country },
-                                Scope = { BindTarget = Scope },
+                                Current = { BindTarget = Scope },
                                 Ruleset = { BindTarget = ruleset }
                             },
                             new Container

From 2a802307e7b2b38e87765ea8eb3378c4329126cc Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 3 Feb 2020 20:59:08 +0300
Subject: [PATCH 0183/1142] Delete unused components

---
 .../TestSceneRankingsDismissableFlag.cs       |  66 ---------
 .../Visual/Online/TestSceneRankingsHeader.cs  |   1 +
 .../Online/TestSceneRankingsHeaderTitle.cs    |  55 --------
 .../TestSceneRankingsRulesetSelector.cs       |  41 ------
 .../Online/TestSceneRankingsScopeSelector.cs  |  54 --------
 osu.Game/Overlays/Rankings/DismissableFlag.cs |  55 --------
 osu.Game/Overlays/Rankings/HeaderTitle.cs     |  91 ------------
 osu.Game/Overlays/Rankings/RankingsHeader.cs  | 129 ------------------
 .../Rankings/RankingsOverlayHeader.cs         |   8 ++
 .../Rankings/RankingsRulesetSelector.cs       |  56 --------
 .../Rankings/RankingsScopeSelector.cs         |  26 ----
 11 files changed, 9 insertions(+), 573 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/Online/TestSceneRankingsDismissableFlag.cs
 delete mode 100644 osu.Game.Tests/Visual/Online/TestSceneRankingsHeaderTitle.cs
 delete mode 100644 osu.Game.Tests/Visual/Online/TestSceneRankingsRulesetSelector.cs
 delete mode 100644 osu.Game.Tests/Visual/Online/TestSceneRankingsScopeSelector.cs
 delete mode 100644 osu.Game/Overlays/Rankings/DismissableFlag.cs
 delete mode 100644 osu.Game/Overlays/Rankings/HeaderTitle.cs
 delete mode 100644 osu.Game/Overlays/Rankings/RankingsHeader.cs
 delete mode 100644 osu.Game/Overlays/Rankings/RankingsRulesetSelector.cs
 delete mode 100644 osu.Game/Overlays/Rankings/RankingsScopeSelector.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsDismissableFlag.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsDismissableFlag.cs
deleted file mode 100644
index cd954cd6bd..0000000000
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsDismissableFlag.cs
+++ /dev/null
@@ -1,66 +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 System;
-using System.Collections.Generic;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Overlays.Rankings;
-using osu.Game.Users;
-using osuTK;
-
-namespace osu.Game.Tests.Visual.Online
-{
-    public class TestSceneRankingsDismissableFlag : OsuTestScene
-    {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(DismissableFlag),
-        };
-
-        public TestSceneRankingsDismissableFlag()
-        {
-            DismissableFlag flag;
-            SpriteText text;
-
-            var countryA = new Country
-            {
-                FlagName = "BY",
-                FullName = "Belarus"
-            };
-
-            var countryB = new Country
-            {
-                FlagName = "US",
-                FullName = "United States"
-            };
-
-            AddRange(new Drawable[]
-            {
-                flag = new DismissableFlag
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Size = new Vector2(30, 20),
-                    Country = countryA,
-                },
-                text = new OsuSpriteText
-                {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
-                    Text = "Invoked",
-                    Font = OsuFont.GetFont(size: 30),
-                    Alpha = 0,
-                }
-            });
-
-            flag.Action += () => text.FadeIn().Then().FadeOut(1000, Easing.OutQuint);
-
-            AddStep("Trigger click", () => flag.Click());
-            AddStep("Change to country 2", () => flag.Country = countryB);
-            AddStep("Change to country 1", () => flag.Country = countryA);
-        }
-    }
-}
diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs
index 9837ae251d..898e461bde 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs
@@ -18,6 +18,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             typeof(RankingsOverlayHeader),
             typeof(CountryFilter),
+            typeof(CountryPill)
         };
 
         [Cached]
diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsHeaderTitle.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsHeaderTitle.cs
deleted file mode 100644
index 0edf104da0..0000000000
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsHeaderTitle.cs
+++ /dev/null
@@ -1,55 +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 System;
-using System.Collections.Generic;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Game.Overlays.Rankings;
-using osu.Game.Users;
-
-namespace osu.Game.Tests.Visual.Online
-{
-    public class TestSceneRankingsHeaderTitle : OsuTestScene
-    {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(DismissableFlag),
-            typeof(HeaderTitle),
-        };
-
-        public TestSceneRankingsHeaderTitle()
-        {
-            var countryBindable = new Bindable<Country>();
-            var scope = new Bindable<RankingsScope>();
-
-            Add(new HeaderTitle
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Country = { BindTarget = countryBindable },
-                Scope = { BindTarget = scope },
-            });
-
-            var countryA = new Country
-            {
-                FlagName = "BY",
-                FullName = "Belarus"
-            };
-
-            var countryB = new Country
-            {
-                FlagName = "US",
-                FullName = "United States"
-            };
-
-            AddStep("Set country 1", () => countryBindable.Value = countryA);
-            AddStep("Set country 2", () => countryBindable.Value = countryB);
-            AddStep("Set null country", () => countryBindable.Value = null);
-            AddStep("Set scope to Performance", () => scope.Value = RankingsScope.Performance);
-            AddStep("Set scope to Spotlights", () => scope.Value = RankingsScope.Spotlights);
-            AddStep("Set scope to Score", () => scope.Value = RankingsScope.Score);
-            AddStep("Set scope to Country", () => scope.Value = RankingsScope.Country);
-        }
-    }
-}
diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsRulesetSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsRulesetSelector.cs
deleted file mode 100644
index 84515bd3a4..0000000000
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsRulesetSelector.cs
+++ /dev/null
@@ -1,41 +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 System;
-using System.Collections.Generic;
-using osu.Game.Overlays.Rankings;
-using osu.Framework.Graphics;
-using osu.Game.Rulesets;
-using osu.Framework.Bindables;
-using osu.Game.Rulesets.Osu;
-using osu.Game.Rulesets.Mania;
-using osu.Game.Rulesets.Taiko;
-using osu.Game.Rulesets.Catch;
-
-namespace osu.Game.Tests.Visual.Online
-{
-    public class TestSceneRankingsRulesetSelector : OsuTestScene
-    {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(RankingsRulesetSelector),
-        };
-
-        public TestSceneRankingsRulesetSelector()
-        {
-            var current = new Bindable<RulesetInfo>();
-
-            Add(new RankingsRulesetSelector
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Current = { BindTarget = current }
-            });
-
-            AddStep("Select osu!", () => current.Value = new OsuRuleset().RulesetInfo);
-            AddStep("Select mania", () => current.Value = new ManiaRuleset().RulesetInfo);
-            AddStep("Select taiko", () => current.Value = new TaikoRuleset().RulesetInfo);
-            AddStep("Select catch", () => current.Value = new CatchRuleset().RulesetInfo);
-        }
-    }
-}
diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsScopeSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsScopeSelector.cs
deleted file mode 100644
index 3693d6b5b4..0000000000
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsScopeSelector.cs
+++ /dev/null
@@ -1,54 +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 System;
-using System.Collections.Generic;
-using osu.Framework.Graphics;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Allocation;
-using osu.Game.Graphics;
-using osu.Game.Overlays.Rankings;
-
-namespace osu.Game.Tests.Visual.Online
-{
-    public class TestSceneRankingsScopeSelector : OsuTestScene
-    {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(RankingsScopeSelector),
-        };
-
-        private readonly Box background;
-
-        public TestSceneRankingsScopeSelector()
-        {
-            var scope = new Bindable<RankingsScope>();
-
-            AddRange(new Drawable[]
-            {
-                background = new Box
-                {
-                    RelativeSizeAxes = Axes.Both
-                },
-                new RankingsScopeSelector
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Current = scope,
-                }
-            });
-
-            AddStep(@"Select country", () => scope.Value = RankingsScope.Country);
-            AddStep(@"Select performance", () => scope.Value = RankingsScope.Performance);
-            AddStep(@"Select score", () => scope.Value = RankingsScope.Score);
-            AddStep(@"Select spotlights", () => scope.Value = RankingsScope.Spotlights);
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            background.Colour = colours.GreySeafoam;
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Rankings/DismissableFlag.cs b/osu.Game/Overlays/Rankings/DismissableFlag.cs
deleted file mode 100644
index 7a55b0bba6..0000000000
--- a/osu.Game/Overlays/Rankings/DismissableFlag.cs
+++ /dev/null
@@ -1,55 +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.Graphics;
-using osu.Framework.Graphics.Sprites;
-using osu.Game.Users.Drawables;
-using osuTK.Graphics;
-using osuTK;
-using osu.Framework.Input.Events;
-using System;
-
-namespace osu.Game.Overlays.Rankings
-{
-    public class DismissableFlag : UpdateableFlag
-    {
-        private const int duration = 200;
-
-        public Action Action;
-
-        private readonly SpriteIcon hoverIcon;
-
-        public DismissableFlag()
-        {
-            AddInternal(hoverIcon = new SpriteIcon
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Depth = -1,
-                Alpha = 0,
-                Size = new Vector2(10),
-                Icon = FontAwesome.Solid.Times,
-            });
-        }
-
-        protected override bool OnHover(HoverEvent e)
-        {
-            hoverIcon.FadeIn(duration, Easing.OutQuint);
-            this.FadeColour(Color4.Gray, duration, Easing.OutQuint);
-            return base.OnHover(e);
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            base.OnHoverLost(e);
-            hoverIcon.FadeOut(duration, Easing.OutQuint);
-            this.FadeColour(Color4.White, duration, Easing.OutQuint);
-        }
-
-        protected override bool OnClick(ClickEvent e)
-        {
-            Action?.Invoke();
-            return true;
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Rankings/HeaderTitle.cs b/osu.Game/Overlays/Rankings/HeaderTitle.cs
deleted file mode 100644
index b08a2a3900..0000000000
--- a/osu.Game/Overlays/Rankings/HeaderTitle.cs
+++ /dev/null
@@ -1,91 +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.Bindables;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
-using osu.Game.Users;
-using osu.Framework.Graphics;
-using osuTK;
-using osu.Game.Graphics;
-using osu.Framework.Allocation;
-using osu.Game.Graphics.Sprites;
-
-namespace osu.Game.Overlays.Rankings
-{
-    public class HeaderTitle : CompositeDrawable
-    {
-        private const int spacing = 10;
-        private const int flag_margin = 5;
-        private const int text_size = 40;
-
-        public readonly Bindable<RankingsScope> Scope = new Bindable<RankingsScope>();
-        public readonly Bindable<Country> Country = new Bindable<Country>();
-
-        private readonly SpriteText scopeText;
-        private readonly DismissableFlag flag;
-
-        public HeaderTitle()
-        {
-            AutoSizeAxes = Axes.Both;
-            InternalChild = new FillFlowContainer
-            {
-                AutoSizeAxes = Axes.Both,
-                Direction = FillDirection.Horizontal,
-                Spacing = new Vector2(spacing, 0),
-                Children = new Drawable[]
-                {
-                    flag = new DismissableFlag
-                    {
-                        Anchor = Anchor.BottomLeft,
-                        Origin = Anchor.BottomLeft,
-                        Margin = new MarginPadding { Bottom = flag_margin },
-                        Size = new Vector2(30, 20),
-                    },
-                    scopeText = new OsuSpriteText
-                    {
-                        Anchor = Anchor.BottomLeft,
-                        Origin = Anchor.BottomLeft,
-                        Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Light)
-                    },
-                    new OsuSpriteText
-                    {
-                        Anchor = Anchor.BottomLeft,
-                        Origin = Anchor.BottomLeft,
-                        Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Light),
-                        Text = @"Ranking"
-                    }
-                }
-            };
-
-            flag.Action += () => Country.Value = null;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            scopeText.Colour = colours.Lime;
-        }
-
-        protected override void LoadComplete()
-        {
-            Scope.BindValueChanged(onScopeChanged, true);
-            Country.BindValueChanged(onCountryChanged, true);
-            base.LoadComplete();
-        }
-
-        private void onScopeChanged(ValueChangedEvent<RankingsScope> scope) => scopeText.Text = scope.NewValue.ToString();
-
-        private void onCountryChanged(ValueChangedEvent<Country> country)
-        {
-            if (country.NewValue == null)
-            {
-                flag.Hide();
-                return;
-            }
-
-            flag.Country = country.NewValue;
-            flag.Show();
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Rankings/RankingsHeader.cs b/osu.Game/Overlays/Rankings/RankingsHeader.cs
deleted file mode 100644
index 6aa3e75df9..0000000000
--- a/osu.Game/Overlays/Rankings/RankingsHeader.cs
+++ /dev/null
@@ -1,129 +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.Graphics.Containers;
-using osu.Framework.Graphics;
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Game.Rulesets;
-using osu.Game.Users;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Textures;
-using osuTK;
-using osu.Game.Graphics.UserInterface;
-using System.Collections.Generic;
-
-namespace osu.Game.Overlays.Rankings
-{
-    public class RankingsHeader : CompositeDrawable
-    {
-        private const int content_height = 250;
-
-        public IEnumerable<Spotlight> Spotlights
-        {
-            get => dropdown.Items;
-            set => dropdown.Items = value;
-        }
-
-        public readonly Bindable<RankingsScope> Scope = new Bindable<RankingsScope>();
-        public readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
-        public readonly Bindable<Country> Country = new Bindable<Country>();
-        public readonly Bindable<Spotlight> Spotlight = new Bindable<Spotlight>();
-
-        private readonly OsuDropdown<Spotlight> dropdown;
-
-        public RankingsHeader()
-        {
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
-
-            AddInternal(new FillFlowContainer
-            {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                Children = new Drawable[]
-                {
-                    new RankingsRulesetSelector
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
-                        Current = Ruleset
-                    },
-                    new Container
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
-                        RelativeSizeAxes = Axes.X,
-                        Height = content_height,
-                        Children = new Drawable[]
-                        {
-                            new Container
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Masking = true,
-                                Child = new HeaderBackground(),
-                            },
-                            new FillFlowContainer
-                            {
-                                AutoSizeAxes = Axes.Y,
-                                RelativeSizeAxes = Axes.X,
-                                Direction = FillDirection.Vertical,
-                                Spacing = new Vector2(0, 20),
-                                Children = new Drawable[]
-                                {
-                                    new RankingsScopeSelector
-                                    {
-                                        Margin = new MarginPadding { Top = 10 },
-                                        Current = Scope
-                                    },
-                                    new HeaderTitle
-                                    {
-                                        Anchor = Anchor.TopCentre,
-                                        Origin = Anchor.TopCentre,
-                                        Margin = new MarginPadding { Top = 10 },
-                                        Scope = { BindTarget = Scope },
-                                        Country = { BindTarget = Country },
-                                    },
-                                    dropdown = new OsuDropdown<Spotlight>
-                                    {
-                                        Anchor = Anchor.TopCentre,
-                                        Origin = Anchor.TopCentre,
-                                        RelativeSizeAxes = Axes.X,
-                                        Width = 0.8f,
-                                        Current = Spotlight,
-                                    }
-                                }
-                            },
-                        }
-                    }
-                }
-            });
-        }
-
-        protected override void LoadComplete()
-        {
-            Scope.BindValueChanged(onScopeChanged, true);
-            base.LoadComplete();
-        }
-
-        private void onScopeChanged(ValueChangedEvent<RankingsScope> scope) =>
-            dropdown.FadeTo(scope.NewValue == RankingsScope.Spotlights ? 1 : 0, 200, Easing.OutQuint);
-
-        private class HeaderBackground : Sprite
-        {
-            public HeaderBackground()
-            {
-                Anchor = Anchor.Centre;
-                Origin = Anchor.Centre;
-                RelativeSizeAxes = Axes.Both;
-                FillMode = FillMode.Fill;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(TextureStore textures)
-            {
-                Texture = textures.Get(@"Headers/rankings");
-            }
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
index f6d39c7df4..94afe4e5a5 100644
--- a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
+++ b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
@@ -124,4 +124,12 @@ namespace osu.Game.Overlays.Rankings
             }
         }
     }
+
+    public enum RankingsScope
+    {
+        Performance,
+        Spotlights,
+        Score,
+        Country
+    }
 }
diff --git a/osu.Game/Overlays/Rankings/RankingsRulesetSelector.cs b/osu.Game/Overlays/Rankings/RankingsRulesetSelector.cs
deleted file mode 100644
index 3d25e3995a..0000000000
--- a/osu.Game/Overlays/Rankings/RankingsRulesetSelector.cs
+++ /dev/null
@@ -1,56 +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.UserInterface;
-using osu.Game.Graphics;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Rulesets;
-using osuTK;
-using System.Linq;
-
-namespace osu.Game.Overlays.Rankings
-{
-    public class RankingsRulesetSelector : PageTabControl<RulesetInfo>
-    {
-        protected override TabItem<RulesetInfo> CreateTabItem(RulesetInfo value) => new RankingsTabItem(value);
-
-        protected override Dropdown<RulesetInfo> CreateDropdown() => null;
-
-        public RankingsRulesetSelector()
-        {
-            AutoSizeAxes = Axes.X;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours, RulesetStore rulesets)
-        {
-            foreach (var r in rulesets.AvailableRulesets)
-                AddItem(r);
-
-            AccentColour = colours.Lime;
-
-            SelectTab(TabContainer.FirstOrDefault());
-        }
-
-        protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
-        {
-            AutoSizeAxes = Axes.X,
-            RelativeSizeAxes = Axes.Y,
-            Direction = FillDirection.Horizontal,
-            Spacing = new Vector2(20, 0),
-        };
-
-        private class RankingsTabItem : PageTabItem
-        {
-            public RankingsTabItem(RulesetInfo value)
-                : base(value)
-            {
-            }
-
-            protected override string CreateText() => $"{Value.Name}";
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Rankings/RankingsScopeSelector.cs b/osu.Game/Overlays/Rankings/RankingsScopeSelector.cs
deleted file mode 100644
index 2095bcc61c..0000000000
--- a/osu.Game/Overlays/Rankings/RankingsScopeSelector.cs
+++ /dev/null
@@ -1,26 +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.Game.Graphics.UserInterface;
-using osu.Framework.Allocation;
-using osuTK.Graphics;
-
-namespace osu.Game.Overlays.Rankings
-{
-    public class RankingsScopeSelector : GradientLineTabControl<RankingsScope>
-    {
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            AccentColour = LineColour = Color4.Black;
-        }
-    }
-
-    public enum RankingsScope
-    {
-        Performance,
-        Spotlights,
-        Score,
-        Country
-    }
-}

From f7cbb8c1f7c202e9c4b14cae9357a883d6cb4708 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 3 Feb 2020 21:05:11 +0300
Subject: [PATCH 0184/1142] Recolour RankingsOverlay background

---
 osu.Game/Overlays/RankingsOverlay.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index 4a463e431c..84470d9caa 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -6,7 +6,6 @@ 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.Overlays.Rankings;
 using osu.Game.Users;
 using osu.Game.Rulesets;
@@ -27,6 +26,7 @@ namespace osu.Game.Overlays
         private readonly BasicScrollContainer scrollFlow;
         private readonly Container tableContainer;
         private readonly DimmedLoadingLayer loading;
+        private readonly Box background;
 
         private APIRequest lastRequest;
         private CancellationTokenSource cancellationToken;
@@ -39,10 +39,9 @@ namespace osu.Game.Overlays
         {
             Children = new Drawable[]
             {
-                new Box
+                background = new Box
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = OsuColour.Gray(0.1f),
+                    RelativeSizeAxes = Axes.Both
                 },
                 scrollFlow = new BasicScrollContainer
                 {
@@ -87,6 +86,12 @@ namespace osu.Game.Overlays
             };
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            background.Colour = ColourProvider.Background5;
+        }
+
         protected override void LoadComplete()
         {
             Country.BindValueChanged(_ =>

From 824ee8a8882dacbb18269894739dbedbe2524512 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 3 Feb 2020 21:22:37 +0300
Subject: [PATCH 0185/1142] Recolour rankings tables

---
 .../Visual/Online/TestSceneRankingsTables.cs       |  4 ++++
 osu.Game/Overlays/Rankings/Tables/RankingsTable.cs | 14 +++++++-------
 .../Overlays/Rankings/Tables/TableRowBackground.cs |  7 +++----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs
index 93da2a439e..ab174f303e 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs
@@ -16,6 +16,7 @@ using osu.Game.Rulesets.Mania;
 using osu.Game.Rulesets.Taiko;
 using osu.Game.Rulesets.Catch;
 using osu.Framework.Allocation;
+using osu.Game.Overlays;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -36,6 +37,9 @@ namespace osu.Game.Tests.Visual.Online
         [Resolved]
         private IAPIProvider api { get; set; }
 
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
+
         private readonly BasicScrollContainer scrollFlow;
         private readonly DimmedLoadingLayer loading;
         private CancellationTokenSource cancellationToken;
diff --git a/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs b/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
index f947c5585c..943897581e 100644
--- a/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
+++ b/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Rankings.Tables
 {
     public abstract class RankingsTable<TModel> : TableContainer
     {
-        protected const int TEXT_SIZE = 14;
+        protected const int TEXT_SIZE = 12;
         private const float horizontal_inset = 20;
         private const float row_height = 25;
         private const int items_per_page = 50;
@@ -60,7 +60,7 @@ namespace osu.Game.Overlays.Rankings.Tables
 
         private static TableColumn[] mainHeaders => new[]
         {
-            new TableColumn(string.Empty, Anchor.Centre, new Dimension(GridSizeMode.Absolute, 50)), // place
+            new TableColumn(string.Empty, Anchor.Centre, new Dimension(GridSizeMode.Absolute, 40)), // place
             new TableColumn(string.Empty, Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed)), // flag and username (country name)
         };
 
@@ -77,7 +77,7 @@ namespace osu.Game.Overlays.Rankings.Tables
         private OsuSpriteText createIndexDrawable(int index) => new OsuSpriteText
         {
             Text = $"#{index + 1}",
-            Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.Bold)
+            Font = OsuFont.GetFont(size: TEXT_SIZE, weight: FontWeight.SemiBold)
         };
 
         private FillFlowContainer createMainContent(TModel item) => new FillFlowContainer
@@ -112,10 +112,10 @@ namespace osu.Game.Overlays.Rankings.Tables
             }
 
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
+            private void load(OverlayColourProvider colourProvider)
             {
                 if (Text != highlighted)
-                    Colour = colours.GreySeafoamLighter;
+                    Colour = colourProvider.Foreground1;
             }
         }
 
@@ -131,9 +131,9 @@ namespace osu.Game.Overlays.Rankings.Tables
         protected class ColoredRowText : RowText
         {
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
+            private void load(OverlayColourProvider colourProvider)
             {
-                Colour = colours.GreySeafoamLighter;
+                Colour = colourProvider.Foreground1;
             }
         }
     }
diff --git a/osu.Game/Overlays/Rankings/Tables/TableRowBackground.cs b/osu.Game/Overlays/Rankings/Tables/TableRowBackground.cs
index 04e1c22dae..fe87a8b3d4 100644
--- a/osu.Game/Overlays/Rankings/Tables/TableRowBackground.cs
+++ b/osu.Game/Overlays/Rankings/Tables/TableRowBackground.cs
@@ -6,7 +6,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
-using osu.Game.Graphics;
 using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Rankings.Tables
@@ -35,10 +34,10 @@ namespace osu.Game.Overlays.Rankings.Tables
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colourProvider)
         {
-            background.Colour = idleColour = colours.GreySeafoam;
-            hoverColour = colours.GreySeafoamLight;
+            background.Colour = idleColour = colourProvider.Background4;
+            hoverColour = colourProvider.Background3;
         }
 
         protected override bool OnHover(HoverEvent e)

From 4abd9cb89ae3fc3c5bf13a633a35a622a67656c5 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 3 Feb 2020 21:45:10 +0300
Subject: [PATCH 0186/1142] Move Enabled/Disabled state logic to the
 OverlayRulesetTabItem

---
 .../BeatmapSet/BeatmapRulesetTabItem.cs       | 13 ----------
 osu.Game/Overlays/OverlayRulesetTabItem.cs    | 26 +++++++++----------
 2 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapRulesetTabItem.cs b/osu.Game/Overlays/BeatmapSet/BeatmapRulesetTabItem.cs
index df159977e6..cb258edced 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapRulesetTabItem.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapRulesetTabItem.cs
@@ -18,8 +18,6 @@ namespace osu.Game.Overlays.BeatmapSet
     {
         public readonly Bindable<BeatmapSetInfo> BeatmapSet = new Bindable<BeatmapSetInfo>();
 
-        public override bool PropagatePositionalInputSubTree => Enabled.Value && !Active.Value && base.PropagatePositionalInputSubTree;
-
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; }
 
@@ -73,17 +71,6 @@ namespace osu.Game.Overlays.BeatmapSet
 
                 Enabled.Value = beatmapsCount > 0;
             }, true);
-
-            Enabled.BindValueChanged(enabled =>
-            {
-                if (enabled.NewValue)
-                {
-                    UpdateState();
-                    return;
-                }
-
-                AccentColour = colourProvider.Foreground1;
-            }, true);
         }
     }
 }
diff --git a/osu.Game/Overlays/OverlayRulesetTabItem.cs b/osu.Game/Overlays/OverlayRulesetTabItem.cs
index 5e6ac57886..1f0beffe78 100644
--- a/osu.Game/Overlays/OverlayRulesetTabItem.cs
+++ b/osu.Game/Overlays/OverlayRulesetTabItem.cs
@@ -17,6 +17,8 @@ namespace osu.Game.Overlays
 {
     public class OverlayRulesetTabItem : TabItem<RulesetInfo>
     {
+        public override bool PropagatePositionalInputSubTree => Enabled.Value && !Active.Value && base.PropagatePositionalInputSubTree;
+
         private Color4 accentColour;
 
         protected virtual Color4 AccentColour
@@ -61,37 +63,35 @@ namespace osu.Game.Overlays
             Enabled.Value = true;
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        protected override void LoadComplete()
         {
-            UpdateState();
+            base.LoadComplete();
+            Enabled.BindValueChanged(_ => updateState(), true);
         }
 
         protected override bool OnHover(HoverEvent e)
         {
             base.OnHover(e);
-            UpdateState();
+            updateState();
             return true;
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
             base.OnHoverLost(e);
-            UpdateState();
+            updateState();
         }
 
-        protected override void OnActivated() => UpdateState();
+        protected override void OnActivated() => updateState();
 
-        protected override void OnDeactivated() => UpdateState();
+        protected override void OnDeactivated() => updateState();
 
-        protected void UpdateState()
+        private void updateState()
         {
             text.Font = text.Font.With(weight: Active.Value ? FontWeight.Bold : FontWeight.Medium);
-
-            if (!Enabled.Value)
-                return;
-
-            AccentColour = IsHovered || Active.Value ? Color4.White : colourProvider.Highlight1;
+            AccentColour = IsHovered || Active.Value ? Color4.White : getStateColour();
         }
+
+        private Color4 getStateColour() => Enabled.Value ? colourProvider.Highlight1 : colourProvider.Foreground1;
     }
 }

From e42b95974a9d9b9071faabde678d28754bde8d99 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 3 Feb 2020 21:49:21 +0300
Subject: [PATCH 0187/1142] Fix failing test scene

---
 osu.Game/Overlays/NewsOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index 6dde300556..71c205ff63 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Overlays
                 },
             };
 
-            header.Current.BindTo(Current);
+            header.Post.BindTo(Current);
             Current.TriggerChange();
         }
 

From 26a9d60437d706ab993354d4a39630548a3d5c38 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Mon, 3 Feb 2020 23:17:10 +0300
Subject: [PATCH 0188/1142] Avoid exposing whenever possible

---
 .../Visual/Gameplay/TestSceneHUDOverlay.cs    | 45 ++++++-------------
 1 file changed, 13 insertions(+), 32 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index 2bafcc1197..b7d4c0be21 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -15,9 +15,11 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneHUDOverlay : ManualInputManagerTestScene
     {
-        private TestHUDOverlay hudOverlay;
+        private HUDOverlay hudOverlay;
 
-        private Drawable hideTarget => hudOverlay.KeyCounter; // best way of checking hideTargets without exposing.
+        // best way to check without exposing.
+        private Drawable hideTarget => hudOverlay.KeyCounter;
+        private FillFlowContainer<KeyCounter> keyCounterFlow => (FillFlowContainer<KeyCounter>)hudOverlay.KeyCounter.Child.Parent;
 
         [Resolved]
         private OsuConfigManager config { get; set; }
@@ -30,7 +32,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("showhud is set", () => hudOverlay.ShowHud.Value);
 
             AddAssert("hidetarget is visible", () => hideTarget.IsPresent);
-            AddAssert("key counter flow is visible", () => hudOverlay.KeyCounter.KeyFlow.IsPresent);
+            AddAssert("key counter flow is visible", () => keyCounterFlow.IsPresent);
             AddAssert("pause button is visible", () => hudOverlay.HoldToQuit.IsPresent);
         }
 
@@ -55,7 +57,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("pause button is still visible", () => hudOverlay.HoldToQuit.IsPresent);
 
             // Key counter flow container should not be affected by this, only the key counter display will be hidden as checked above.
-            AddAssert("key counter flow not affected", () => hudOverlay.KeyCounter.KeyFlow.IsPresent);
+            AddAssert("key counter flow not affected", () => keyCounterFlow.IsPresent);
         }
 
         [Test]
@@ -90,47 +92,26 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep("set showhud false", () => hudOverlay.ShowHud.Value = false);
             AddUntilStep("hidetarget is hidden", () => !hideTarget.IsPresent);
-            AddAssert("key counters hidden", () => !hudOverlay.KeyCounter.KeyFlow.IsPresent);
+            AddAssert("key counters hidden", () => !keyCounterFlow.IsPresent);
 
             AddStep("set showhud true", () => hudOverlay.ShowHud.Value = true);
             AddUntilStep("hidetarget is visible", () => hideTarget.IsPresent);
-            AddAssert("key counters still hidden", () => !hudOverlay.KeyCounter.KeyFlow.IsPresent);
+            AddAssert("key counters still hidden", () => !keyCounterFlow.IsPresent);
 
             AddStep("return value", () => config.Set<bool>(OsuSetting.KeyOverlay, keyCounterVisibleValue));
         }
 
-        private void createNew(Action<TestHUDOverlay> action = null)
+        private void createNew(Action<HUDOverlay> action = null)
         {
             AddStep("create overlay", () =>
             {
-                Child = hudOverlay = new TestHUDOverlay();
+                Child = hudOverlay = new HUDOverlay(null, null, null, Array.Empty<Mod>());
+
+                // Add any key just to display the key counter visually.
+                hudOverlay.KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
 
                 action?.Invoke(hudOverlay);
             });
         }
-
-        private class TestHUDOverlay : HUDOverlay
-        {
-            public new TestKeyCounterDisplay KeyCounter => (TestKeyCounterDisplay)base.KeyCounter;
-
-            protected override KeyCounterDisplay CreateKeyCounter() => new TestKeyCounterDisplay
-            {
-                Anchor = Anchor.BottomRight,
-                Origin = Anchor.BottomRight,
-                Margin = new MarginPadding(10),
-            };
-
-            public TestHUDOverlay()
-                : base(null, null, null, Array.Empty<Mod>())
-            {
-                // Add any key just to display the key counter visually.
-                KeyCounter.Add(new KeyCounterKeyboard(Key.Space));
-            }
-        }
-
-        private class TestKeyCounterDisplay : KeyCounterDisplay
-        {
-            public new FillFlowContainer<KeyCounter> KeyFlow => base.KeyFlow;
-        }
     }
 }

From 0ccbffde8d9b7d114eb9d88e6ee2a1441f4fd35a Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Mon, 3 Feb 2020 23:43:04 +0300
Subject: [PATCH 0189/1142] Use ChildrenOfType instead

---
 osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index b7d4c0be21..fc03dc6ed3 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -2,10 +2,12 @@
 // 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.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play;
@@ -19,7 +21,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         // best way to check without exposing.
         private Drawable hideTarget => hudOverlay.KeyCounter;
-        private FillFlowContainer<KeyCounter> keyCounterFlow => (FillFlowContainer<KeyCounter>)hudOverlay.KeyCounter.Child.Parent;
+        private FillFlowContainer<KeyCounter> keyCounterFlow => hudOverlay.KeyCounter.ChildrenOfType<FillFlowContainer<KeyCounter>>().First();
 
         [Resolved]
         private OsuConfigManager config { get; set; }

From fe078c244d2d0e11fd449355cefd9ed6f2233c1e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 4 Feb 2020 00:43:04 +0300
Subject: [PATCH 0190/1142] Expose TabControlOverlayHeader.Current value

---
 osu.Game/Overlays/Changelog/ChangelogHeader.cs | 18 +++++++++---------
 osu.Game/Overlays/ChangelogOverlay.cs          |  2 +-
 osu.Game/Overlays/News/NewsHeader.cs           | 10 +++++-----
 osu.Game/Overlays/NewsOverlay.cs               |  2 +-
 osu.Game/Overlays/TabControlOverlayHeader.cs   | 17 +++++++++++++++--
 5 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Overlays/Changelog/ChangelogHeader.cs b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
index 4165a180da..8663ec586b 100644
--- a/osu.Game/Overlays/Changelog/ChangelogHeader.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Changelog
 {
     public class ChangelogHeader : BreadcrumbControlOverlayHeader
     {
-        public readonly Bindable<APIChangelogBuild> Current = new Bindable<APIChangelogBuild>();
+        public readonly Bindable<APIChangelogBuild> Build = new Bindable<APIChangelogBuild>();
 
         public Action ListingSelected;
 
@@ -25,18 +25,18 @@ namespace osu.Game.Overlays.Changelog
         public ChangelogHeader()
         {
             TabControl.AddItem(listing_string);
-            TabControl.Current.ValueChanged += e =>
+            Current.ValueChanged += e =>
             {
                 if (e.NewValue == listing_string)
                     ListingSelected?.Invoke();
             };
 
-            Current.ValueChanged += showBuild;
+            Build.ValueChanged += showBuild;
 
             Streams.Current.ValueChanged += e =>
             {
-                if (e.NewValue?.LatestBuild != null && !e.NewValue.Equals(Current.Value?.UpdateStream))
-                    Current.Value = e.NewValue.LatestBuild;
+                if (e.NewValue?.LatestBuild != null && !e.NewValue.Equals(Build.Value?.UpdateStream))
+                    Build.Value = e.NewValue.LatestBuild;
             };
         }
 
@@ -50,7 +50,7 @@ namespace osu.Game.Overlays.Changelog
             if (e.NewValue != null)
             {
                 TabControl.AddItem(e.NewValue.ToString());
-                TabControl.Current.Value = e.NewValue.ToString();
+                Current.Value = e.NewValue.ToString();
 
                 updateCurrentStream();
 
@@ -58,7 +58,7 @@ namespace osu.Game.Overlays.Changelog
             }
             else
             {
-                TabControl.Current.Value = listing_string;
+                Current.Value = listing_string;
                 Streams.Current.Value = null;
                 title.Version = null;
             }
@@ -86,10 +86,10 @@ namespace osu.Game.Overlays.Changelog
 
         private void updateCurrentStream()
         {
-            if (Current.Value == null)
+            if (Build.Value == null)
                 return;
 
-            Streams.Current.Value = Streams.Items.FirstOrDefault(s => s.Name == Current.Value.UpdateStream.Name);
+            Streams.Current.Value = Streams.Items.FirstOrDefault(s => s.Name == Build.Value.UpdateStream.Name);
         }
 
         private class ChangelogHeaderTitle : ScreenTitle
diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index 90ba206077..6a8cb29d3e 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Overlays
 
             sampleBack = audio.Samples.Get(@"UI/generic-select-soft");
 
-            Header.Current.BindTo(Current);
+            Header.Build.BindTo(Current);
 
             Current.BindValueChanged(e =>
             {
diff --git a/osu.Game/Overlays/News/NewsHeader.cs b/osu.Game/Overlays/News/NewsHeader.cs
index b525ba7a82..b55e3ffba0 100644
--- a/osu.Game/Overlays/News/NewsHeader.cs
+++ b/osu.Game/Overlays/News/NewsHeader.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.News
 
         private NewsHeaderTitle title;
 
-        public readonly Bindable<string> Current = new Bindable<string>(null);
+        public readonly Bindable<string> Post = new Bindable<string>(null);
 
         public Action ShowFrontPage;
 
@@ -22,13 +22,13 @@ namespace osu.Game.Overlays.News
         {
             TabControl.AddItem(front_page_string);
 
-            TabControl.Current.ValueChanged += e =>
+            Current.ValueChanged += e =>
             {
                 if (e.NewValue == front_page_string)
                     ShowFrontPage?.Invoke();
             };
 
-            Current.ValueChanged += showPost;
+            Post.ValueChanged += showPost;
         }
 
         private void showPost(ValueChangedEvent<string> e)
@@ -39,13 +39,13 @@ namespace osu.Game.Overlays.News
             if (e.NewValue != null)
             {
                 TabControl.AddItem(e.NewValue);
-                TabControl.Current.Value = e.NewValue;
+                Current.Value = e.NewValue;
 
                 title.IsReadingPost = true;
             }
             else
             {
-                TabControl.Current.Value = front_page_string;
+                Current.Value = front_page_string;
                 title.IsReadingPost = false;
             }
         }
diff --git a/osu.Game/Overlays/NewsOverlay.cs b/osu.Game/Overlays/NewsOverlay.cs
index 6dde300556..71c205ff63 100644
--- a/osu.Game/Overlays/NewsOverlay.cs
+++ b/osu.Game/Overlays/NewsOverlay.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Overlays
                 },
             };
 
-            header.Current.BindTo(Current);
+            header.Post.BindTo(Current);
             Current.TriggerChange();
         }
 
diff --git a/osu.Game/Overlays/TabControlOverlayHeader.cs b/osu.Game/Overlays/TabControlOverlayHeader.cs
index b410739b25..dff5a17bd8 100644
--- a/osu.Game/Overlays/TabControlOverlayHeader.cs
+++ b/osu.Game/Overlays/TabControlOverlayHeader.cs
@@ -3,6 +3,7 @@
 
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -17,10 +18,18 @@ namespace osu.Game.Overlays
     /// An overlay header which contains a <see cref="OsuTabControl{T}"/>.
     /// </summary>
     /// <typeparam name="T">The type of item to be represented by tabs.</typeparam>
-    public abstract class TabControlOverlayHeader<T> : OverlayHeader
+    public abstract class TabControlOverlayHeader<T> : OverlayHeader, IHasCurrentValue<T>
     {
         protected OsuTabControl<T> TabControl;
 
+        private readonly BindableWithCurrent<T> current = new BindableWithCurrent<T>();
+
+        public Bindable<T> Current
+        {
+            get => current.Current;
+            set => current.Current = value;
+        }
+
         private readonly Box controlBackground;
 
         protected TabControlOverlayHeader()
@@ -35,7 +44,11 @@ namespace osu.Game.Overlays
                     {
                         RelativeSizeAxes = Axes.Both,
                     },
-                    TabControl = CreateTabControl().With(control => control.Margin = new MarginPadding { Left = UserProfileOverlay.CONTENT_X_MARGIN })
+                    TabControl = CreateTabControl().With(control =>
+                    {
+                        control.Margin = new MarginPadding { Left = UserProfileOverlay.CONTENT_X_MARGIN };
+                        control.Current = current;
+                    })
                 }
             });
         }

From 5950ba3656914e9c667ebd6764ca55905935745a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 4 Feb 2020 00:55:41 +0300
Subject: [PATCH 0191/1142] Change the order of colour check

---
 osu.Game/Overlays/OverlayRulesetTabItem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/OverlayRulesetTabItem.cs b/osu.Game/Overlays/OverlayRulesetTabItem.cs
index 1f0beffe78..67c458cc5c 100644
--- a/osu.Game/Overlays/OverlayRulesetTabItem.cs
+++ b/osu.Game/Overlays/OverlayRulesetTabItem.cs
@@ -89,9 +89,9 @@ namespace osu.Game.Overlays
         private void updateState()
         {
             text.Font = text.Font.With(weight: Active.Value ? FontWeight.Bold : FontWeight.Medium);
-            AccentColour = IsHovered || Active.Value ? Color4.White : getStateColour();
+            AccentColour = Enabled.Value ? getActiveColour() : colourProvider.Foreground1;
         }
 
-        private Color4 getStateColour() => Enabled.Value ? colourProvider.Highlight1 : colourProvider.Foreground1;
+        private Color4 getActiveColour() => IsHovered || Active.Value ? Color4.White : colourProvider.Highlight1;
     }
 }

From 22e3150f685a6916f0ddc2d689023cb32361598e Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 3 Feb 2020 17:21:06 -0800
Subject: [PATCH 0192/1142] Fix comment and remove magic numbers

---
 osu.Game/Overlays/Mods/ModSelectOverlay.cs | 2 ++
 osu.Game/Screens/Select/SongSelect.cs      | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 2868fe1d79..0813e57dae 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Overlays.Mods
 {
     public class ModSelectOverlay : WaveOverlayContainer
     {
+        public const float HEIGHT = 510;
+
         protected readonly TriangleButton DeselectAllButton;
         protected readonly TriangleButton CustomiseButton;
         protected readonly TriangleButton CloseButton;
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 3f80c90b9d..a5dce9a065 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -223,13 +223,13 @@ namespace osu.Game.Screens.Select
             {
                 AddRangeInternal(new Drawable[]
                 {
-                    new GridContainer // used for max width implementation
+                    new GridContainer // used for max height implementation
                     {
                         RelativeSizeAxes = Axes.Both,
                         RowDimensions = new[]
                         {
                             new Dimension(),
-                            new Dimension(GridSizeMode.Relative, 1f, maxSize: 560),
+                            new Dimension(GridSizeMode.Relative, 1f, maxSize: ModSelectOverlay.HEIGHT + Footer.HEIGHT),
                         },
                         Content = new[]
                         {

From ddf9317bec9113ac89ac3ad7fc12d356d5cc070c Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Tue, 4 Feb 2020 08:25:01 +0700
Subject: [PATCH 0193/1142] Replace `:P2` with `:0.00%`

---
 osu.Game/Scoring/ScoreInfo.cs    | 2 +-
 osu.Game/Users/UserStatistics.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 8787785861..8dc5137818 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Scoring
         public double Accuracy { get; set; }
 
         [JsonIgnore]
-        public string DisplayAccuracy => Accuracy == 1 ? "100%" : $"{Accuracy:P2}";
+        public string DisplayAccuracy => Accuracy == 1 ? "100%" : $"{Accuracy:0.00%}";
 
         [JsonProperty(@"pp")]
         public double? PP { get; set; }
diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs
index 9254eefb60..0f692dd60d 100644
--- a/osu.Game/Users/UserStatistics.cs
+++ b/osu.Game/Users/UserStatistics.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Users
         public decimal Accuracy;
 
         [JsonIgnore]
-        public string DisplayAccuracy => $"{Accuracy:P2}";
+        public string DisplayAccuracy => $"{Accuracy:0.00%}";
 
         [JsonProperty(@"play_count")]
         public int PlayCount;

From 68b3dc01df65551e900bc3762a18c371a841b33d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 4 Feb 2020 12:53:57 +0900
Subject: [PATCH 0194/1142] Move property override below ctor

---
 osu.Game/Overlays/OverlayRulesetTabItem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/OverlayRulesetTabItem.cs b/osu.Game/Overlays/OverlayRulesetTabItem.cs
index 67c458cc5c..9b4dd5ba1e 100644
--- a/osu.Game/Overlays/OverlayRulesetTabItem.cs
+++ b/osu.Game/Overlays/OverlayRulesetTabItem.cs
@@ -17,8 +17,6 @@ namespace osu.Game.Overlays
 {
     public class OverlayRulesetTabItem : TabItem<RulesetInfo>
     {
-        public override bool PropagatePositionalInputSubTree => Enabled.Value && !Active.Value && base.PropagatePositionalInputSubTree;
-
         private Color4 accentColour;
 
         protected virtual Color4 AccentColour
@@ -69,6 +67,8 @@ namespace osu.Game.Overlays
             Enabled.BindValueChanged(_ => updateState(), true);
         }
 
+        public override bool PropagatePositionalInputSubTree => Enabled.Value && !Active.Value && base.PropagatePositionalInputSubTree;
+
         protected override bool OnHover(HoverEvent e)
         {
             base.OnHover(e);

From bc9b499de010fc6f311908db0745d928c153caaf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 4 Feb 2020 12:55:09 +0900
Subject: [PATCH 0195/1142] Make selector only privately-settable

---
 osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
index bf9f3ccc17..e5e3e276d5 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapSetHeader.cs
@@ -11,7 +11,8 @@ namespace osu.Game.Overlays.BeatmapSet
     public class BeatmapSetHeader : OverlayHeader
     {
         public readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
-        public BeatmapRulesetSelector RulesetSelector;
+
+        public BeatmapRulesetSelector RulesetSelector { get; private set; }
 
         protected override ScreenTitle CreateTitle() => new BeatmapHeaderTitle();
 

From a8ce50fadd588f0f6b8aa5b3c6c4624272335fc1 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Tue, 4 Feb 2020 11:17:23 +0700
Subject: [PATCH 0196/1142] Add FormatUtils.FormatAccuracy and usages

---
 osu.Game/Scoring/ScoreInfo.cs    |  3 ++-
 osu.Game/Users/UserStatistics.cs |  3 ++-
 osu.Game/Utils/FormatUtils.cs    | 21 +++++++++++++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game/Utils/FormatUtils.cs

diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index 8dc5137818..bed9104cad 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -13,6 +13,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Users;
+using osu.Game.Utils;
 
 namespace osu.Game.Scoring
 {
@@ -32,7 +33,7 @@ namespace osu.Game.Scoring
         public double Accuracy { get; set; }
 
         [JsonIgnore]
-        public string DisplayAccuracy => Accuracy == 1 ? "100%" : $"{Accuracy:0.00%}";
+        public string DisplayAccuracy => Accuracy.FormatAccuracy();
 
         [JsonProperty(@"pp")]
         public double? PP { get; set; }
diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs
index 0f692dd60d..129c128977 100644
--- a/osu.Game/Users/UserStatistics.cs
+++ b/osu.Game/Users/UserStatistics.cs
@@ -5,6 +5,7 @@ using System;
 using Newtonsoft.Json;
 using osu.Game.Scoring;
 using static osu.Game.Users.User;
+using osu.Game.Utils;
 
 namespace osu.Game.Users
 {
@@ -44,7 +45,7 @@ namespace osu.Game.Users
         public decimal Accuracy;
 
         [JsonIgnore]
-        public string DisplayAccuracy => $"{Accuracy:0.00%}";
+        public string DisplayAccuracy => Accuracy.FormatAccuracy();
 
         [JsonProperty(@"play_count")]
         public int PlayCount;
diff --git a/osu.Game/Utils/FormatUtils.cs b/osu.Game/Utils/FormatUtils.cs
new file mode 100644
index 0000000000..f966c09a67
--- /dev/null
+++ b/osu.Game/Utils/FormatUtils.cs
@@ -0,0 +1,21 @@
+namespace osu.Game.Utils
+{
+	public static class FormatUtils
+	{
+		/// <summary>
+        /// Turns the provided accuracy into a percentage with 2 decimal places.
+		/// Omits all decimal places when <paramref name="accuracy"/> equals 1d.
+        /// </summary>
+        /// <param name="accuracy">The accuracy to be formatted</param>
+        /// <returns>formatted accuracy in percentage</returns>
+		public static string FormatAccuracy(this double accuracy) => accuracy == 1 ? "100%" : $"{accuracy:0.00%}";
+
+		/// <summary>
+        /// Turns the provided accuracy into a percentage with 2 decimal places.
+		/// Omits all decimal places when <paramref name="accuracy"/> equals 100m.
+        /// </summary>
+        /// <param name="accuracy">The accuracy to be formatted</param>
+        /// <returns>formatted accuracy in percentage</returns>
+		public static string FormatAccuracy(this decimal accuracy) => accuracy == 100 ? "100%" : $"{accuracy:0.00}%";
+	}
+}
\ No newline at end of file

From 14db81384295ec7e97d9b3bc749fefe01d982da8 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Tue, 4 Feb 2020 11:18:19 +0700
Subject: [PATCH 0197/1142] Add licence header

---
 osu.Game/Utils/FormatUtils.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Utils/FormatUtils.cs b/osu.Game/Utils/FormatUtils.cs
index f966c09a67..7ff0c4f657 100644
--- a/osu.Game/Utils/FormatUtils.cs
+++ b/osu.Game/Utils/FormatUtils.cs
@@ -1,3 +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.
+
 namespace osu.Game.Utils
 {
 	public static class FormatUtils

From 2bbd12e39a235b10b0c7c3b781e5ca9ddbe5413d Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Tue, 4 Feb 2020 11:36:22 +0700
Subject: [PATCH 0198/1142] Fix code formatting

---
 osu.Game/Users/UserStatistics.cs |  2 +-
 osu.Game/Utils/FormatUtils.cs    | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs
index 129c128977..e5e77821ab 100644
--- a/osu.Game/Users/UserStatistics.cs
+++ b/osu.Game/Users/UserStatistics.cs
@@ -4,8 +4,8 @@
 using System;
 using Newtonsoft.Json;
 using osu.Game.Scoring;
-using static osu.Game.Users.User;
 using osu.Game.Utils;
+using static osu.Game.Users.User;
 
 namespace osu.Game.Users
 {
diff --git a/osu.Game/Utils/FormatUtils.cs b/osu.Game/Utils/FormatUtils.cs
index 7ff0c4f657..b3758b3375 100644
--- a/osu.Game/Utils/FormatUtils.cs
+++ b/osu.Game/Utils/FormatUtils.cs
@@ -3,22 +3,22 @@
 
 namespace osu.Game.Utils
 {
-	public static class FormatUtils
-	{
-		/// <summary>
+    public static class FormatUtils
+    {
+        /// <summary>
         /// Turns the provided accuracy into a percentage with 2 decimal places.
-		/// Omits all decimal places when <paramref name="accuracy"/> equals 1d.
+        /// Omits all decimal places when <paramref name="accuracy"/> equals 1d.
         /// </summary>
         /// <param name="accuracy">The accuracy to be formatted</param>
         /// <returns>formatted accuracy in percentage</returns>
-		public static string FormatAccuracy(this double accuracy) => accuracy == 1 ? "100%" : $"{accuracy:0.00%}";
+        public static string FormatAccuracy(this double accuracy) => accuracy == 1 ? "100%" : $"{accuracy:0.00%}";
 
-		/// <summary>
+        /// <summary>
         /// Turns the provided accuracy into a percentage with 2 decimal places.
-		/// Omits all decimal places when <paramref name="accuracy"/> equals 100m.
+        /// Omits all decimal places when <paramref name="accuracy"/> equals 100m.
         /// </summary>
         /// <param name="accuracy">The accuracy to be formatted</param>
         /// <returns>formatted accuracy in percentage</returns>
-		public static string FormatAccuracy(this decimal accuracy) => accuracy == 100 ? "100%" : $"{accuracy:0.00}%";
-	}
-}
\ No newline at end of file
+        public static string FormatAccuracy(this decimal accuracy) => accuracy == 100 ? "100%" : $"{accuracy:0.00}%";
+    }
+}

From b6cfb987f327304cfee25efbf4134866794e6925 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 4 Feb 2020 17:00:36 +0900
Subject: [PATCH 0199/1142] Make drag handles not pop into existence

---
 osu.Game/Overlays/Music/PlaylistItem.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Music/PlaylistItem.cs b/osu.Game/Overlays/Music/PlaylistItem.cs
index 4ce67c2d66..0f68df737e 100644
--- a/osu.Game/Overlays/Music/PlaylistItem.cs
+++ b/osu.Game/Overlays/Music/PlaylistItem.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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;
@@ -66,6 +66,7 @@ namespace osu.Game.Overlays.Music
                             Origin = Anchor.CentreLeft,
                             Size = new Vector2(12),
                             Colour = colours.Gray5,
+                            AlwaysPresent = true,
                             Alpha = 0
                         },
                         text = new OsuTextFlowContainer

From c3bd6c3f7f5aba82e19273a05971e052d28656de Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 4 Feb 2020 11:21:21 +0300
Subject: [PATCH 0200/1142] Remove no longer used field

---
 osu.Game/Overlays/TabControlOverlayHeader.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Overlays/TabControlOverlayHeader.cs b/osu.Game/Overlays/TabControlOverlayHeader.cs
index d729b9fa9f..b199a2a0cf 100644
--- a/osu.Game/Overlays/TabControlOverlayHeader.cs
+++ b/osu.Game/Overlays/TabControlOverlayHeader.cs
@@ -20,8 +20,6 @@ namespace osu.Game.Overlays
     /// <typeparam name="T">The type of item to be represented by tabs.</typeparam>
     public abstract class TabControlOverlayHeader<T> : OverlayHeader, IHasCurrentValue<T>
     {
-        public readonly Bindable<T> Current = new Bindable<T>();
-
         protected OsuTabControl<T> TabControl;
 
         private readonly BindableWithCurrent<T> current = new BindableWithCurrent<T>();

From 873eda3bb544520239667d5dd79d236261985b86 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 4 Feb 2020 14:00:18 +0300
Subject: [PATCH 0201/1142] Recolour info section

---
 osu.Game/Overlays/BeatmapSet/Info.cs        | 25 ++++++++-------------
 osu.Game/Overlays/BeatmapSet/SuccessRate.cs |  7 +++---
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Info.cs b/osu.Game/Overlays/BeatmapSet/Info.cs
index 16d6236051..d7392b31e1 100644
--- a/osu.Game/Overlays/BeatmapSet/Info.cs
+++ b/osu.Game/Overlays/BeatmapSet/Info.cs
@@ -24,6 +24,7 @@ namespace osu.Game.Overlays.BeatmapSet
         private const float spacing = 20;
 
         private readonly Box successRateBackground;
+        private readonly Box background;
         private readonly SuccessRate successRate;
 
         public readonly Bindable<BeatmapSetInfo> BeatmapSet = new Bindable<BeatmapSetInfo>();
@@ -50,10 +51,9 @@ namespace osu.Game.Overlays.BeatmapSet
 
             Children = new Drawable[]
             {
-                new Box
+                background = new Box
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = Color4.White,
+                    RelativeSizeAxes = Axes.Both
                 },
                 new Container
                 {
@@ -126,14 +126,14 @@ namespace osu.Game.Overlays.BeatmapSet
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colourProvider)
         {
-            successRateBackground.Colour = colours.GrayE;
+            successRateBackground.Colour = colourProvider.Background4;
+            background.Colour = colourProvider.Background5;
         }
 
         private class MetadataSection : FillFlowContainer
         {
-            private readonly OsuSpriteText header;
             private readonly TextFlowContainer textFlow;
 
             public string Text
@@ -148,7 +148,7 @@ namespace osu.Game.Overlays.BeatmapSet
 
                     this.FadeIn(transition_duration);
                     textFlow.Clear();
-                    textFlow.AddText(value, s => s.Font = s.Font.With(size: 14));
+                    textFlow.AddText(value, s => s.Font = s.Font.With(size: 12));
                 }
             }
 
@@ -160,11 +160,10 @@ namespace osu.Game.Overlays.BeatmapSet
 
                 InternalChildren = new Drawable[]
                 {
-                    header = new OsuSpriteText
+                    new OsuSpriteText
                     {
                         Text = title,
-                        Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold),
-                        Shadow = false,
+                        Font = OsuFont.GetFont(size: 14, weight: FontWeight.Black),
                         Margin = new MarginPadding { Top = 20 },
                     },
                     textFlow = new OsuTextFlowContainer
@@ -174,12 +173,6 @@ namespace osu.Game.Overlays.BeatmapSet
                     },
                 };
             }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                header.Colour = textFlow.Colour = colours.Gray5;
-            }
         }
     }
 }
diff --git a/osu.Game/Overlays/BeatmapSet/SuccessRate.cs b/osu.Game/Overlays/BeatmapSet/SuccessRate.cs
index cd81013c30..1dcc847760 100644
--- a/osu.Game/Overlays/BeatmapSet/SuccessRate.cs
+++ b/osu.Game/Overlays/BeatmapSet/SuccessRate.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Overlays.BeatmapSet
         protected readonly FailRetryGraph Graph;
 
         private readonly FillFlowContainer header;
-        private readonly OsuSpriteText successRateLabel, successPercent, graphLabel;
+        private readonly OsuSpriteText successPercent;
         private readonly Bar successRate;
         private readonly Container percentContainer;
 
@@ -60,7 +60,7 @@ namespace osu.Game.Overlays.BeatmapSet
                     Direction = FillDirection.Vertical,
                     Children = new Drawable[]
                     {
-                        successRateLabel = new OsuSpriteText
+                        new OsuSpriteText
                         {
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.TopCentre,
@@ -85,7 +85,7 @@ namespace osu.Game.Overlays.BeatmapSet
                                 Font = OsuFont.GetFont(size: 13),
                             },
                         },
-                        graphLabel = new OsuSpriteText
+                        new OsuSpriteText
                         {
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.TopCentre,
@@ -107,7 +107,6 @@ namespace osu.Game.Overlays.BeatmapSet
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            successRateLabel.Colour = successPercent.Colour = graphLabel.Colour = colours.Gray5;
             successRate.AccentColour = colours.Green;
             successRate.BackgroundColour = colours.GrayD;
 

From 0e54e0e092dd01ca70338b26da74c685a687eec4 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 4 Feb 2020 14:17:22 +0300
Subject: [PATCH 0202/1142] Recolour DrawableTopScore

---
 .../BeatmapSet/Scores/DrawableTopScore.cs     | 28 ++-----------------
 .../Scores/TopScoreStatisticsSection.cs       | 25 ++++++++---------
 .../BeatmapSet/Scores/TopScoreUserSection.cs  | 19 ++++---------
 3 files changed, 20 insertions(+), 52 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs b/osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
index d263483046..e12c977430 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
@@ -7,8 +7,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input.Events;
-using osu.Game.Graphics;
 using osu.Game.Scoring;
 using osuTK;
 using osuTK.Graphics;
@@ -17,11 +15,6 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
 {
     public class DrawableTopScore : CompositeDrawable
     {
-        private const float fade_duration = 100;
-
-        private Color4 backgroundIdleColour;
-        private Color4 backgroundHoveredColour;
-
         private readonly Box background;
 
         public DrawableTopScore(ScoreInfo score, int position = 1)
@@ -30,7 +23,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             AutoSizeAxes = Axes.Y;
 
             Masking = true;
-            CornerRadius = 10;
+            CornerRadius = 5;
             EdgeEffect = new EdgeEffectParameters
             {
                 Type = EdgeEffectType.Shadow,
@@ -84,24 +77,9 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colourProvider)
         {
-            backgroundIdleColour = colours.Gray3;
-            backgroundHoveredColour = colours.Gray4;
-
-            background.Colour = backgroundIdleColour;
-        }
-
-        protected override bool OnHover(HoverEvent e)
-        {
-            background.FadeColour(backgroundHoveredColour, fade_duration, Easing.OutQuint);
-            return base.OnHover(e);
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            background.FadeColour(backgroundIdleColour, fade_duration, Easing.OutQuint);
-            base.OnHoverLost(e);
+            background.Colour = colourProvider.Background4;
         }
 
         private class AutoSizingGrid : GridContainer
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index 4f26e43fb2..9f6e60a547 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -24,8 +24,8 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
     {
         private const float margin = 10;
 
-        private readonly FontUsage smallFont = OsuFont.GetFont(size: 20);
-        private readonly FontUsage largeFont = OsuFont.GetFont(size: 25);
+        private readonly FontUsage smallFont = OsuFont.GetFont(size: 16);
+        private readonly FontUsage largeFont = OsuFont.GetFont(size: 22);
 
         private readonly TextColumn totalScoreColumn;
         private readonly TextColumn accuracyColumn;
@@ -109,6 +109,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
         private class InfoColumn : CompositeDrawable
         {
             private readonly Box separator;
+            private readonly OsuSpriteText text;
 
             public InfoColumn(string title, Drawable content)
             {
@@ -121,9 +122,9 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                     Spacing = new Vector2(0, 2),
                     Children = new[]
                     {
-                        new OsuSpriteText
+                        text = new OsuSpriteText
                         {
-                            Font = OsuFont.GetFont(size: 12, weight: FontWeight.Black),
+                            Font = OsuFont.GetFont(size: 10, weight: FontWeight.Black),
                             Text = title.ToUpper()
                         },
                         separator = new Box
@@ -137,9 +138,9 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             }
 
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
+            private void load(OverlayColourProvider colourProvider)
             {
-                separator.Colour = colours.Gray5;
+                separator.Colour = text.Colour = colourProvider.Foreground1;
             }
         }
 
@@ -189,15 +190,11 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 set
                 {
                     modsContainer.Clear();
-
-                    foreach (Mod mod in value)
+                    modsContainer.Children = value.Select(mod => new ModIcon(mod)
                     {
-                        modsContainer.Add(new ModIcon(mod)
-                        {
-                            AutoSizeAxes = Axes.Both,
-                            Scale = new Vector2(0.3f),
-                        });
-                    }
+                        AutoSizeAxes = Axes.Both,
+                        Scale = new Vector2(0.25f),
+                    }).ToList();
                 }
             }
         }
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
index 38a909411a..afffdd04c4 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.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 osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -51,13 +50,13 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                             {
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
-                                Font = OsuFont.GetFont(size: 24, weight: FontWeight.Bold, italics: true)
+                                Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true)
                             },
                             rank = new UpdateableRank(ScoreRank.D)
                             {
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
-                                Size = new Vector2(40),
+                                Size = new Vector2(28),
                                 FillMode = FillMode.Fit,
                             },
                         }
@@ -66,7 +65,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
-                        Size = new Vector2(80),
+                        Size = new Vector2(70),
                         Masking = true,
                         CornerRadius = 5,
                         EdgeEffect = new EdgeEffectParameters
@@ -87,7 +86,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                         Spacing = new Vector2(0, 3),
                         Children = new Drawable[]
                         {
-                            usernameText = new LinkFlowContainer(s => s.Font = OsuFont.GetFont(size: 20, weight: FontWeight.Bold, italics: true))
+                            usernameText = new LinkFlowContainer(s => s.Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true))
                             {
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.CentreLeft,
@@ -97,13 +96,13 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                             {
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.CentreLeft,
-                                Font = OsuFont.GetFont(size: 15, weight: FontWeight.Bold)
+                                Font = OsuFont.GetFont(size: 10, weight: FontWeight.Bold)
                             },
                             flag = new UpdateableFlag
                             {
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.CentreLeft,
-                                Size = new Vector2(20, 13),
+                                Size = new Vector2(19, 13),
                                 ShowPlaceholderOnNull = false,
                             },
                         }
@@ -112,12 +111,6 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             };
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            rankText.Colour = colours.Yellow;
-        }
-
         public int ScorePosition
         {
             set => rankText.Text = $"#{value}";

From f30cdab025fc4ef4409a0a395589fa2a97c8929c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 4 Feb 2020 14:35:04 +0300
Subject: [PATCH 0203/1142] Update Scores section

---
 osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs      | 10 ++++++++--
 .../BeatmapSet/Scores/ScoreTableRowBackground.cs       |  6 +++---
 osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs |  5 ++---
 .../BeatmapSet/Scores/TopScoreStatisticsSection.cs     |  2 +-
 .../Overlays/BeatmapSet/Scores/TopScoreUserSection.cs  |  2 +-
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 3a944882ab..7a17412722 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
     {
         private const float horizontal_inset = 20;
         private const float row_height = 25;
-        private const int text_size = 14;
+        private const int text_size = 12;
 
         private readonly FillFlowContainer backgroundFlow;
 
@@ -190,7 +190,13 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             public HeaderText(string text)
             {
                 Text = text.ToUpper();
-                Font = OsuFont.GetFont(size: 12, weight: FontWeight.Black);
+                Font = OsuFont.GetFont(size: 10, weight: FontWeight.Bold);
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                Colour = colourProvider.Foreground1;
             }
         }
     }
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTableRowBackground.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTableRowBackground.cs
index 724a7f8b55..14ea3e6b38 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTableRowBackground.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTableRowBackground.cs
@@ -48,18 +48,18 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, IAPIProvider api)
+        private void load(OsuColour colours, OverlayColourProvider colourProvider, IAPIProvider api)
         {
             var isOwnScore = api.LocalUser.Value.Id == score.UserID;
 
             if (isOwnScore)
                 background.Colour = colours.GreenDarker;
             else if (index % 2 == 0)
-                background.Colour = colours.Gray3;
+                background.Colour = colourProvider.Background4;
             else
                 background.Alpha = 0;
 
-            hoveredBackground.Colour = isOwnScore ? colours.GreenDark : colours.Gray4;
+            hoveredBackground.Colour = isOwnScore ? colours.GreenDark : colourProvider.Background3;
         }
 
         protected override bool OnHover(HoverEvent e)
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index 0378d364b8..0a3b5d9457 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -5,7 +5,6 @@ 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.UserInterface;
 using osuTK;
 using System.Linq;
@@ -179,9 +178,9 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colourProvider)
         {
-            background.Colour = colours.Gray2;
+            background.Colour = colourProvider.Background5;
 
             user.BindTo(api.LocalUser);
         }
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index 9f6e60a547..7d410d0d34 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                         separator = new Box
                         {
                             RelativeSizeAxes = Axes.X,
-                            Height = 2
+                            Height = 1
                         },
                         content
                     }
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
index afffdd04c4..72a7efd777 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                             {
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
-                                Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold, italics: true)
+                                Font = OsuFont.GetFont(size: 18, weight: FontWeight.Bold)
                             },
                             rank = new UpdateableRank(ScoreRank.D)
                             {

From cff619b0e406823df149704560f7154f210fb0c5 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 4 Feb 2020 14:46:22 +0300
Subject: [PATCH 0204/1142] Adjust overlay layout

---
 osu.Game/Overlays/BeatmapSetOverlay.cs | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSetOverlay.cs b/osu.Game/Overlays/BeatmapSetOverlay.cs
index e4e928df18..f747cfff16 100644
--- a/osu.Game/Overlays/BeatmapSetOverlay.cs
+++ b/osu.Game/Overlays/BeatmapSetOverlay.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Online.API.Requests;
 using osu.Game.Overlays.BeatmapSet;
@@ -33,6 +32,8 @@ namespace osu.Game.Overlays
         // receive input outside our bounds so we can trigger a close event on ourselves.
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 
+        private readonly Box background;
+
         public BeatmapSetOverlay()
             : base(OverlayColourScheme.Blue)
         {
@@ -41,10 +42,9 @@ namespace osu.Game.Overlays
 
             Children = new Drawable[]
             {
-                new Box
+                background = new Box
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = OsuColour.Gray(0.2f)
+                    RelativeSizeAxes = Axes.Both
                 },
                 scroll = new OsuScrollContainer
                 {
@@ -55,10 +55,20 @@ namespace osu.Game.Overlays
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
                         Direction = FillDirection.Vertical,
+                        Spacing = new Vector2(0, 20),
                         Children = new Drawable[]
                         {
-                            Header = new Header(),
-                            info = new Info(),
+                            new ReverseChildIDFillFlowContainer<Drawable>
+                            {
+                                AutoSizeAxes = Axes.Y,
+                                RelativeSizeAxes = Axes.X,
+                                Direction = FillDirection.Vertical,
+                                Children = new Drawable[]
+                                {
+                                    Header = new Header(),
+                                    info = new Info()
+                                }
+                            },
                             new ScoresContainer
                             {
                                 Beatmap = { BindTarget = Header.Picker.Beatmap }
@@ -83,6 +93,8 @@ namespace osu.Game.Overlays
         private void load(RulesetStore rulesets)
         {
             this.rulesets = rulesets;
+
+            background.Colour = ColourProvider.Background6;
         }
 
         protected override void PopOutComplete()

From 5f63ef3bc139d9245046d6bac4d64f5246e231e4 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 4 Feb 2020 14:52:26 +0300
Subject: [PATCH 0205/1142] Fix crashing test

---
 osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs
index 1b136d9e41..3c959e05c1 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs
@@ -3,11 +3,13 @@
 
 using System;
 using System.Collections.Generic;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Utils;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapSet.Scores;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Scoring;
@@ -27,6 +29,9 @@ namespace osu.Game.Tests.Visual.Online
             typeof(ScoreTableRowBackground),
         };
 
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+
         public TestSceneScoresContainer()
         {
             TestScoresContainer scoresContainer;

From 3571c2b6172c70abb46586ffb801eb45f68df6fe Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Tue, 4 Feb 2020 19:41:44 +0700
Subject: [PATCH 0206/1142] Rearrange children in TopScoreStatisticsSection

---
 .../Scores/TopScoreStatisticsSection.cs       | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index 7d410d0d34..5abff41cc1 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -44,9 +44,24 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
-                Spacing = new Vector2(10, 0),
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(10, 8),
                 Children = new Drawable[]
                 {
+                    new FillFlowContainer
+                    {
+                        Anchor = Anchor.TopRight,
+                        Origin = Anchor.TopRight,
+                        AutoSizeAxes = Axes.Both,
+                        Direction = FillDirection.Horizontal,
+                        Spacing = new Vector2(margin, 0),
+                        Children = new Drawable[]
+                        {
+                            totalScoreColumn = new TextColumn("total score", largeFont),
+                            accuracyColumn = new TextColumn("accuracy", largeFont),
+                            maxComboColumn = new TextColumn("max combo", largeFont)
+                        }
+                    },
                     new FillFlowContainer
                     {
                         Anchor = Anchor.TopRight,
@@ -66,20 +81,6 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                             modsColumn = new ModsInfoColumn(),
                         }
                     },
-                    new FillFlowContainer
-                    {
-                        Anchor = Anchor.TopRight,
-                        Origin = Anchor.TopRight,
-                        AutoSizeAxes = Axes.Both,
-                        Direction = FillDirection.Horizontal,
-                        Spacing = new Vector2(margin, 0),
-                        Children = new Drawable[]
-                        {
-                            totalScoreColumn = new TextColumn("total score", largeFont),
-                            accuracyColumn = new TextColumn("accuracy", largeFont),
-                            maxComboColumn = new TextColumn("max combo", largeFont)
-                        }
-                    },
                 }
             };
         }

From c12fc67887781b4c13c824e689f6bc09194fd6e3 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Tue, 4 Feb 2020 19:42:37 +0700
Subject: [PATCH 0207/1142] Change InfoColumn title font weight

---
 .../Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index 5abff41cc1..928d6be800 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -125,7 +125,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                     {
                         text = new OsuSpriteText
                         {
-                            Font = OsuFont.GetFont(size: 10, weight: FontWeight.Black),
+                            Font = OsuFont.GetFont(size: 10, weight: FontWeight.Bold),
                             Text = title.ToUpper()
                         },
                         separator = new Box

From 4f312ae6bca082e476bfac9b32d83fb2694850f8 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Tue, 4 Feb 2020 19:43:14 +0700
Subject: [PATCH 0208/1142] Adjust InfoColumn spacing

---
 .../Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index 928d6be800..88aac732d7 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 {
                     AutoSizeAxes = Axes.Both,
                     Direction = FillDirection.Vertical,
-                    Spacing = new Vector2(0, 2),
+                    Spacing = new Vector2(0, 1),
                     Children = new[]
                     {
                         text = new OsuSpriteText

From 8f9917238e3303860659442aa7ac373cbdae04bf Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Tue, 4 Feb 2020 19:45:08 +0700
Subject: [PATCH 0209/1142] Add optional minimum width to InfoColumn

---
 .../BeatmapSet/Scores/TopScoreStatisticsSection.cs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index 88aac732d7..b456a35480 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
     public class TopScoreStatisticsSection : CompositeDrawable
     {
         private const float margin = 10;
+        private const float statistics_column_min_width = 50;
 
         private readonly FontUsage smallFont = OsuFont.GetFont(size: 16);
         private readonly FontUsage largeFont = OsuFont.GetFont(size: 22);
@@ -112,7 +113,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             private readonly Box separator;
             private readonly OsuSpriteText text;
 
-            public InfoColumn(string title, Drawable content)
+            public InfoColumn(string title, Drawable content, float? minWidth = null)
             {
                 AutoSizeAxes = Axes.Both;
 
@@ -130,7 +131,8 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                         },
                         separator = new Box
                         {
-                            RelativeSizeAxes = Axes.X,
+                            RelativeSizeAxes = minWidth == null ? Axes.X : Axes.None,
+                            Width = minWidth ?? 1f,
                             Height = 1
                         },
                         content
@@ -149,13 +151,13 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
         {
             private readonly SpriteText text;
 
-            public TextColumn(string title, FontUsage font)
-                : this(title, new OsuSpriteText { Font = font })
+            public TextColumn(string title, FontUsage font, float? minWidth = null)
+                : this(title, new OsuSpriteText { Font = font }, minWidth)
             {
             }
 
-            private TextColumn(string title, SpriteText text)
-                : base(title, text)
+            private TextColumn(string title, SpriteText text, float? minWidth = null)
+                : base(title, text, minWidth)
             {
                 this.text = text;
             }

From 556a4e64cb705c8a413fe7acd14446b3fedb29b8 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Tue, 4 Feb 2020 19:46:14 +0700
Subject: [PATCH 0210/1142] Use minimum width on statistics columns

---
 .../Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index b456a35480..d11a74617a 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -103,7 +103,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             }
         }
 
-        private TextColumn createStatisticsColumn(HitResult hitResult, int count) => new TextColumn(hitResult.GetDescription(), smallFont)
+        private TextColumn createStatisticsColumn(HitResult hitResult, int count) => new TextColumn(hitResult.GetDescription(), smallFont, statistics_column_min_width)
         {
             Text = count.ToString()
         };

From a8faee91d8404989469e7606a85296d371065b64 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Tue, 4 Feb 2020 19:54:57 +0700
Subject: [PATCH 0211/1142] Use minWidth on pp column

---
 .../Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index d11a74617a..fc50a528e9 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                                 Direction = FillDirection.Horizontal,
                                 Spacing = new Vector2(margin, 0),
                             },
-                            ppColumn = new TextColumn("pp", smallFont),
+                            ppColumn = new TextColumn("pp", smallFont, statistics_column_min_width),
                             modsColumn = new ModsInfoColumn(),
                         }
                     },

From 5030b66092ff9e28c006c5ee025bf5881c65997d Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Tue, 4 Feb 2020 19:59:11 +0700
Subject: [PATCH 0212/1142] Adjust width of statistics columns

---
 .../Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index fc50a528e9..54ead4ebf4 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
     public class TopScoreStatisticsSection : CompositeDrawable
     {
         private const float margin = 10;
-        private const float statistics_column_min_width = 50;
+        private const float statistics_column_min_width = 40;
 
         private readonly FontUsage smallFont = OsuFont.GetFont(size: 16);
         private readonly FontUsage largeFont = OsuFont.GetFont(size: 22);

From 37992e99f9785f27540be781d76ce04bbf190568 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 4 Feb 2020 16:04:06 +0300
Subject: [PATCH 0213/1142] API implementation

---
 .../Requests/GetSpotlightRankingsRequest.cs   | 30 +++++++++++++++++++
 .../Requests/GetSpotlightRankingsResponse.cs  | 22 ++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 osu.Game/Online/API/Requests/GetSpotlightRankingsRequest.cs
 create mode 100644 osu.Game/Online/API/Requests/GetSpotlightRankingsResponse.cs

diff --git a/osu.Game/Online/API/Requests/GetSpotlightRankingsRequest.cs b/osu.Game/Online/API/Requests/GetSpotlightRankingsRequest.cs
new file mode 100644
index 0000000000..a279db134f
--- /dev/null
+++ b/osu.Game/Online/API/Requests/GetSpotlightRankingsRequest.cs
@@ -0,0 +1,30 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.IO.Network;
+using osu.Game.Rulesets;
+
+namespace osu.Game.Online.API.Requests
+{
+    public class GetSpotlightRankingsRequest : GetRankingsRequest<GetSpotlightRankingsResponse>
+    {
+        private readonly int spotlight;
+
+        public GetSpotlightRankingsRequest(RulesetInfo ruleset, int spotlight)
+            : base(ruleset, 1)
+        {
+            this.spotlight = spotlight;
+        }
+
+        protected override WebRequest CreateWebRequest()
+        {
+            var req = base.CreateWebRequest();
+
+            req.AddParameter("spotlight", spotlight.ToString());
+
+            return req;
+        }
+
+        protected override string TargetPostfix() => "charts";
+    }
+}
diff --git a/osu.Game/Online/API/Requests/GetSpotlightRankingsResponse.cs b/osu.Game/Online/API/Requests/GetSpotlightRankingsResponse.cs
new file mode 100644
index 0000000000..2259314a9f
--- /dev/null
+++ b/osu.Game/Online/API/Requests/GetSpotlightRankingsResponse.cs
@@ -0,0 +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.Collections.Generic;
+using Newtonsoft.Json;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Users;
+
+namespace osu.Game.Online.API.Requests
+{
+    public class GetSpotlightRankingsResponse
+    {
+        [JsonProperty("ranking")]
+        public List<UserStatistics> Users;
+
+        [JsonProperty("spotlight")]
+        public APISpotlight Spotlight;
+
+        [JsonProperty("beatmapsets")]
+        public List<APIBeatmapSet> BeatmapSets;
+    }
+}

From f889f2435bc83cebb783c37a31d49319fac505d8 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 4 Feb 2020 16:20:15 +0300
Subject: [PATCH 0214/1142] Add test step to TestSceneRankingsTable

---
 .../Visual/Online/TestSceneRankingsTables.cs      | 15 +++++++++++++++
 .../Overlays/Rankings/Tables/UserBasedTable.cs    |  4 ++--
 osu.Game/Users/UserStatistics.cs                  |  8 ++++----
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs
index ab174f303e..19ca63208e 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs
@@ -68,6 +68,7 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Mania scores", () => createScoreTable(new ManiaRuleset().RulesetInfo));
             AddStep("Taiko country scores", () => createCountryTable(new TaikoRuleset().RulesetInfo));
             AddStep("Catch US performance page 10", () => createPerformanceTable(new CatchRuleset().RulesetInfo, "US", 10));
+            AddStep("Osu 271 spotlight table", () => createSpotlightTable(new OsuRuleset().RulesetInfo, 271));
         }
 
         private void createCountryTable(RulesetInfo ruleset, int page = 1)
@@ -112,6 +113,20 @@ namespace osu.Game.Tests.Visual.Online
             api.Queue(request);
         }
 
+        private void createSpotlightTable(RulesetInfo ruleset, int spotlight)
+        {
+            onLoadStarted();
+
+            request = new GetSpotlightRankingsRequest(ruleset, spotlight);
+            ((GetSpotlightRankingsRequest)request).Success += rankings => Schedule(() =>
+            {
+                var table = new ScoresTable(1, rankings.Users);
+                loadTable(table);
+            });
+
+            api.Queue(request);
+        }
+
         private void onLoadStarted()
         {
             loading.Show();
diff --git a/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs b/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs
index 351c4df6b7..e1395479f2 100644
--- a/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs
+++ b/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs
@@ -44,8 +44,8 @@ namespace osu.Game.Overlays.Rankings.Tables
             new ColoredRowText { Text = $@"{item.PlayCount:N0}", },
         }.Concat(CreateUniqueContent(item)).Concat(new[]
         {
-            new ColoredRowText { Text = $@"{item.GradesCount.SS + item.GradesCount.SSPlus:N0}", },
-            new ColoredRowText { Text = $@"{item.GradesCount.S + item.GradesCount.SPlus:N0}", },
+            new ColoredRowText { Text = $@"{item.GradesCount.SS + (item.GradesCount.SSPlus ?? 0):N0}", },
+            new ColoredRowText { Text = $@"{item.GradesCount.S + (item.GradesCount.SPlus ?? 0):N0}", },
             new ColoredRowText { Text = $@"{item.GradesCount.A:N0}", }
         }).ToArray();
 
diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs
index e5e77821ab..8ce26074a8 100644
--- a/osu.Game/Users/UserStatistics.cs
+++ b/osu.Game/Users/UserStatistics.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Users
         public decimal? PP;
 
         [JsonProperty(@"pp_rank")] // the API sometimes only returns this value in condensed user responses
-        private int rank
+        private int? rank
         {
             set => Ranks.Global = value;
         }
@@ -71,13 +71,13 @@ namespace osu.Game.Users
         public struct Grades
         {
             [JsonProperty(@"ssh")]
-            public int SSPlus;
+            public int? SSPlus;
 
             [JsonProperty(@"ss")]
             public int SS;
 
             [JsonProperty(@"sh")]
-            public int SPlus;
+            public int? SPlus;
 
             [JsonProperty(@"s")]
             public int S;
@@ -85,7 +85,7 @@ namespace osu.Game.Users
             [JsonProperty(@"a")]
             public int A;
 
-            public int this[ScoreRank rank]
+            public int? this[ScoreRank rank]
             {
                 get
                 {

From f112760b0027030f8c1e62683529624d04e9e8fd Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Tue, 4 Feb 2020 21:55:04 +0700
Subject: [PATCH 0215/1142] Revert column separator height to 2

---
 .../Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index 54ead4ebf4..c3a929dd4a 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -133,7 +133,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                         {
                             RelativeSizeAxes = minWidth == null ? Axes.X : Axes.None,
                             Width = minWidth ?? 1f,
-                            Height = 1
+                            Height = 2
                         },
                         content
                     }

From 1c16ab1813393f0652a8ea257e51540f34b77817 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Tue, 4 Feb 2020 21:55:20 +0700
Subject: [PATCH 0216/1142] Use better colours

---
 .../Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index c3a929dd4a..ec87b04947 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -143,7 +143,8 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             [BackgroundDependencyLoader]
             private void load(OverlayColourProvider colourProvider)
             {
-                separator.Colour = text.Colour = colourProvider.Foreground1;
+                text.Colour = colourProvider.Foreground1;
+                separator.Colour = colourProvider.Background3;
             }
         }
 

From bd815cd81b003f5fe95250cab209e09b759492b3 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Tue, 4 Feb 2020 21:55:48 +0700
Subject: [PATCH 0217/1142] Use minWidth on more columns to further match web

---
 .../BeatmapSet/Scores/TopScoreStatisticsSection.cs  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index ec87b04947..8386c82572 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -23,7 +23,8 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
     public class TopScoreStatisticsSection : CompositeDrawable
     {
         private const float margin = 10;
-        private const float statistics_column_min_width = 40;
+        private const float top_columns_min_width = 64;
+        private const float bottom_columns_min_width = 45;
 
         private readonly FontUsage smallFont = OsuFont.GetFont(size: 16);
         private readonly FontUsage largeFont = OsuFont.GetFont(size: 22);
@@ -58,9 +59,9 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                         Spacing = new Vector2(margin, 0),
                         Children = new Drawable[]
                         {
-                            totalScoreColumn = new TextColumn("total score", largeFont),
-                            accuracyColumn = new TextColumn("accuracy", largeFont),
-                            maxComboColumn = new TextColumn("max combo", largeFont)
+                            totalScoreColumn = new TextColumn("total score", largeFont, top_columns_min_width),
+                            accuracyColumn = new TextColumn("accuracy", largeFont, top_columns_min_width),
+                            maxComboColumn = new TextColumn("max combo", largeFont, top_columns_min_width)
                         }
                     },
                     new FillFlowContainer
@@ -78,7 +79,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                                 Direction = FillDirection.Horizontal,
                                 Spacing = new Vector2(margin, 0),
                             },
-                            ppColumn = new TextColumn("pp", smallFont, statistics_column_min_width),
+                            ppColumn = new TextColumn("pp", smallFont, bottom_columns_min_width),
                             modsColumn = new ModsInfoColumn(),
                         }
                     },
@@ -103,7 +104,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             }
         }
 
-        private TextColumn createStatisticsColumn(HitResult hitResult, int count) => new TextColumn(hitResult.GetDescription(), smallFont, statistics_column_min_width)
+        private TextColumn createStatisticsColumn(HitResult hitResult, int count) => new TextColumn(hitResult.GetDescription(), smallFont, bottom_columns_min_width)
         {
             Text = count.ToString()
         };

From 0cba1a357f68f90b81fb2828aa2265ae7a328c1d Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Tue, 4 Feb 2020 21:56:22 +0700
Subject: [PATCH 0218/1142] Adjust padding on DrawableTopScore

---
 osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs b/osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
index e12c977430..bb85b4a37b 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
@@ -42,7 +42,12 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
-                    Padding = new MarginPadding(10),
+                    Padding = new MarginPadding
+                    {
+                        Vertical = 10,
+                        Left = 10,
+                        Right = 25,
+                    },
                     Children = new Drawable[]
                     {
                         new AutoSizingGrid

From 833bb28dcfcddd529959a60b0f4ea2b1a25d4688 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Tue, 4 Feb 2020 22:38:25 +0700
Subject: [PATCH 0219/1142] Adjust separator position between top and bottom
 content

---
 .../Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index 8386c82572..171aae06d3 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -134,7 +134,8 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                         {
                             RelativeSizeAxes = minWidth == null ? Axes.X : Axes.None,
                             Width = minWidth ?? 1f,
-                            Height = 2
+                            Height = 2,
+                            Margin = new MarginPadding { Top = 2 }
                         },
                         content
                     }

From b28a1d38a6b66f0c678bfb1150a29dcdf82a2cfe Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Tue, 4 Feb 2020 17:09:18 +0100
Subject: [PATCH 0220/1142] Simplify GradientLine and fix colour changing

---
 .../UserInterface/GradientLineTabControl.cs     | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/GradientLineTabControl.cs b/osu.Game/Graphics/UserInterface/GradientLineTabControl.cs
index baca57ea89..1d67c4e033 100644
--- a/osu.Game/Graphics/UserInterface/GradientLineTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/GradientLineTabControl.cs
@@ -49,14 +49,7 @@ namespace osu.Game.Graphics.UserInterface
             public GradientLine()
             {
                 RelativeSizeAxes = Axes.X;
-                Size = new Vector2(0.8f, 1.5f);
-
-                ColumnDimensions = new[]
-                {
-                    new Dimension(),
-                    new Dimension(mode: GridSizeMode.Relative, size: 0.4f),
-                    new Dimension(),
-                };
+                Size = new Vector2(0.8f, 1f);
 
                 Content = new[]
                 {
@@ -65,16 +58,12 @@ namespace osu.Game.Graphics.UserInterface
                         new Box
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Colour = ColourInfo.GradientHorizontal(Color4.Transparent, Color4.White)
+                            Colour = ColourInfo.GradientHorizontal(Color4.Transparent, Colour)
                         },
                         new Box
                         {
                             RelativeSizeAxes = Axes.Both,
-                        },
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = ColourInfo.GradientHorizontal(Color4.White, Color4.Transparent)
+                            Colour = ColourInfo.GradientHorizontal(Colour, Color4.Transparent)
                         },
                     }
                 };

From 9bc45d21f13e2a048d991e9144cf773e2592389b Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Tue, 4 Feb 2020 17:11:28 +0100
Subject: [PATCH 0221/1142] Recolour LeaderboardScopeSelector

---
 osu.Game/Overlays/BeatmapSet/LeaderboardScopeSelector.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/LeaderboardScopeSelector.cs b/osu.Game/Overlays/BeatmapSet/LeaderboardScopeSelector.cs
index e2a725ec46..20a3b09db4 100644
--- a/osu.Game/Overlays/BeatmapSet/LeaderboardScopeSelector.cs
+++ b/osu.Game/Overlays/BeatmapSet/LeaderboardScopeSelector.cs
@@ -26,10 +26,10 @@ namespace osu.Game.Overlays.BeatmapSet
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colourProvider)
         {
-            AccentColour = colours.Blue;
-            LineColour = Color4.Gray;
+            AccentColour = colourProvider.Highlight1;
+            LineColour = colourProvider.Background1;
         }
 
         private class ScopeSelectorTabItem : PageTabItem

From 5e369534b6a6d949c526a0fea2b802cf7b2d540c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 4 Feb 2020 19:15:23 +0300
Subject: [PATCH 0222/1142] Allow guests to view comments

---
 osu.Game/Overlays/Comments/CommentsContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index 8761b88b1e..15443ace88 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -148,7 +148,7 @@ namespace osu.Game.Overlays.Comments
             loadCancellation?.Cancel();
             request = new GetCommentsRequest(type, id.Value, Sort.Value, currentPage++);
             request.Success += onSuccess;
-            api.Queue(request);
+            api.PerformAsync(request);
         }
 
         private void clearComments()

From a84068448a2e40ffd81e94a8bacd42e4981c8403 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 4 Feb 2020 19:19:49 +0300
Subject: [PATCH 0223/1142] refetch comments on user change

---
 osu.Game/Overlays/Comments/CommentsContainer.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index 15443ace88..3d68f453b7 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -113,6 +113,7 @@ namespace osu.Game.Overlays.Comments
 
         protected override void LoadComplete()
         {
+            api.LocalUser.BindValueChanged(_ => refetchComments());
             Sort.BindValueChanged(_ => refetchComments(), true);
             base.LoadComplete();
         }

From 4ea9efd92e8a1f87ec905ac8ec387d335d1862a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 4 Feb 2020 17:56:06 +0100
Subject: [PATCH 0224/1142] Enforce column ordering

---
 .../Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index 171aae06d3..8a17fef367 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -99,7 +99,9 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 maxComboColumn.Text = $@"{value.MaxCombo:N0}x";
                 ppColumn.Text = $@"{value.PP:N0}";
 
-                statisticsColumns.ChildrenEnumerable = value.Statistics.Select(kvp => createStatisticsColumn(kvp.Key, kvp.Value));
+                statisticsColumns.ChildrenEnumerable = value.Statistics
+                                                            .OrderByDescending(pair => pair.Key)
+                                                            .Select(kvp => createStatisticsColumn(kvp.Key, kvp.Value));
                 modsColumn.Mods = value.Mods;
             }
         }

From 5eb1619e24ca180b99de8b762a30b9986dc4da75 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Tue, 4 Feb 2020 18:02:49 +0100
Subject: [PATCH 0225/1142] Adjust title / artist font weight

---
 osu.Game/Overlays/BeatmapSet/Header.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index 7c5c5a9d55..b62a5d46f0 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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;
@@ -134,7 +134,7 @@ namespace osu.Game.Overlays.BeatmapSet
                                                 {
                                                     title = new OsuSpriteText
                                                     {
-                                                        Font = OsuFont.GetFont(size: 37, weight: FontWeight.Bold, italics: true)
+                                                        Font = OsuFont.GetFont(size: 37, weight: FontWeight.SemiBold, italics: true)
                                                     },
                                                     externalLink = new ExternalLinkButton
                                                     {
@@ -144,7 +144,7 @@ namespace osu.Game.Overlays.BeatmapSet
                                                     },
                                                 }
                                             },
-                                            artist = new OsuSpriteText { Font = OsuFont.GetFont(size: 25, weight: FontWeight.SemiBold, italics: true) },
+                                            artist = new OsuSpriteText { Font = OsuFont.GetFont(size: 25, weight: FontWeight.Medium, italics: true) },
                                             new Container
                                             {
                                                 RelativeSizeAxes = Axes.X,

From a9cfade2f4a2af83c94b81132ff66a1cfa867dab Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 4 Feb 2020 21:02:10 +0300
Subject: [PATCH 0226/1142] Adjust null handling

---
 osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs | 7 ++++---
 osu.Game/Users/UserStatistics.cs                    | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs b/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs
index e1395479f2..0e77d7d764 100644
--- a/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs
+++ b/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Users;
+using osu.Game.Scoring;
 
 namespace osu.Game.Overlays.Rankings.Tables
 {
@@ -44,9 +45,9 @@ namespace osu.Game.Overlays.Rankings.Tables
             new ColoredRowText { Text = $@"{item.PlayCount:N0}", },
         }.Concat(CreateUniqueContent(item)).Concat(new[]
         {
-            new ColoredRowText { Text = $@"{item.GradesCount.SS + (item.GradesCount.SSPlus ?? 0):N0}", },
-            new ColoredRowText { Text = $@"{item.GradesCount.S + (item.GradesCount.SPlus ?? 0):N0}", },
-            new ColoredRowText { Text = $@"{item.GradesCount.A:N0}", }
+            new ColoredRowText { Text = $@"{item.GradesCount[ScoreRank.XH] + item.GradesCount[ScoreRank.X]:N0}", },
+            new ColoredRowText { Text = $@"{item.GradesCount[ScoreRank.SH] + item.GradesCount[ScoreRank.S]:N0}", },
+            new ColoredRowText { Text = $@"{item.GradesCount[ScoreRank.A]:N0}", }
         }).ToArray();
 
         protected abstract TableColumn[] CreateUniqueHeaders();
diff --git a/osu.Game/Users/UserStatistics.cs b/osu.Game/Users/UserStatistics.cs
index 8ce26074a8..8b7699d0ad 100644
--- a/osu.Game/Users/UserStatistics.cs
+++ b/osu.Game/Users/UserStatistics.cs
@@ -85,20 +85,20 @@ namespace osu.Game.Users
             [JsonProperty(@"a")]
             public int A;
 
-            public int? this[ScoreRank rank]
+            public int this[ScoreRank rank]
             {
                 get
                 {
                     switch (rank)
                     {
                         case ScoreRank.XH:
-                            return SSPlus;
+                            return SSPlus ?? 0;
 
                         case ScoreRank.X:
                             return SS;
 
                         case ScoreRank.SH:
-                            return SPlus;
+                            return SPlus ?? 0;
 
                         case ScoreRank.S:
                             return S;

From f8ad9476efd7727945ee9b38f324555180d1e908 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 4 Feb 2020 21:03:17 +0300
Subject: [PATCH 0227/1142] Adjust test step name

---
 osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs
index 19ca63208e..656402e713 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Mania scores", () => createScoreTable(new ManiaRuleset().RulesetInfo));
             AddStep("Taiko country scores", () => createCountryTable(new TaikoRuleset().RulesetInfo));
             AddStep("Catch US performance page 10", () => createPerformanceTable(new CatchRuleset().RulesetInfo, "US", 10));
-            AddStep("Osu 271 spotlight table", () => createSpotlightTable(new OsuRuleset().RulesetInfo, 271));
+            AddStep("Osu spotlight table (chart 271)", () => createSpotlightTable(new OsuRuleset().RulesetInfo, 271));
         }
 
         private void createCountryTable(RulesetInfo ruleset, int page = 1)

From 5b881568db688d501f8464963ac85d87b751981a Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Tue, 4 Feb 2020 19:15:02 +0100
Subject: [PATCH 0228/1142] Adjust header gradient colours

---
 osu.Game/Overlays/BeatmapSet/Header.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index b62a5d46f0..5cfbd2ef83 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -93,10 +93,9 @@ namespace osu.Game.Overlays.BeatmapSet
                                         RelativeSizeAxes = Axes.Both,
                                         Masking = true,
                                     },
-                                    new Box
+                                    coverGradient = new Box
                                     {
-                                        RelativeSizeAxes = Axes.Both,
-                                        Colour = ColourInfo.GradientVertical(Color4.Black.Opacity(0.3f), Color4.Black.Opacity(0.8f)),
+                                        RelativeSizeAxes = Axes.Both
                                     },
                                 },
                             },
@@ -215,8 +214,10 @@ namespace osu.Game.Overlays.BeatmapSet
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OverlayColourProvider colourProvider)
         {
+            coverGradient.Colour = ColourInfo.GradientVertical(colourProvider.Background6.Opacity(0.3f), colourProvider.Background6.Opacity(0.8f));
+
             State.BindValueChanged(_ => updateDownloadButtons());
 
             BeatmapSet.BindValueChanged(setInfo =>

From b6301f6537753fa7ad6597dbb8b7a2135cdb2e7a Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Tue, 4 Feb 2020 19:52:32 +0100
Subject: [PATCH 0229/1142] Adjust PreviewButton alpha and animation

---
 osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
index 8c884e0950..80b287f6c6 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
     {
         private const float transition_duration = 500;
 
-        private readonly Box bg, progress;
+        private readonly Box background, progress;
         private readonly PlayButton playButton;
 
         private PreviewTrack preview => playButton.Preview;
@@ -40,10 +40,11 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
 
             Children = new Drawable[]
             {
-                bg = new Box
+                background = new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = Color4.Black.Opacity(0.25f),
+                    Colour = Color4.Black,
+                    Alpha = 0.5f
                 },
                 new Container
                 {
@@ -91,13 +92,13 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
 
         protected override bool OnHover(HoverEvent e)
         {
-            bg.FadeColour(Color4.Black.Opacity(0.5f), 100);
+            background.FadeTo(0.75f, 80);
             return base.OnHover(e);
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            bg.FadeColour(Color4.Black.Opacity(0.25f), 100);
+            background.FadeTo(0.5f, 80);
             base.OnHoverLost(e);
         }
     }

From a366a92d4c93001a0af58566ff68448d20f88e96 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Tue, 4 Feb 2020 19:54:51 +0100
Subject: [PATCH 0230/1142] Use alpha instead of colour opacity

---
 osu.Game/Overlays/BeatmapSet/Details.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Details.cs b/osu.Game/Overlays/BeatmapSet/Details.cs
index d76f6a43db..627f3d04c9 100644
--- a/osu.Game/Overlays/BeatmapSet/Details.cs
+++ b/osu.Game/Overlays/BeatmapSet/Details.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -119,7 +118,8 @@ namespace osu.Game.Overlays.BeatmapSet
                     new Box
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Colour = Color4.Black.Opacity(0.5f),
+                        Colour = Color4.Black,
+                        Alpha = 0.5f
                     },
                     content = new Container
                     {

From 86283cc422654e7babbb54a67cab8f8ccc8dc151 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Tue, 4 Feb 2020 19:55:19 +0100
Subject: [PATCH 0231/1142] Recolour SuccessRate background

---
 osu.Game/Overlays/BeatmapSet/SuccessRate.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/SuccessRate.cs b/osu.Game/Overlays/BeatmapSet/SuccessRate.cs
index 1dcc847760..dac750dacf 100644
--- a/osu.Game/Overlays/BeatmapSet/SuccessRate.cs
+++ b/osu.Game/Overlays/BeatmapSet/SuccessRate.cs
@@ -105,10 +105,10 @@ namespace osu.Game.Overlays.BeatmapSet
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OsuColour colours, OverlayColourProvider colourProvider)
         {
             successRate.AccentColour = colours.Green;
-            successRate.BackgroundColour = colours.GrayD;
+            successRate.BackgroundColour = colourProvider.Background6;
 
             updateDisplay();
         }

From d0eb4e44719b20621362dc721cedfc18f17ab051 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Tue, 4 Feb 2020 20:08:54 +0100
Subject: [PATCH 0232/1142] Add necessary variable

---
 osu.Game/Overlays/BeatmapSet/Header.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index 5cfbd2ef83..f2d1077844 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -30,6 +30,7 @@ namespace osu.Game.Overlays.BeatmapSet
         private const float buttons_spacing = 5;
 
         private readonly UpdateableBeatmapSetCover cover;
+        private readonly Box coverGradient;
         private readonly OsuSpriteText title, artist;
         private readonly AuthorInfo author;
         private readonly FillFlowContainer downloadButtonsContainer;

From 2cc1255035d5f84aad41dd5cc21a38db0a837229 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Tue, 4 Feb 2020 20:09:52 +0100
Subject: [PATCH 0233/1142] Adjust online status pill font and padding

---
 osu.Game/Overlays/BeatmapSet/Header.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index f2d1077844..dccebe5bad 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -196,8 +196,8 @@ namespace osu.Game.Overlays.BeatmapSet
                                     {
                                         Anchor = Anchor.TopRight,
                                         Origin = Anchor.TopRight,
-                                        TextSize = 14,
-                                        TextPadding = new MarginPadding { Horizontal = 25, Vertical = 8 }
+                                        TextSize = 17,
+                                        TextPadding = new MarginPadding { Horizontal = 35, Vertical = 10 }
                                     },
                                     Details = new Details(),
                                 },

From 268bb73ac668f927f936b5c72798fc6cdf5fc270 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Tue, 4 Feb 2020 20:14:50 +0100
Subject: [PATCH 0234/1142] Adjust header padding

---
 osu.Game/Overlays/BeatmapSet/Header.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index dccebe5bad..c620ae2bca 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -106,8 +106,7 @@ namespace osu.Game.Overlays.BeatmapSet
                                 AutoSizeAxes = Axes.Y,
                                 Padding = new MarginPadding
                                 {
-                                    Top = 20,
-                                    Bottom = 30,
+                                    Vertical = BeatmapSetOverlay.Y_PADDING,
                                     Left = BeatmapSetOverlay.X_PADDING,
                                     Right = BeatmapSetOverlay.X_PADDING + BeatmapSetOverlay.RIGHT_WIDTH,
                                 },
@@ -187,7 +186,7 @@ namespace osu.Game.Overlays.BeatmapSet
                                 Anchor = Anchor.BottomRight,
                                 Origin = Anchor.BottomRight,
                                 AutoSizeAxes = Axes.Both,
-                                Margin = new MarginPadding { Top = BeatmapSetOverlay.TOP_PADDING, Right = BeatmapSetOverlay.X_PADDING },
+                                Margin = new MarginPadding { Top = BeatmapSetOverlay.Y_PADDING, Right = BeatmapSetOverlay.X_PADDING },
                                 Direction = FillDirection.Vertical,
                                 Spacing = new Vector2(10),
                                 Children = new Drawable[]

From cbfb90983bfe8b146bcf1df5883c6b7b06a109d6 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Tue, 4 Feb 2020 20:17:27 +0100
Subject: [PATCH 0235/1142] Rename variable

---
 osu.Game/Overlays/BeatmapSetOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSetOverlay.cs b/osu.Game/Overlays/BeatmapSetOverlay.cs
index f747cfff16..7624351e41 100644
--- a/osu.Game/Overlays/BeatmapSetOverlay.cs
+++ b/osu.Game/Overlays/BeatmapSetOverlay.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Overlays
     public class BeatmapSetOverlay : FullscreenOverlay
     {
         public const float X_PADDING = 40;
-        public const float TOP_PADDING = 25;
+        public const float Y_PADDING = 25;
         public const float RIGHT_WIDTH = 275;
         protected readonly Header Header;
 

From 85fb4b4a18eb79ccd7b65786a3f99f83b67838f7 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Tue, 4 Feb 2020 21:00:00 +0100
Subject: [PATCH 0236/1142] Recolour DetailBox

---
 osu.Game/Overlays/BeatmapSet/Details.cs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Details.cs b/osu.Game/Overlays/BeatmapSet/Details.cs
index 627f3d04c9..d24ad58a74 100644
--- a/osu.Game/Overlays/BeatmapSet/Details.cs
+++ b/osu.Game/Overlays/BeatmapSet/Details.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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;
@@ -106,6 +106,8 @@ namespace osu.Game.Overlays.BeatmapSet
         private class DetailBox : Container
         {
             private readonly Container content;
+            private readonly Box background;
+
             protected override Container<Drawable> Content => content;
 
             public DetailBox()
@@ -115,10 +117,9 @@ namespace osu.Game.Overlays.BeatmapSet
 
                 InternalChildren = new Drawable[]
                 {
-                    new Box
+                    background = new Box
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Colour = Color4.Black,
                         Alpha = 0.5f
                     },
                     content = new Container
@@ -129,6 +130,12 @@ namespace osu.Game.Overlays.BeatmapSet
                     },
                 };
             }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                background.Colour = colourProvider.Background6;
+            }
         }
     }
 }

From 88e79dfa78031b474fdb1ba341a4c8acb9c4ae13 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Tue, 4 Feb 2020 21:00:27 +0100
Subject: [PATCH 0237/1142] Hide ratings if beatmap has no leaderboard

---
 osu.Game/Overlays/BeatmapSet/Details.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Details.cs b/osu.Game/Overlays/BeatmapSet/Details.cs
index d24ad58a74..85341e6f1c 100644
--- a/osu.Game/Overlays/BeatmapSet/Details.cs
+++ b/osu.Game/Overlays/BeatmapSet/Details.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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;
@@ -20,6 +20,7 @@ namespace osu.Game.Overlays.BeatmapSet
         private readonly PreviewButton preview;
         private readonly BasicStats basic;
         private readonly AdvancedStats advanced;
+        private readonly DetailBox ratingBox;
 
         private BeatmapSetInfo beatmapSet;
 
@@ -53,6 +54,7 @@ namespace osu.Game.Overlays.BeatmapSet
         private void updateDisplay()
         {
             Ratings.Metrics = BeatmapSet?.Metrics;
+            ratingBox.Alpha = (BeatmapSet?.OnlineInfo?.Status ?? 0) > 0 ? 1 : 0;
         }
 
         public Details()
@@ -85,7 +87,7 @@ namespace osu.Game.Overlays.BeatmapSet
                         Margin = new MarginPadding { Vertical = 7.5f },
                     },
                 },
-                new DetailBox
+                ratingBox = new DetailBox
                 {
                     Child = Ratings = new UserRatings
                     {

From 48beb9fd6d45688911e18f08f81137bde53b03ee Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Tue, 4 Feb 2020 21:01:02 +0100
Subject: [PATCH 0238/1142] Recolour PreviewButton

---
 osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
index 80b287f6c6..5ce283d0d8 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
@@ -43,7 +43,6 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
                 background = new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = Color4.Black,
                     Alpha = 0.5f
                 },
                 new Container
@@ -72,9 +71,10 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OsuColour colours, OverlayColourProvider colourProvider)
         {
             progress.Colour = colours.Yellow;
+            background.Colour = colourProvider.Background6;
         }
 
         protected override void Update()

From 3ef6027d5718a11bd2a4ef8154c949d2911452f5 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Tue, 4 Feb 2020 21:02:02 +0100
Subject: [PATCH 0239/1142] Show placeholder instead of success rate when
 beatmap unranked

---
 osu.Game/Overlays/BeatmapSet/Info.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/osu.Game/Overlays/BeatmapSet/Info.cs b/osu.Game/Overlays/BeatmapSet/Info.cs
index d7392b31e1..516eee43ce 100644
--- a/osu.Game/Overlays/BeatmapSet/Info.cs
+++ b/osu.Game/Overlays/BeatmapSet/Info.cs
@@ -26,6 +26,7 @@ namespace osu.Game.Overlays.BeatmapSet
         private readonly Box successRateBackground;
         private readonly Box background;
         private readonly SuccessRate successRate;
+        private readonly OsuSpriteText unrankedPlaceholder;
 
         public readonly Bindable<BeatmapSetInfo> BeatmapSet = new Bindable<BeatmapSetInfo>();
 
@@ -110,6 +111,14 @@ namespace osu.Game.Overlays.BeatmapSet
                                     RelativeSizeAxes = Axes.Both,
                                     Padding = new MarginPadding { Top = 20, Horizontal = 15 },
                                 },
+                                unrankedPlaceholder = new OsuSpriteText
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    Alpha = 0,
+                                    Text = "Unranked beatmap",
+                                    Font = OsuFont.GetFont(size: 13)
+                                },
                             },
                         },
                     },
@@ -122,6 +131,9 @@ namespace osu.Game.Overlays.BeatmapSet
                 tags.Text = b.NewValue?.Metadata.Tags ?? string.Empty;
                 genre.Text = b.NewValue?.OnlineInfo?.Genre?.Name ?? string.Empty;
                 language.Text = b.NewValue?.OnlineInfo?.Language?.Name ?? string.Empty;
+                var setHasLeaderboard = (b.NewValue?.OnlineInfo?.Status ?? 0) > 0;
+                successRate.Alpha = setHasLeaderboard ? 1 : 0;
+                unrankedPlaceholder.Alpha = setHasLeaderboard ? 0 : 1;
             };
         }
 

From 54580858499cb36326ef0a8beade69f5c568702c Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Tue, 4 Feb 2020 21:11:35 +0100
Subject: [PATCH 0240/1142] Adjust TopScoreUserSection font and spacing

---
 osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
index 72a7efd777..1923c5a48f 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
@@ -96,13 +96,14 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                             {
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.CentreLeft,
-                                Font = OsuFont.GetFont(size: 10, weight: FontWeight.Bold)
+                                Font = OsuFont.GetFont(size: 10)
                             },
                             flag = new UpdateableFlag
                             {
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.CentreLeft,
                                 Size = new Vector2(19, 13),
+                                Margin = new MarginPadding { Top = 2 },  // makes spacing look more even
                                 ShowPlaceholderOnNull = false,
                             },
                         }

From d23e4a1fa1cc649a7242b356298c081474ccdc35 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Tue, 4 Feb 2020 21:27:51 +0100
Subject: [PATCH 0241/1142] Change scoreboard text size

---
 osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 7a17412722..c124f7b262 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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;
@@ -23,7 +23,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
     {
         private const float horizontal_inset = 20;
         private const float row_height = 25;
-        private const int text_size = 12;
+        private const int text_size = 14;
 
         private readonly FillFlowContainer backgroundFlow;
 

From 979589704534c0592bb249b9f42084aadb929e77 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Tue, 4 Feb 2020 21:28:31 +0100
Subject: [PATCH 0242/1142] Enforce correct column order in ScoreTable

---
 osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index c124f7b262..7820323171 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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;
@@ -65,6 +65,10 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 for (int i = 0; i < value.Count; i++)
                     backgroundFlow.Add(new ScoreTableRowBackground(i, value[i]));
 
+                // Ensure correct column order
+                foreach (ScoreInfo score in value)
+                    score.Statistics = score.Statistics.OrderByDescending(pair => pair.Key).ToDictionary(pair => pair.Key, pair => pair.Value);
+
                 Columns = createHeaders(value[0]);
                 Content = value.Select((s, i) => createContent(i, s)).ToArray().ToRectangular();
             }

From 82914b5d6e6f852f9d21ab65277b3889f3d19468 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Tue, 4 Feb 2020 21:41:33 +0100
Subject: [PATCH 0243/1142] Adjust ScoreTable spacing

---
 osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 7820323171..f04477d911 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -81,9 +81,9 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 new TableColumn("rank", Anchor.CentreRight, new Dimension(GridSizeMode.AutoSize)),
                 new TableColumn("", Anchor.Centre, new Dimension(GridSizeMode.Absolute, 70)), // grade
                 new TableColumn("score", Anchor.CentreLeft, new Dimension(GridSizeMode.AutoSize)),
-                new TableColumn("accuracy", Anchor.CentreLeft, new Dimension(GridSizeMode.AutoSize)),
+                new TableColumn("accuracy", Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed, minSize: 60, maxSize: 70)),
                 new TableColumn("player", Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed, minSize: 150)),
-                new TableColumn("max combo", Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed, minSize: 70, maxSize: 90))
+                new TableColumn("max combo", Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed, minSize: 70, maxSize: 110))
             };
 
             foreach (var statistic in score.Statistics)
@@ -194,7 +194,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             public HeaderText(string text)
             {
                 Text = text.ToUpper();
-                Font = OsuFont.GetFont(size: 10, weight: FontWeight.Bold);
+                Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold);
             }
 
             [BackgroundDependencyLoader]

From d7af96a2e51817fbffa8d872d500f25081cc628b Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Tue, 4 Feb 2020 21:42:01 +0100
Subject: [PATCH 0244/1142] Adjust corner radius

---
 osu.Game/Overlays/BeatmapSet/Scores/ScoreTableRowBackground.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTableRowBackground.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTableRowBackground.cs
index 14ea3e6b38..83271efe09 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTableRowBackground.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTableRowBackground.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             RelativeSizeAxes = Axes.X;
             Height = 25;
 
-            CornerRadius = 3;
+            CornerRadius = 5;
             Masking = true;
 
             InternalChildren = new Drawable[]

From 86c0b509835eae73a680c72f41bb6bc59124c9fd Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Tue, 4 Feb 2020 21:45:45 +0100
Subject: [PATCH 0245/1142] Adjust font once again for readibility

---
 osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
index 1923c5a48f..9913493617 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
@@ -96,14 +96,14 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                             {
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.CentreLeft,
-                                Font = OsuFont.GetFont(size: 10)
+                                Font = OsuFont.GetFont(size: 12)
                             },
                             flag = new UpdateableFlag
                             {
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.CentreLeft,
                                 Size = new Vector2(19, 13),
-                                Margin = new MarginPadding { Top = 2 },  // makes spacing look more even
+                                Margin = new MarginPadding { Top = 3 },  // makes spacing look more even
                                 ShowPlaceholderOnNull = false,
                             },
                         }

From c1b8445b006fd22243a4235a7da14c458220b53f Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Tue, 4 Feb 2020 21:53:23 +0100
Subject: [PATCH 0246/1142] Add spacing to match osu-web

Note: due to osu-web using flex to even out the spacing and me not being able to implement the same behaviour here, I added a static margin to separate the title from the diffname above. This looks better than the previous state in most cases, the only scenario where this differs somehow visibly from web is on mapsets with large numbers of difficulties.
---
 osu.Game/Overlays/BeatmapSet/Header.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index c620ae2bca..9f79b92cb6 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -129,6 +129,7 @@ namespace osu.Game.Overlays.BeatmapSet
                                             {
                                                 Direction = FillDirection.Horizontal,
                                                 AutoSizeAxes = Axes.Both,
+                                                Margin = new MarginPadding { Top = 15 },
                                                 Children = new Drawable[]
                                                 {
                                                     title = new OsuSpriteText

From ae467538d3bf0ff1b3483ba201d8f19d7b7f46c9 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Tue, 4 Feb 2020 22:39:51 +0100
Subject: [PATCH 0247/1142] Fix tests

---
 .../Online/TestSceneBeatmapSetOverlayDetails.cs       | 11 ++++++++++-
 .../Online/TestSceneBeatmapSetOverlaySuccessRate.cs   |  5 +++++
 .../Online/TestSceneLeaderboardScopeSelector.cs       |  5 +++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlayDetails.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlayDetails.cs
index 990e0a166b..dea1e710b5 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlayDetails.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlayDetails.cs
@@ -5,9 +5,11 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapSet;
 using osu.Game.Screens.Select.Details;
 
@@ -22,6 +24,9 @@ namespace osu.Game.Tests.Visual.Online
 
         private RatingsExposingDetails details;
 
+        [Cached]
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+
         [SetUp]
         public void Setup() => Schedule(() =>
         {
@@ -55,8 +60,12 @@ namespace osu.Game.Tests.Visual.Online
                         {
                             Fails = Enumerable.Range(1, 100).Select(_ => RNG.Next(10)).ToArray(),
                             Retries = Enumerable.Range(-2, 100).Select(_ => RNG.Next(10)).ToArray(),
-                        }
+                        },
                     }
+                },
+                OnlineInfo = new BeatmapSetOnlineInfo
+                {
+                    Status = BeatmapSetOnlineStatus.Ranked
                 }
             };
         }
diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlaySuccessRate.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlaySuccessRate.cs
index 2b572c1f6c..03003daf81 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlaySuccessRate.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlaySuccessRate.cs
@@ -5,11 +5,13 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapSet;
 using osu.Game.Screens.Select.Details;
 using osuTK;
@@ -26,6 +28,9 @@ namespace osu.Game.Tests.Visual.Online
 
         private GraphExposingSuccessRate successRate;
 
+        [Cached]
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+
         [SetUp]
         public void Setup() => Schedule(() =>
         {
diff --git a/osu.Game.Tests/Visual/Online/TestSceneLeaderboardScopeSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneLeaderboardScopeSelector.cs
index cc3b2ac68b..f9a7bc99c3 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneLeaderboardScopeSelector.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneLeaderboardScopeSelector.cs
@@ -7,11 +7,16 @@ using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Framework.Bindables;
 using osu.Game.Screens.Select.Leaderboards;
+using osu.Framework.Allocation;
+using osu.Game.Overlays;
 
 namespace osu.Game.Tests.Visual.Online
 {
     public class TestSceneLeaderboardScopeSelector : OsuTestScene
     {
+        [Cached]
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(LeaderboardScopeSelector),

From b606408667e842dd0326bf071fa551a2e1de7452 Mon Sep 17 00:00:00 2001
From: Tree <thewildtree@outlook.com>
Date: Tue, 4 Feb 2020 23:02:28 +0100
Subject: [PATCH 0248/1142] Remove space

---
 osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
index 9913493617..00171e1170 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
@@ -103,7 +103,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.CentreLeft,
                                 Size = new Vector2(19, 13),
-                                Margin = new MarginPadding { Top = 3 },  // makes spacing look more even
+                                Margin = new MarginPadding { Top = 3 }, // makes spacing look more even
                                 ShowPlaceholderOnNull = false,
                             },
                         }

From 23d1d3fdf11bb9cf23e416cd0478dd8ba8ab4644 Mon Sep 17 00:00:00 2001
From: Tree <thewildtree@outlook.com>
Date: Tue, 4 Feb 2020 23:09:10 +0100
Subject: [PATCH 0249/1142] Convert field to local variable

---
 osu.Game/Overlays/BeatmapSet/Info.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Info.cs b/osu.Game/Overlays/BeatmapSet/Info.cs
index 516eee43ce..a71409a05f 100644
--- a/osu.Game/Overlays/BeatmapSet/Info.cs
+++ b/osu.Game/Overlays/BeatmapSet/Info.cs
@@ -26,7 +26,6 @@ namespace osu.Game.Overlays.BeatmapSet
         private readonly Box successRateBackground;
         private readonly Box background;
         private readonly SuccessRate successRate;
-        private readonly OsuSpriteText unrankedPlaceholder;
 
         public readonly Bindable<BeatmapSetInfo> BeatmapSet = new Bindable<BeatmapSetInfo>();
 
@@ -39,6 +38,8 @@ namespace osu.Game.Overlays.BeatmapSet
         public Info()
         {
             MetadataSection source, tags, genre, language;
+            OsuSpriteText unrankedPlaceholder;
+
             RelativeSizeAxes = Axes.X;
             Height = 220;
             Masking = true;

From c2a80119ca4cf9c65755abecfc9000dd234cc446 Mon Sep 17 00:00:00 2001
From: Tree <thewildtree@outlook.com>
Date: Tue, 4 Feb 2020 23:23:57 +0100
Subject: [PATCH 0250/1142] Remove using directives

---
 osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
index 5ce283d0d8..7eae05e4a9 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
@@ -3,7 +3,6 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -14,7 +13,6 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Overlays.Direct;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Overlays.BeatmapSet.Buttons
 {

From 447f31ccfc21f96f3795c6e4f121e3a1f82aded0 Mon Sep 17 00:00:00 2001
From: Tree <thewildtree@outlook.com>
Date: Tue, 4 Feb 2020 23:25:21 +0100
Subject: [PATCH 0251/1142] Remove using directive

---
 osu.Game/Overlays/BeatmapSet/Details.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Details.cs b/osu.Game/Overlays/BeatmapSet/Details.cs
index 85341e6f1c..bd13b4371e 100644
--- a/osu.Game/Overlays/BeatmapSet/Details.cs
+++ b/osu.Game/Overlays/BeatmapSet/Details.cs
@@ -9,7 +9,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Overlays.BeatmapSet.Buttons;
 using osu.Game.Screens.Select.Details;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Overlays.BeatmapSet
 {

From 9347c3f535e9820ed461ea5c11b62fd9d9a8d7a4 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 5 Feb 2020 11:13:32 +0300
Subject: [PATCH 0252/1142] Add trigger user change test

---
 .../Visual/Online/TestSceneCommentsContainer.cs      | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
index 9c526c4f81..33acc75fa8 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics;
 using osu.Game.Overlays.Comments;
 using osu.Game.Overlays;
 using osu.Framework.Allocation;
+using osu.Game.Online.API;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -34,21 +35,26 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
+        private CommentsContainer comments;
+        private readonly BasicScrollContainer scroll;
+
         public TestSceneCommentsContainer()
         {
-            BasicScrollContainer scroll;
-            CommentsContainer comments;
-
             Add(scroll = new BasicScrollContainer
             {
                 RelativeSizeAxes = Axes.Both,
                 Child = comments = new CommentsContainer()
             });
+        }
 
+        [BackgroundDependencyLoader]
+        private void load(IAPIProvider api)
+        {
             AddStep("Big Black comments", () => comments.ShowComments(CommentableType.Beatmapset, 41823));
             AddStep("Airman comments", () => comments.ShowComments(CommentableType.Beatmapset, 24313));
             AddStep("Lazer build comments", () => comments.ShowComments(CommentableType.Build, 4772));
             AddStep("News comments", () => comments.ShowComments(CommentableType.NewsPost, 715));
+            AddStep("Trigger user change", api.LocalUser.TriggerChange);
             AddStep("Idle state", () =>
             {
                 scroll.Clear();

From a3fd952f74bf6693a576f3db4b8261e399db037c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 5 Feb 2020 11:21:23 +0300
Subject: [PATCH 0253/1142] Use new SpotlightSelector in RankingsHeader

---
 .../Visual/Online/TestSceneRankingsHeader.cs  | 13 ++--
 .../Rankings/RankingsOverlayHeader.cs         | 61 +++----------------
 osu.Game/Overlays/Rankings/Spotlight.cs       | 18 ------
 3 files changed, 16 insertions(+), 76 deletions(-)
 delete mode 100644 osu.Game/Overlays/Rankings/Spotlight.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs
index 898e461bde..bc0ae3d264 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Rankings;
 using osu.Game.Rulesets;
@@ -37,20 +38,20 @@ namespace osu.Game.Tests.Visual.Online
                 Ruleset = { BindTarget = ruleset },
                 Spotlights = new[]
                 {
-                    new Spotlight
+                    new APISpotlight
                     {
                         Id = 1,
-                        Text = "Spotlight 1"
+                        Name = "Spotlight 1"
                     },
-                    new Spotlight
+                    new APISpotlight
                     {
                         Id = 2,
-                        Text = "Spotlight 2"
+                        Name = "Spotlight 2"
                     },
-                    new Spotlight
+                    new APISpotlight
                     {
                         Id = 3,
-                        Text = "Spotlight 3"
+                        Name = "Spotlight 3"
                     }
                 }
             });
diff --git a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
index 94afe4e5a5..41722034b6 100644
--- a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
+++ b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
@@ -8,21 +8,20 @@ using osu.Game.Rulesets;
 using osu.Game.Users;
 using System.Collections.Generic;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Allocation;
+using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Overlays.Rankings
 {
     public class RankingsOverlayHeader : TabControlOverlayHeader<RankingsScope>
     {
         public readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
-        public readonly Bindable<Spotlight> Spotlight = new Bindable<Spotlight>();
+        public readonly Bindable<APISpotlight> Spotlight = new Bindable<APISpotlight>();
         public readonly Bindable<Country> Country = new Bindable<Country>();
 
-        public IEnumerable<Spotlight> Spotlights
+        public IEnumerable<APISpotlight> Spotlights
         {
-            get => spotlightsContainer.Spotlights;
-            set => spotlightsContainer.Spotlights = value;
+            get => spotlightSelector.Spotlights;
+            set => spotlightSelector.Spotlights = value;
         }
 
         protected override ScreenTitle CreateTitle() => new RankingsTitle
@@ -35,7 +34,7 @@ namespace osu.Game.Overlays.Rankings
             Current = Ruleset
         };
 
-        private SpotlightsContainer spotlightsContainer;
+        private SpotlightSelector spotlightSelector;
 
         protected override Drawable CreateContent() => new FillFlowContainer
         {
@@ -48,9 +47,9 @@ namespace osu.Game.Overlays.Rankings
                 {
                     Current = Country
                 },
-                spotlightsContainer = new SpotlightsContainer
+                spotlightSelector = new SpotlightSelector
                 {
-                    Spotlight = { BindTarget = Spotlight }
+                    Current = { BindTarget = Spotlight }
                 }
             }
         };
@@ -62,7 +61,7 @@ namespace osu.Game.Overlays.Rankings
         }
 
         private void onCurrentChanged(ValueChangedEvent<RankingsScope> scope) =>
-            spotlightsContainer.FadeTo(scope.NewValue == RankingsScope.Spotlights ? 1 : 0, 200, Easing.OutQuint);
+            spotlightSelector.FadeTo(scope.NewValue == RankingsScope.Spotlights ? 1 : 0, 200, Easing.OutQuint);
 
         private class RankingsTitle : ScreenTitle
         {
@@ -81,48 +80,6 @@ namespace osu.Game.Overlays.Rankings
 
             protected override Drawable CreateIcon() => new ScreenTitleTextureIcon(@"Icons/rankings");
         }
-
-        private class SpotlightsContainer : CompositeDrawable
-        {
-            public readonly Bindable<Spotlight> Spotlight = new Bindable<Spotlight>();
-
-            public IEnumerable<Spotlight> Spotlights
-            {
-                get => dropdown.Items;
-                set => dropdown.Items = value;
-            }
-
-            private readonly OsuDropdown<Spotlight> dropdown;
-            private readonly Box background;
-
-            public SpotlightsContainer()
-            {
-                Height = 100;
-                RelativeSizeAxes = Axes.X;
-                InternalChildren = new Drawable[]
-                {
-                    background = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                    dropdown = new OsuDropdown<Spotlight>
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
-                        RelativeSizeAxes = Axes.X,
-                        Width = 0.8f,
-                        Current = Spotlight,
-                        Y = 20,
-                    }
-                };
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OverlayColourProvider colourProvider)
-            {
-                background.Colour = colourProvider.Dark3;
-            }
-        }
     }
 
     public enum RankingsScope
diff --git a/osu.Game/Overlays/Rankings/Spotlight.cs b/osu.Game/Overlays/Rankings/Spotlight.cs
deleted file mode 100644
index e956b4f449..0000000000
--- a/osu.Game/Overlays/Rankings/Spotlight.cs
+++ /dev/null
@@ -1,18 +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 Newtonsoft.Json;
-
-namespace osu.Game.Overlays.Rankings
-{
-    public class Spotlight
-    {
-        [JsonProperty("id")]
-        public int Id;
-
-        [JsonProperty("text")]
-        public string Text;
-
-        public override string ToString() => Text;
-    }
-}

From 63c595ed974ef224e7e350599ceafffa202320d0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Feb 2020 17:16:15 +0900
Subject: [PATCH 0254/1142] Make EditorBeatmap a component and move
 UpdateHitObject to it

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 20 ++--------------
 osu.Game/Screens/Edit/Editor.cs             |  6 ++---
 osu.Game/Screens/Edit/EditorBeatmap.cs      | 26 ++++++++++++++++++++-
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 5ac1d4ecc4..0014360d24 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
 using osu.Framework.Logging;
-using osu.Framework.Threading;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
@@ -50,8 +49,6 @@ namespace osu.Game.Rulesets.Edit
         [Resolved]
         private IBeatSnapProvider beatSnapProvider { get; set; }
 
-        private IBeatmapProcessor beatmapProcessor;
-
         private DrawableEditRulesetWrapper<TObject> drawableRulesetWrapper;
         private ComposeBlueprintContainer blueprintContainer;
         private Container distanceSnapGridContainer;
@@ -71,8 +68,6 @@ namespace osu.Game.Rulesets.Edit
         [BackgroundDependencyLoader]
         private void load(IFrameBasedClock framedClock)
         {
-            beatmapProcessor = Ruleset.CreateBeatmapProcessor(EditorBeatmap.PlayableBeatmap);
-
             EditorBeatmap.HitObjectAdded += addHitObject;
             EditorBeatmap.HitObjectRemoved += removeHitObject;
             EditorBeatmap.StartTimeChanged += UpdateHitObject;
@@ -240,19 +235,6 @@ namespace osu.Game.Rulesets.Edit
             lastGridUpdateTime = EditorClock.CurrentTime;
         }
 
-        private ScheduledDelegate scheduledUpdate;
-
-        public override void UpdateHitObject(HitObject hitObject)
-        {
-            scheduledUpdate?.Cancel();
-            scheduledUpdate = Schedule(() =>
-            {
-                beatmapProcessor?.PreProcess();
-                hitObject?.ApplyDefaults(EditorBeatmap.ControlPointInfo, EditorBeatmap.BeatmapInfo.BaseDifficulty);
-                beatmapProcessor?.PostProcess();
-            });
-        }
-
         private void addHitObject(HitObject hitObject) => UpdateHitObject(hitObject);
 
         private void removeHitObject(HitObject hitObject) => UpdateHitObject(null);
@@ -309,6 +291,8 @@ namespace osu.Game.Rulesets.Edit
         public override float GetSnappedDistanceFromDistance(double referenceTime, float distance)
             => DurationToDistance(referenceTime, beatSnapProvider.SnapTime(DistanceToDuration(referenceTime, distance), referenceTime));
 
+        public override void UpdateHitObject(HitObject hitObject) => EditorBeatmap.UpdateHitObject(hitObject);
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 8c7270d3a2..9a60edadc4 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.Edit
             clock.ChangeSource(sourceClock);
 
             playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Beatmap.Value.BeatmapInfo.Ruleset);
-            editorBeatmap = new EditorBeatmap(playableBeatmap, beatDivisor);
+            AddInternal(editorBeatmap = new EditorBeatmap(playableBeatmap, beatDivisor));
 
             dependencies.CacheAs<IFrameBasedClock>(clock);
             dependencies.CacheAs<IAdjustableClock>(clock);
@@ -104,7 +104,7 @@ namespace osu.Game.Screens.Edit
 
             fileMenuItems.Add(new EditorMenuItem("Exit", MenuItemType.Standard, this.Exit));
 
-            InternalChild = new OsuContextMenuContainer
+            AddInternal(new OsuContextMenuContainer
             {
                 RelativeSizeAxes = Axes.Both,
                 Children = new[]
@@ -189,7 +189,7 @@ namespace osu.Game.Screens.Edit
                         }
                     },
                 }
-            };
+            });
 
             menuBar.Mode.ValueChanged += onModeChanged;
 
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index 6edd62fa67..ba008e32e8 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -5,6 +5,8 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Beatmaps.Timing;
@@ -13,7 +15,7 @@ using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Screens.Edit
 {
-    public class EditorBeatmap : IBeatmap, IBeatSnapProvider
+    public class EditorBeatmap : Component, IBeatmap, IBeatSnapProvider
     {
         /// <summary>
         /// Invoked when a <see cref="HitObject"/> is added to this <see cref="EditorBeatmap"/>.
@@ -36,17 +38,39 @@ namespace osu.Game.Screens.Edit
 
         private readonly BindableBeatDivisor beatDivisor;
 
+        private readonly IBeatmapProcessor beatmapProcessor;
+
         private readonly Dictionary<HitObject, Bindable<double>> startTimeBindables = new Dictionary<HitObject, Bindable<double>>();
 
         public EditorBeatmap(IBeatmap playableBeatmap, BindableBeatDivisor beatDivisor = null)
         {
             PlayableBeatmap = playableBeatmap;
+
             this.beatDivisor = beatDivisor;
 
+            beatmapProcessor = playableBeatmap.BeatmapInfo.Ruleset?.CreateInstance().CreateBeatmapProcessor(PlayableBeatmap);
+
             foreach (var obj in HitObjects)
                 trackStartTime(obj);
         }
 
+        private ScheduledDelegate scheduledUpdate;
+
+        /// <summary>
+        /// Updates a <see cref="HitObject"/>, invoking <see cref="HitObject.ApplyDefaults"/> and re-processing the beatmap.
+        /// </summary>
+        /// <param name="hitObject">The <see cref="HitObject"/> to update.</param>
+        public void UpdateHitObject(HitObject hitObject)
+        {
+            scheduledUpdate?.Cancel();
+            scheduledUpdate = Scheduler.AddDelayed(() =>
+            {
+                beatmapProcessor?.PreProcess();
+                hitObject?.ApplyDefaults(ControlPointInfo, BeatmapInfo.BaseDifficulty);
+                beatmapProcessor?.PostProcess();
+            }, 0);
+        }
+
         public BeatmapInfo BeatmapInfo
         {
             get => PlayableBeatmap.BeatmapInfo;

From 96986bf5fcf03e56acbf8926346665ef1fea42f6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Feb 2020 17:32:33 +0900
Subject: [PATCH 0255/1142] Remove beat divisor from ctor and use DI instead

---
 ...tSceneHitObjectComposerDistanceSnapping.cs | 22 +++++++++++++++++--
 .../Visual/Editor/TimelineTestScene.cs        |  3 ++-
 osu.Game/Screens/Edit/Editor.cs               |  6 ++---
 osu.Game/Screens/Edit/EditorBeatmap.cs        |  8 +++----
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Editor/TestSceneHitObjectComposerDistanceSnapping.cs b/osu.Game.Tests/Editor/TestSceneHitObjectComposerDistanceSnapping.cs
index 5a4e76d586..3cb5909ba9 100644
--- a/osu.Game.Tests/Editor/TestSceneHitObjectComposerDistanceSnapping.cs
+++ b/osu.Game.Tests/Editor/TestSceneHitObjectComposerDistanceSnapping.cs
@@ -3,6 +3,8 @@
 
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Edit;
@@ -23,15 +25,31 @@ namespace osu.Game.Tests.Editor
         [Cached(typeof(IBeatSnapProvider))]
         private readonly EditorBeatmap editorBeatmap;
 
+        protected override Container<Drawable> Content { get; }
+
         public TestSceneHitObjectComposerDistanceSnapping()
         {
-            editorBeatmap = new EditorBeatmap(new OsuBeatmap(), BeatDivisor);
+            base.Content.Add(new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    editorBeatmap = new EditorBeatmap(new OsuBeatmap()),
+                    Content = new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                    }
+                },
+            });
         }
 
         [SetUp]
         public void Setup() => Schedule(() =>
         {
-            Child = composer = new TestHitObjectComposer();
+            Children = new Drawable[]
+            {
+                composer = new TestHitObjectComposer()
+            };
 
             BeatDivisor.Value = 1;
 
diff --git a/osu.Game.Tests/Visual/Editor/TimelineTestScene.cs b/osu.Game.Tests/Visual/Editor/TimelineTestScene.cs
index b5e526d3c2..40c0fedc9e 100644
--- a/osu.Game.Tests/Visual/Editor/TimelineTestScene.cs
+++ b/osu.Game.Tests/Visual/Editor/TimelineTestScene.cs
@@ -38,13 +38,14 @@ namespace osu.Game.Tests.Visual.Editor
         {
             Beatmap.Value = new WaveformTestBeatmap(audio);
 
-            var editorBeatmap = new EditorBeatmap((Beatmap<HitObject>)Beatmap.Value.Beatmap, BeatDivisor);
+            var editorBeatmap = new EditorBeatmap((Beatmap<HitObject>)Beatmap.Value.Beatmap);
 
             Dependencies.Cache(editorBeatmap);
             Dependencies.CacheAs<IBeatSnapProvider>(editorBeatmap);
 
             AddRange(new Drawable[]
             {
+                editorBeatmap,
                 new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 9a60edadc4..3bec4b8f6f 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -80,15 +80,15 @@ namespace osu.Game.Screens.Edit
             clock = new EditorClock(Beatmap.Value, beatDivisor) { IsCoupled = false };
             clock.ChangeSource(sourceClock);
 
-            playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Beatmap.Value.BeatmapInfo.Ruleset);
-            AddInternal(editorBeatmap = new EditorBeatmap(playableBeatmap, beatDivisor));
-
             dependencies.CacheAs<IFrameBasedClock>(clock);
             dependencies.CacheAs<IAdjustableClock>(clock);
 
             // todo: remove caching of this and consume via editorBeatmap?
             dependencies.Cache(beatDivisor);
 
+            playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Beatmap.Value.BeatmapInfo.Ruleset);
+            AddInternal(editorBeatmap = new EditorBeatmap(playableBeatmap));
+
             dependencies.CacheAs(editorBeatmap);
 
             EditorMenuBar menuBar;
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index ba008e32e8..cacb539891 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Threading;
@@ -36,18 +37,17 @@ namespace osu.Game.Screens.Edit
 
         public readonly IBeatmap PlayableBeatmap;
 
-        private readonly BindableBeatDivisor beatDivisor;
+        [Resolved]
+        private BindableBeatDivisor beatDivisor { get; set; }
 
         private readonly IBeatmapProcessor beatmapProcessor;
 
         private readonly Dictionary<HitObject, Bindable<double>> startTimeBindables = new Dictionary<HitObject, Bindable<double>>();
 
-        public EditorBeatmap(IBeatmap playableBeatmap, BindableBeatDivisor beatDivisor = null)
+        public EditorBeatmap(IBeatmap playableBeatmap)
         {
             PlayableBeatmap = playableBeatmap;
 
-            this.beatDivisor = beatDivisor;
-
             beatmapProcessor = playableBeatmap.BeatmapInfo.Ruleset?.CreateInstance().CreateBeatmapProcessor(PlayableBeatmap);
 
             foreach (var obj in HitObjects)

From dffc58c5fae9e18fc96af3b8128ce3a7b2d06226 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 4 Feb 2020 12:23:02 +0900
Subject: [PATCH 0256/1142] Add blueprint type to timeline test

---
 .../Editor/TestSceneTimelineBlueprintContainer.cs   | 13 +++++++++++++
 .../Visual/Editor/TestSceneTimingScreen.cs          |  7 ++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneTimelineBlueprintContainer.cs b/osu.Game.Tests/Visual/Editor/TestSceneTimelineBlueprintContainer.cs
index 3c75fd5310..4d8f877575 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneTimelineBlueprintContainer.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneTimelineBlueprintContainer.cs
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
+using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
@@ -10,6 +12,17 @@ namespace osu.Game.Tests.Visual.Editor
     [TestFixture]
     public class TestSceneTimelineBlueprintContainer : TimelineTestScene
     {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(TimelineHitObjectBlueprint),
+        };
+
         public override Drawable CreateTestComponent() => new TimelineBlueprintContainer();
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            Clock.Seek(10000);
+        }
     }
 }
diff --git a/osu.Game.Tests/Visual/Editor/TestSceneTimingScreen.cs b/osu.Game.Tests/Visual/Editor/TestSceneTimingScreen.cs
index adfed9a299..ae09a7fa47 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneTimingScreen.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneTimingScreen.cs
@@ -27,7 +27,12 @@ namespace osu.Game.Tests.Visual.Editor
         };
 
         [Cached(typeof(EditorBeatmap))]
-        private readonly EditorBeatmap editorBeatmap = new EditorBeatmap(new OsuBeatmap());
+        private readonly EditorBeatmap editorBeatmap;
+
+        public TestSceneTimingScreen()
+        {
+            editorBeatmap = new EditorBeatmap(new OsuBeatmap());
+        }
 
         [BackgroundDependencyLoader]
         private void load()

From cd6902a312480e53a7f49d1fa264ef158750d4cd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Feb 2020 17:12:26 +0900
Subject: [PATCH 0257/1142] Make EndTime and RepeatCount settable

---
 osu.Game.Rulesets.Catch/Objects/BananaShower.cs   | 6 +++++-
 osu.Game.Rulesets.Catch/Objects/JuiceStream.cs    | 6 +++++-
 osu.Game.Rulesets.Mania/Objects/HoldNote.cs       | 6 +++++-
 osu.Game.Rulesets.Osu/Objects/Slider.cs           | 9 +++++++--
 osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs       | 6 +++++-
 osu.Game.Rulesets.Taiko/Objects/Swell.cs          | 6 +++++-
 osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs | 7 ++++++-
 osu.Game/Rulesets/Objects/Types/IHasEndTime.cs    | 5 ++++-
 osu.Game/Rulesets/Objects/Types/IHasRepeats.cs    | 2 +-
 9 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/BananaShower.cs b/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
index 267e6d12c7..0c754412e5 100644
--- a/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
+++ b/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
@@ -36,7 +36,11 @@ namespace osu.Game.Rulesets.Catch.Objects
             }
         }
 
-        public double EndTime => StartTime + Duration;
+        public double EndTime
+        {
+            get => StartTime + Duration;
+            set => Duration = value - StartTime;
+        }
 
         public double Duration { get; set; }
     }
diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index a4ed966abb..4d68bf592c 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -110,7 +110,11 @@ namespace osu.Game.Rulesets.Catch.Objects
             }
         }
 
-        public double EndTime => StartTime + this.SpanCount() * Path.Distance / Velocity;
+        public double EndTime
+        {
+            get => StartTime + this.SpanCount() * Path.Distance / Velocity;
+            set => throw new System.NotImplementedException();
+        }
 
         public float EndX => X + this.CurvePositionAt(1).X / CatchPlayfield.BASE_WIDTH;
 
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
index bdba813eed..86d3d2b2b0 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
@@ -15,7 +15,11 @@ namespace osu.Game.Rulesets.Mania.Objects
     /// </summary>
     public class HoldNote : ManiaHitObject, IHasEndTime
     {
-        public double EndTime => StartTime + Duration;
+        public double EndTime
+        {
+            get => StartTime + Duration;
+            set => Duration = value - StartTime;
+        }
 
         private double duration;
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index fe65ab78d1..bab7e6dbee 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -18,7 +18,12 @@ namespace osu.Game.Rulesets.Osu.Objects
 {
     public class Slider : OsuHitObject, IHasCurve
     {
-        public double EndTime => StartTime + this.SpanCount() * Path.Distance / Velocity;
+        public double EndTime
+        {
+            get => StartTime + this.SpanCount() * Path.Distance / Velocity;
+            set => throw new System.NotImplementedException();
+        }
+
         public double Duration => EndTime - StartTime;
 
         private readonly Cached<Vector2> endPositionCache = new Cached<Vector2>();
@@ -81,7 +86,7 @@ namespace osu.Game.Rulesets.Osu.Objects
             set
             {
                 repeatCount = value;
-                endPositionCache.Invalidate();
+                updateNestedPositions();
             }
         }
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
index 8956ca9c19..aacd78f176 100644
--- a/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
@@ -18,7 +18,11 @@ namespace osu.Game.Rulesets.Taiko.Objects
         /// </summary>
         private const float base_distance = 100;
 
-        public double EndTime => StartTime + Duration;
+        public double EndTime
+        {
+            get => StartTime + Duration;
+            set => Duration = value - StartTime;
+        }
 
         public double Duration { get; set; }
 
diff --git a/osu.Game.Rulesets.Taiko/Objects/Swell.cs b/osu.Game.Rulesets.Taiko/Objects/Swell.cs
index e60984596d..2f06066a16 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Swell.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Swell.cs
@@ -11,7 +11,11 @@ namespace osu.Game.Rulesets.Taiko.Objects
 {
     public class Swell : TaikoHitObject, IHasEndTime
     {
-        public double EndTime => StartTime + Duration;
+        public double EndTime
+        {
+            get => StartTime + Duration;
+            set => Duration = value - StartTime;
+        }
 
         public double Duration { get; set; }
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
index 8d523022d6..b5cd9be245 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
@@ -26,7 +26,12 @@ namespace osu.Game.Rulesets.Objects.Legacy
         public List<IList<HitSampleInfo>> NodeSamples { get; set; }
         public int RepeatCount { get; set; }
 
-        public double EndTime => StartTime + this.SpanCount() * Distance / Velocity;
+        public double EndTime
+        {
+            get => StartTime + this.SpanCount() * Distance / Velocity;
+            set => throw new System.NotImplementedException();
+        }
+
         public double Duration => EndTime - StartTime;
 
         public double Velocity = 1;
diff --git a/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs b/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs
index 516f1002a4..bc7103c60d 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasEndTime.cs
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using Newtonsoft.Json;
+
 namespace osu.Game.Rulesets.Objects.Types
 {
     /// <summary>
@@ -11,7 +13,8 @@ namespace osu.Game.Rulesets.Objects.Types
         /// <summary>
         /// The time at which the HitObject ends.
         /// </summary>
-        double EndTime { get; }
+        [JsonIgnore]
+        double EndTime { get; set; }
 
         /// <summary>
         /// The duration of the HitObject.
diff --git a/osu.Game/Rulesets/Objects/Types/IHasRepeats.cs b/osu.Game/Rulesets/Objects/Types/IHasRepeats.cs
index b22752e902..256b1f3963 100644
--- a/osu.Game/Rulesets/Objects/Types/IHasRepeats.cs
+++ b/osu.Game/Rulesets/Objects/Types/IHasRepeats.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Objects.Types
         /// <summary>
         /// The amount of times the HitObject repeats.
         /// </summary>
-        int RepeatCount { get; }
+        int RepeatCount { get; set; }
 
         /// <summary>
         /// The samples to be played when each node of the <see cref="IHasRepeats"/> is hit.<br />

From fa65e3a5bb51db63dc33f74189607e5d8dcb0487 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 5 Feb 2020 12:09:32 +0300
Subject: [PATCH 0258/1142] Make spotlight selector work

---
 osu.Game/Overlays/RankingsOverlay.cs | 32 +++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index 84470d9caa..36f5a3155a 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -14,6 +14,8 @@ using osu.Game.Online.API;
 using System.Threading;
 using osu.Game.Online.API.Requests;
 using osu.Game.Overlays.Rankings.Tables;
+using osu.Game.Online.API.Requests.Responses;
+using System.Linq;
 
 namespace osu.Game.Overlays
 {
@@ -22,11 +24,13 @@ namespace osu.Game.Overlays
         protected readonly Bindable<Country> Country = new Bindable<Country>();
         protected readonly Bindable<RankingsScope> Scope = new Bindable<RankingsScope>();
         private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
+        private readonly Bindable<APISpotlight> spotlight = new Bindable<APISpotlight>();
 
         private readonly BasicScrollContainer scrollFlow;
         private readonly Container tableContainer;
         private readonly DimmedLoadingLayer loading;
         private readonly Box background;
+        private readonly RankingsOverlayHeader header;
 
         private APIRequest lastRequest;
         private CancellationTokenSource cancellationToken;
@@ -54,14 +58,15 @@ namespace osu.Game.Overlays
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            new RankingsOverlayHeader
+                            header = new RankingsOverlayHeader
                             {
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
                                 Depth = -float.MaxValue,
                                 Country = { BindTarget = Country },
                                 Current = { BindTarget = Scope },
-                                Ruleset = { BindTarget = ruleset }
+                                Ruleset = { BindTarget = ruleset },
+                                Spotlight = { BindTarget = spotlight }
                             },
                             new Container
                             {
@@ -109,11 +114,19 @@ namespace osu.Game.Overlays
                 if (Scope.Value != RankingsScope.Performance)
                     Country.Value = null;
 
+                if (Scope.Value == RankingsScope.Spotlights && !header.Spotlights.Any())
+                {
+                    getSpotlights();
+                    return;
+                }
+
                 Scheduler.AddOnce(loadNewContent);
             }, true);
 
             ruleset.BindValueChanged(_ => Scheduler.AddOnce(loadNewContent), true);
 
+            spotlight.BindValueChanged(_ => Scheduler.AddOnce(loadNewContent), true);
+
             base.LoadComplete();
         }
 
@@ -127,6 +140,14 @@ namespace osu.Game.Overlays
             Country.Value = requested;
         }
 
+        private void getSpotlights()
+        {
+            loading.Show();
+            var request = new GetSpotlightsRequest();
+            request.Success += response => header.Spotlights = response.Spotlights;
+            api.Queue(request);
+        }
+
         private void loadNewContent()
         {
             loading.Show();
@@ -145,7 +166,6 @@ namespace osu.Game.Overlays
 
             request.Success += () => loadTable(createTableFromResponse(request));
             request.Failure += _ => loadTable(null);
-
             api.Queue(request);
         }
 
@@ -161,6 +181,9 @@ namespace osu.Game.Overlays
 
                 case RankingsScope.Score:
                     return new GetUserRankingsRequest(ruleset.Value, UserRankingsType.Score);
+
+                case RankingsScope.Spotlights:
+                    return new GetSpotlightRankingsRequest(ruleset.Value, header.Spotlight.Value.Id);
             }
 
             return null;
@@ -184,6 +207,9 @@ namespace osu.Game.Overlays
 
                 case GetCountryRankingsRequest countryRequest:
                     return new CountriesTable(1, countryRequest.Result.Countries);
+
+                case GetSpotlightRankingsRequest spotlightRequest:
+                    return new ScoresTable(1, spotlightRequest.Result.Users);
             }
 
             return null;

From 2b0b789980a0c7a099bc4ae88a5cf11a2229b70e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 5 Feb 2020 12:14:24 +0300
Subject: [PATCH 0259/1142] Naming adjustments

---
 osu.Game/Overlays/RankingsOverlay.cs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index 36f5a3155a..39f106a24e 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays
         private readonly Bindable<APISpotlight> spotlight = new Bindable<APISpotlight>();
 
         private readonly BasicScrollContainer scrollFlow;
-        private readonly Container tableContainer;
+        private readonly Container contentContainer;
         private readonly DimmedLoadingLayer loading;
         private readonly Box background;
         private readonly RankingsOverlayHeader header;
@@ -74,7 +74,7 @@ namespace osu.Game.Overlays
                                 AutoSizeAxes = Axes.Y,
                                 Children = new Drawable[]
                                 {
-                                    tableContainer = new Container
+                                    contentContainer = new Container
                                     {
                                         Anchor = Anchor.TopCentre,
                                         Origin = Anchor.TopCentre,
@@ -160,12 +160,12 @@ namespace osu.Game.Overlays
 
             if (request == null)
             {
-                loadTable(null);
+                loadContent(null);
                 return;
             }
 
-            request.Success += () => loadTable(createTableFromResponse(request));
-            request.Failure += _ => loadTable(null);
+            request.Success += () => loadContent(createContentFromResponse(request));
+            request.Failure += _ => loadContent(null);
             api.Queue(request);
         }
 
@@ -189,7 +189,7 @@ namespace osu.Game.Overlays
             return null;
         }
 
-        private Drawable createTableFromResponse(APIRequest request)
+        private Drawable createContentFromResponse(APIRequest request)
         {
             switch (request)
             {
@@ -215,21 +215,21 @@ namespace osu.Game.Overlays
             return null;
         }
 
-        private void loadTable(Drawable table)
+        private void loadContent(Drawable content)
         {
             scrollFlow.ScrollToStart();
 
-            if (table == null)
+            if (content == null)
             {
-                tableContainer.Clear();
+                contentContainer.Clear();
                 loading.Hide();
                 return;
             }
 
-            LoadComponentAsync(table, t =>
+            LoadComponentAsync(content, t =>
             {
                 loading.Hide();
-                tableContainer.Child = table;
+                contentContainer.Child = content;
             }, (cancellationToken = new CancellationTokenSource()).Token);
         }
     }

From b83ee6dabf45a4baf1ceebd4204ad56affe1245b Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 5 Feb 2020 12:22:42 +0300
Subject: [PATCH 0260/1142] Show beatmap panels for selected spotlight

---
 osu.Game/Overlays/RankingsOverlay.cs | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index 39f106a24e..2a4bc28b18 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -16,6 +16,8 @@ using osu.Game.Online.API.Requests;
 using osu.Game.Overlays.Rankings.Tables;
 using osu.Game.Online.API.Requests.Responses;
 using System.Linq;
+using osuTK;
+using osu.Game.Overlays.Direct;
 
 namespace osu.Game.Overlays
 {
@@ -38,6 +40,9 @@ namespace osu.Game.Overlays
         [Resolved]
         private IAPIProvider api { get; set; }
 
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
         public RankingsOverlay()
             : base(OverlayColourScheme.Green)
         {
@@ -209,7 +214,28 @@ namespace osu.Game.Overlays
                     return new CountriesTable(1, countryRequest.Result.Countries);
 
                 case GetSpotlightRankingsRequest spotlightRequest:
-                    return new ScoresTable(1, spotlightRequest.Result.Users);
+                    return new FillFlowContainer
+                    {
+                        AutoSizeAxes = Axes.Y,
+                        RelativeSizeAxes = Axes.X,
+                        Direction = FillDirection.Vertical,
+                        Spacing = new Vector2(0, 20),
+                        Children = new Drawable[]
+                        {
+                            new ScoresTable(1, spotlightRequest.Result.Users),
+                            new FillFlowContainer
+                            {
+                                AutoSizeAxes = Axes.Y,
+                                RelativeSizeAxes = Axes.X,
+                                Spacing = new Vector2(10),
+                                Children = spotlightRequest.Result.BeatmapSets.Select(b => new DirectGridPanel(b.ToBeatmapSet(rulesets))
+                                {
+                                    Anchor = Anchor.TopCentre,
+                                    Origin = Anchor.TopCentre,
+                                }).ToList()
+                            }
+                        }
+                    };
             }
 
             return null;

From d04cc0123df7c7c7d3a476a03a27f93dd79257f4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Feb 2020 17:16:37 +0900
Subject: [PATCH 0261/1142] Initial implementation of timeline blueprint
 dragbars

---
 .../Compose/Components/Timeline/Timeline.cs   | 13 ++-
 .../Timeline/TimelineHitObjectBlueprint.cs    | 99 ++++++++++++++-----
 2 files changed, 85 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index a33040f400..0475e68e42 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -179,11 +179,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [Resolved]
         private IBeatSnapProvider beatSnapProvider { get; set; }
 
-        public (Vector2 position, double time) GetSnappedPosition(Vector2 position, double time)
-        {
-            var targetTime = (position.X / Content.DrawWidth) * track.Length;
-            return (position, beatSnapProvider.SnapTime(targetTime));
-        }
+        public double GetTimeFromScreenSpacePosition(Vector2 position)
+            => getTimeFromPosition(Content.ToLocalSpace(position));
+
+        public (Vector2 position, double time) GetSnappedPosition(Vector2 position, double time) =>
+            (position, beatSnapProvider.SnapTime(getTimeFromPosition(position)));
+
+        private double getTimeFromPosition(Vector2 localPosition) =>
+            (localPosition.X / Content.DrawWidth) * track.Length;
 
         public float GetBeatSnapDistanceAt(double referenceTime) => throw new NotImplementedException();
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 2ed5471444..2ac35534f4 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -2,11 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using JetBrains.Annotations;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -24,7 +26,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [UsedImplicitly]
         private readonly Bindable<double> startTime;
 
-        public const float THICKNESS = 3;
+        public const float THICKNESS = 5;
 
         private const float circle_size = 16;
 
@@ -44,25 +46,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
-            if (hitObject is IHasEndTime)
-            {
-                AddInternal(extensionBar = new Container
-                {
-                    CornerRadius = 2,
-                    Masking = true,
-                    Size = new Vector2(1, THICKNESS),
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.CentreLeft,
-                    RelativePositionAxes = Axes.X,
-                    RelativeSizeAxes = Axes.X,
-                    Colour = Color4.Black,
-                    Child = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                    }
-                });
-            }
-
             AddInternal(circle = new Circle
             {
                 Size = new Vector2(circle_size),
@@ -74,6 +57,78 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 BorderColour = Color4.Black,
                 BorderThickness = THICKNESS,
             });
+
+            if (hitObject is IHasEndTime)
+            {
+                AddRangeInternal(new Drawable[]
+                {
+                    extensionBar = new Container
+                    {
+                        CornerRadius = 2,
+                        Masking = true,
+                        Size = new Vector2(1, THICKNESS),
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        RelativePositionAxes = Axes.X,
+                        RelativeSizeAxes = Axes.X,
+                        Child = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                        }
+                    },
+                    new DragBar(hitObject),
+                });
+            }
+        }
+
+        public class DragBar : CompositeDrawable
+        {
+            private readonly HitObject hitObject;
+
+            [Resolved]
+            private Timeline timeline { get; set; }
+
+            public DragBar(HitObject hitObject)
+            {
+                this.hitObject = hitObject;
+
+                CornerRadius = 2;
+                Masking = true;
+                Size = new Vector2(THICKNESS, 1.5f);
+                Anchor = Anchor.CentreRight;
+                Origin = Anchor.CentreRight;
+                RelativePositionAxes = Axes.X;
+                RelativeSizeAxes = Axes.Y;
+                InternalChild = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                };
+            }
+
+            protected override bool OnDragStart(DragStartEvent e) => true;
+
+            [Resolved]
+            private EditorBeatmap beatmap { get; set; }
+
+            protected override void OnDrag(DragEvent e)
+            {
+                base.OnDrag(e);
+
+                var time = timeline.GetTimeFromScreenSpacePosition(e.ScreenSpaceMousePosition);
+
+                switch (hitObject)
+                {
+                    case IHasRepeats repeatHitObject:
+                        repeatHitObject.RepeatCount = (int)((time - hitObject.StartTime) / (repeatHitObject.Duration / repeatHitObject.RepeatCount));
+                        break;
+
+                    case IHasEndTime endTimeHitObject:
+                        endTimeHitObject.EndTime = time;
+                        break;
+                }
+
+                beatmap.UpdateHitObject(hitObject);
+            }
         }
 
         protected override void Update()
@@ -88,14 +143,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         {
             circle.BorderColour = Color4.Orange;
             if (extensionBar != null)
-                extensionBar.Colour = Color4.Orange;
+                extensionBar.BorderColour = Color4.Orange;
         }
 
         protected override void OnDeselected()
         {
             circle.BorderColour = Color4.Black;
             if (extensionBar != null)
-                extensionBar.Colour = Color4.Black;
+                extensionBar.BorderColour = Color4.Black;
         }
 
         public override Quad SelectionQuad

From 09273d1da97a5b2ffe75fc9185a0c43161fdcb7c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Feb 2020 18:14:44 +0900
Subject: [PATCH 0262/1142] Fix test scene not correctly building a playable
 beatmap

---
 .../Visual/Editor/TimelineTestScene.cs        |  5 ++--
 osu.Game.Tests/WaveformTestBeatmap.cs         | 27 ++++++++++++++-----
 osu.Game/Tests/Beatmaps/TestBeatmap.cs        |  4 ++-
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editor/TimelineTestScene.cs b/osu.Game.Tests/Visual/Editor/TimelineTestScene.cs
index 40c0fedc9e..7081eb3af5 100644
--- a/osu.Game.Tests/Visual/Editor/TimelineTestScene.cs
+++ b/osu.Game.Tests/Visual/Editor/TimelineTestScene.cs
@@ -13,7 +13,6 @@ using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osuTK;
@@ -38,7 +37,9 @@ namespace osu.Game.Tests.Visual.Editor
         {
             Beatmap.Value = new WaveformTestBeatmap(audio);
 
-            var editorBeatmap = new EditorBeatmap((Beatmap<HitObject>)Beatmap.Value.Beatmap);
+            var playable = Beatmap.Value.GetPlayableBeatmap(Beatmap.Value.BeatmapInfo.Ruleset);
+
+            var editorBeatmap = new EditorBeatmap(playable);
 
             Dependencies.Cache(editorBeatmap);
             Dependencies.CacheAs<IBeatSnapProvider>(editorBeatmap);
diff --git a/osu.Game.Tests/WaveformTestBeatmap.cs b/osu.Game.Tests/WaveformTestBeatmap.cs
index b7d7bb1ee1..df6394ed34 100644
--- a/osu.Game.Tests/WaveformTestBeatmap.cs
+++ b/osu.Game.Tests/WaveformTestBeatmap.cs
@@ -11,6 +11,8 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Formats;
 using osu.Game.IO;
 using osu.Game.IO.Archives;
+using osu.Game.Rulesets.Catch;
+using osu.Game.Tests.Beatmaps;
 using osu.Game.Tests.Resources;
 
 namespace osu.Game.Tests
@@ -20,11 +22,18 @@ namespace osu.Game.Tests
     /// </summary>
     public class WaveformTestBeatmap : WorkingBeatmap
     {
+        private readonly Beatmap beatmap;
         private readonly ITrackStore trackStore;
 
         public WaveformTestBeatmap(AudioManager audioManager)
-            : base(new BeatmapInfo(), audioManager)
+            : this(audioManager, new WaveformBeatmap())
         {
+        }
+
+        public WaveformTestBeatmap(AudioManager audioManager, Beatmap beatmap)
+            : base(beatmap.BeatmapInfo, audioManager)
+        {
+            this.beatmap = beatmap;
             trackStore = audioManager.GetTrackStore(getZipReader());
         }
 
@@ -34,11 +43,11 @@ namespace osu.Game.Tests
             trackStore?.Dispose();
         }
 
-        private Stream getStream() => TestResources.GetTestBeatmapStream();
+        private static Stream getStream() => TestResources.GetTestBeatmapStream();
 
-        private ZipArchiveReader getZipReader() => new ZipArchiveReader(getStream());
+        private static ZipArchiveReader getZipReader() => new ZipArchiveReader(getStream());
 
-        protected override IBeatmap GetBeatmap() => createTestBeatmap();
+        protected override IBeatmap GetBeatmap() => beatmap;
 
         protected override Texture GetBackground() => null;
 
@@ -57,10 +66,16 @@ namespace osu.Game.Tests
             }
         }
 
-        private Beatmap createTestBeatmap()
+        private class WaveformBeatmap : TestBeatmap
         {
-            using (var reader = getZipReader())
+            public WaveformBeatmap()
+                : base(new CatchRuleset().RulesetInfo)
             {
+            }
+
+            protected override Beatmap CreateBeatmap()
+            {
+                using (var reader = getZipReader())
                 using (var beatmapStream = reader.GetStream(reader.Filenames.First(f => f.EndsWith(".osu"))))
                 using (var beatmapReader = new LineBufferedReader(beatmapStream))
                     return Decoder.GetDecoder<Beatmap>(beatmapReader).Decode(beatmapReader);
diff --git a/osu.Game/Tests/Beatmaps/TestBeatmap.cs b/osu.Game/Tests/Beatmaps/TestBeatmap.cs
index d6f92ba086..96e3c037a3 100644
--- a/osu.Game/Tests/Beatmaps/TestBeatmap.cs
+++ b/osu.Game/Tests/Beatmaps/TestBeatmap.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Tests.Beatmaps
     {
         public TestBeatmap(RulesetInfo ruleset)
         {
-            var baseBeatmap = createTestBeatmap();
+            var baseBeatmap = CreateBeatmap();
 
             BeatmapInfo = baseBeatmap.BeatmapInfo;
             ControlPointInfo = baseBeatmap.ControlPointInfo;
@@ -37,6 +37,8 @@ namespace osu.Game.Tests.Beatmaps
             };
         }
 
+        protected virtual Beatmap CreateBeatmap() => createTestBeatmap();
+
         private static Beatmap createTestBeatmap()
         {
             using (var stream = new MemoryStream(Encoding.UTF8.GetBytes(test_beatmap_data)))

From d56accaef1ab193f33d214a16e53a56a8e22be49 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Feb 2020 15:32:51 +0900
Subject: [PATCH 0263/1142] Disallow negative / zero repeat counts (and fix
 off-by-one)

---
 .../Components/Timeline/TimelineHitObjectBlueprint.cs    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 2ac35534f4..b2da1577d0 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -119,7 +119,14 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 switch (hitObject)
                 {
                     case IHasRepeats repeatHitObject:
-                        repeatHitObject.RepeatCount = (int)((time - hitObject.StartTime) / (repeatHitObject.Duration / repeatHitObject.RepeatCount));
+                        // find the number of repeats which can fit in the requested time.
+                        var lengthOfOneRepeat = repeatHitObject.Duration / (repeatHitObject.RepeatCount + 1);
+                        var proposedCount = (int)((time - hitObject.StartTime) / lengthOfOneRepeat) - 1;
+
+                        if (proposedCount == repeatHitObject.RepeatCount || proposedCount < 0)
+                            return;
+
+                        repeatHitObject.RepeatCount = proposedCount;
                         break;
 
                     case IHasEndTime endTimeHitObject:

From cef45afbc85eb24bad74f44d1e8d4c8d16913b86 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Feb 2020 15:33:04 +0900
Subject: [PATCH 0264/1142] Add a simple hover state

---
 .../Timeline/TimelineHitObjectBlueprint.cs    | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index b2da1577d0..8a6dd40bde 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -23,6 +23,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private readonly Container extensionBar;
 
+        protected override bool ShouldBeConsideredForInput(Drawable child) => true;
+
         [UsedImplicitly]
         private readonly Bindable<double> startTime;
 
@@ -105,6 +107,45 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 };
             }
 
+            protected override bool OnHover(HoverEvent e)
+            {
+                updateState();
+
+                return base.OnHover(e);
+            }
+
+            protected override void OnHoverLost(HoverLostEvent e)
+            {
+                updateState();
+                base.OnHoverLost(e);
+            }
+
+            private bool hasMouseDown;
+
+            protected override bool OnMouseDown(MouseDownEvent e)
+            {
+                hasMouseDown = true;
+                updateState();
+                return true;
+            }
+
+            protected override void OnMouseUp(MouseUpEvent e)
+            {
+                hasMouseDown = false;
+                updateState();
+                base.OnMouseUp(e);
+            }
+
+            private void updateState()
+            {
+                if (IsHovered || hasMouseDown)
+                    Colour = Color4.Orange;
+                else
+                {
+                    Colour = Color4.White;
+                }
+            }
+
             protected override bool OnDragStart(DragStartEvent e) => true;
 
             [Resolved]

From 3d42973764434fbfe5359996e9edb270a56c759d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Feb 2020 15:58:35 +0900
Subject: [PATCH 0265/1142] Allow scrolling via drag while dragging a hold note
 handle

---
 .../Timeline/TimelineBlueprintContainer.cs    | 40 ++++++++++++-------
 .../Timeline/TimelineHitObjectBlueprint.cs    | 16 +++++++-
 2 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 3b9cb1df24..9f3d776e5c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -49,20 +49,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         protected override void OnDrag(DragEvent e)
         {
-            if (timeline != null)
-            {
-                var timelineQuad = timeline.ScreenSpaceDrawQuad;
-                var mouseX = e.ScreenSpaceMousePosition.X;
-
-                // scroll if in a drag and dragging outside visible extents
-                if (mouseX > timelineQuad.TopRight.X)
-                    timeline.ScrollBy((float)((mouseX - timelineQuad.TopRight.X) / 10 * Clock.ElapsedFrameTime));
-                else if (mouseX < timelineQuad.TopLeft.X)
-                    timeline.ScrollBy((float)((mouseX - timelineQuad.TopLeft.X) / 10 * Clock.ElapsedFrameTime));
-            }
+            handleScrollViaDrag(e);
 
             base.OnDrag(e);
-            lastDragEvent = e;
         }
 
         protected override void OnDragEnd(DragEndEvent e)
@@ -74,7 +63,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         protected override void Update()
         {
             // trigger every frame so drags continue to update selection while playback is scrolling the timeline.
-            if (IsDragged)
+            if (lastDragEvent != null)
                 OnDrag(lastDragEvent);
 
             base.Update();
@@ -82,10 +71,33 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         protected override SelectionHandler CreateSelectionHandler() => new TimelineSelectionHandler();
 
-        protected override SelectionBlueprint CreateBlueprintFor(HitObject hitObject) => new TimelineHitObjectBlueprint(hitObject);
+        protected override SelectionBlueprint CreateBlueprintFor(HitObject hitObject) => new TimelineHitObjectBlueprint(hitObject)
+        {
+            OnDragHandled = handleScrollViaDrag
+        };
 
         protected override DragBox CreateDragBox(Action<RectangleF> performSelect) => new TimelineDragBox(performSelect);
 
+        private void handleScrollViaDrag(DragEvent e)
+        {
+            lastDragEvent = e;
+
+            if (lastDragEvent == null)
+                return;
+
+            if (timeline != null)
+            {
+                var timelineQuad = timeline.ScreenSpaceDrawQuad;
+                var mouseX = e.ScreenSpaceMousePosition.X;
+
+                // scroll if in a drag and dragging outside visible extents
+                if (mouseX > timelineQuad.TopRight.X)
+                    timeline.ScrollBy((float)((mouseX - timelineQuad.TopRight.X) / 10 * Clock.ElapsedFrameTime));
+                else if (mouseX < timelineQuad.TopLeft.X)
+                    timeline.ScrollBy((float)((mouseX - timelineQuad.TopLeft.X) / 10 * Clock.ElapsedFrameTime));
+            }
+        }
+
         internal class TimelineSelectionHandler : SelectionHandler
         {
             // for now we always allow movement. snapping is provided by the Timeline's "distance" snap implementation
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 8a6dd40bde..3de1cd3a4c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -28,6 +29,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [UsedImplicitly]
         private readonly Bindable<double> startTime;
 
+        public Action<DragEvent> OnDragHandled;
+
         public const float THICKNESS = 5;
 
         private const float circle_size = 16;
@@ -78,7 +81,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                             RelativeSizeAxes = Axes.Both,
                         }
                     },
-                    new DragBar(hitObject),
+                    new DragBar(hitObject) { OnDragHandled = e => OnDragHandled?.Invoke(e) }
                 });
             }
         }
@@ -90,6 +93,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             [Resolved]
             private Timeline timeline { get; set; }
 
+            public Action<DragEvent> OnDragHandled;
+
             public DragBar(HitObject hitObject)
             {
                 this.hitObject = hitObject;
@@ -155,6 +160,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             {
                 base.OnDrag(e);
 
+                OnDragHandled?.Invoke(e);
+
                 var time = timeline.GetTimeFromScreenSpacePosition(e.ScreenSpaceMousePosition);
 
                 switch (hitObject)
@@ -177,6 +184,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
                 beatmap.UpdateHitObject(hitObject);
             }
+
+            protected override void OnDragEnd(DragEndEvent e)
+            {
+                base.OnDragEnd(e);
+
+                OnDragHandled?.Invoke(null);
+            }
         }
 
         protected override void Update()

From 98ab1f986272e89c0d092ec5cd01b726b74a4998 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Feb 2020 16:35:07 +0900
Subject: [PATCH 0266/1142] Fix negative spinners

---
 .../Components/Timeline/TimelineHitObjectBlueprint.cs  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 3de1cd3a4c..5a15cb42fa 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -156,6 +156,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             [Resolved]
             private EditorBeatmap beatmap { get; set; }
 
+            [Resolved]
+            private IBeatSnapProvider beatSnapProvider { get; set; }
+
             protected override void OnDrag(DragEvent e)
             {
                 base.OnDrag(e);
@@ -178,7 +181,12 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         break;
 
                     case IHasEndTime endTimeHitObject:
-                        endTimeHitObject.EndTime = time;
+                        var snappedTime = beatSnapProvider.SnapTime(time);
+
+                        if (endTimeHitObject.EndTime == snappedTime || snappedTime <= hitObject.StartTime)
+                            return;
+
+                        endTimeHitObject.EndTime = snappedTime;
                         break;
                 }
 

From cb30f463fb670d801a54044c6326f7b96e8a73ac Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 5 Feb 2020 12:48:29 +0300
Subject: [PATCH 0267/1142] Update spotlight info based on selected one

---
 .../API/Requests/Responses/APISpotlight.cs    |  3 +++
 .../Rankings/RankingsOverlayHeader.cs         | 10 +++++-----
 .../Overlays/Rankings/SpotlightSelector.cs    | 19 +++++++++----------
 osu.Game/Overlays/RankingsOverlay.cs          | 10 +++++++---
 4 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Online/API/Requests/Responses/APISpotlight.cs b/osu.Game/Online/API/Requests/Responses/APISpotlight.cs
index 3a002e57b2..4f63ebe3df 100644
--- a/osu.Game/Online/API/Requests/Responses/APISpotlight.cs
+++ b/osu.Game/Online/API/Requests/Responses/APISpotlight.cs
@@ -26,6 +26,9 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty(@"end_date")]
         public DateTimeOffset EndDate;
 
+        [JsonProperty(@"participant_count")]
+        public int? Participants;
+
         public override string ToString() => Name;
     }
 }
diff --git a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
index 41722034b6..5c78879b26 100644
--- a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
+++ b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
@@ -20,8 +20,8 @@ namespace osu.Game.Overlays.Rankings
 
         public IEnumerable<APISpotlight> Spotlights
         {
-            get => spotlightSelector.Spotlights;
-            set => spotlightSelector.Spotlights = value;
+            get => SpotlightSelector.Spotlights;
+            set => SpotlightSelector.Spotlights = value;
         }
 
         protected override ScreenTitle CreateTitle() => new RankingsTitle
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Rankings
             Current = Ruleset
         };
 
-        private SpotlightSelector spotlightSelector;
+        public SpotlightSelector SpotlightSelector;
 
         protected override Drawable CreateContent() => new FillFlowContainer
         {
@@ -47,7 +47,7 @@ namespace osu.Game.Overlays.Rankings
                 {
                     Current = Country
                 },
-                spotlightSelector = new SpotlightSelector
+                SpotlightSelector = new SpotlightSelector
                 {
                     Current = { BindTarget = Spotlight }
                 }
@@ -61,7 +61,7 @@ namespace osu.Game.Overlays.Rankings
         }
 
         private void onCurrentChanged(ValueChangedEvent<RankingsScope> scope) =>
-            spotlightSelector.FadeTo(scope.NewValue == RankingsScope.Spotlights ? 1 : 0, 200, Easing.OutQuint);
+            SpotlightSelector.FadeTo(scope.NewValue == RankingsScope.Spotlights ? 1 : 0, 200, Easing.OutQuint);
 
         private class RankingsTitle : ScreenTitle
         {
diff --git a/osu.Game/Overlays/Rankings/SpotlightSelector.cs b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
index e34c01113e..bd2b7d9b21 100644
--- a/osu.Game/Overlays/Rankings/SpotlightSelector.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
@@ -38,6 +38,8 @@ namespace osu.Game.Overlays.Rankings
 
         private readonly InfoColumn startDateColumn;
         private readonly InfoColumn endDateColumn;
+        private readonly InfoColumn mapCountColumn;
+        private readonly InfoColumn participantsColumn;
 
         public SpotlightSelector()
         {
@@ -75,6 +77,8 @@ namespace osu.Game.Overlays.Rankings
                             {
                                 startDateColumn = new InfoColumn(@"Start Date"),
                                 endDateColumn = new InfoColumn(@"End Date"),
+                                mapCountColumn = new InfoColumn(@"Map Count"),
+                                participantsColumn = new InfoColumn(@"Participants")
                             }
                         }
                     }
@@ -88,17 +92,12 @@ namespace osu.Game.Overlays.Rankings
             background.Colour = colourProvider.Dark3;
         }
 
-        protected override void LoadComplete()
+        public void ShowInfo(APISpotlight spotlight, int mapCount)
         {
-            base.LoadComplete();
-
-            Current.BindValueChanged(onCurrentChanged);
-        }
-
-        private void onCurrentChanged(ValueChangedEvent<APISpotlight> spotlight)
-        {
-            startDateColumn.Value = dateToString(spotlight.NewValue.StartDate);
-            endDateColumn.Value = dateToString(spotlight.NewValue.EndDate);
+            startDateColumn.Value = dateToString(spotlight.StartDate);
+            endDateColumn.Value = dateToString(spotlight.EndDate);
+            mapCountColumn.Value = mapCount.ToString();
+            participantsColumn.Value = spotlight.Participants?.ToString("N0");
         }
 
         private string dateToString(DateTimeOffset date) => date.ToString("yyyy-MM-dd");
diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index 2a4bc28b18..ba0cc29d6d 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -36,6 +36,7 @@ namespace osu.Game.Overlays
 
         private APIRequest lastRequest;
         private CancellationTokenSource cancellationToken;
+        private GetSpotlightsRequest spotlightsRequest;
 
         [Resolved]
         private IAPIProvider api { get; set; }
@@ -115,6 +116,8 @@ namespace osu.Game.Overlays
 
             Scope.BindValueChanged(_ =>
             {
+                spotlightsRequest?.Cancel();
+
                 // country filtering is only valid for performance scope.
                 if (Scope.Value != RankingsScope.Performance)
                     Country.Value = null;
@@ -148,9 +151,9 @@ namespace osu.Game.Overlays
         private void getSpotlights()
         {
             loading.Show();
-            var request = new GetSpotlightsRequest();
-            request.Success += response => header.Spotlights = response.Spotlights;
-            api.Queue(request);
+            spotlightsRequest = new GetSpotlightsRequest();
+            spotlightsRequest.Success += response => header.Spotlights = response.Spotlights;
+            api.Queue(spotlightsRequest);
         }
 
         private void loadNewContent()
@@ -214,6 +217,7 @@ namespace osu.Game.Overlays
                     return new CountriesTable(1, countryRequest.Result.Countries);
 
                 case GetSpotlightRankingsRequest spotlightRequest:
+                    header.SpotlightSelector.ShowInfo(spotlightRequest.Result.Spotlight, spotlightRequest.Result.BeatmapSets.Count);
                     return new FillFlowContainer
                     {
                         AutoSizeAxes = Axes.Y,

From 6708e271acd04336255c8c3aefa3e3ea8c2f17e7 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 5 Feb 2020 13:01:50 +0300
Subject: [PATCH 0268/1142] Adjust SpotlightSelector animations

---
 .../Rankings/RankingsOverlayHeader.cs         |  2 +-
 .../Overlays/Rankings/SpotlightSelector.cs    | 89 ++++++++++++-------
 2 files changed, 56 insertions(+), 35 deletions(-)

diff --git a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
index 5c78879b26..538ae112b5 100644
--- a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
+++ b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Overlays.Rankings
         }
 
         private void onCurrentChanged(ValueChangedEvent<RankingsScope> scope) =>
-            SpotlightSelector.FadeTo(scope.NewValue == RankingsScope.Spotlights ? 1 : 0, 200, Easing.OutQuint);
+            SpotlightSelector.State.Value = scope.NewValue == RankingsScope.Spotlights ? Visibility.Visible : Visibility.Hidden;
 
         private class RankingsTitle : ScreenTitle
         {
diff --git a/osu.Game/Overlays/Rankings/SpotlightSelector.cs b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
index bd2b7d9b21..8af6c0bb3b 100644
--- a/osu.Game/Overlays/Rankings/SpotlightSelector.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
@@ -17,8 +17,11 @@ using osu.Framework.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Rankings
 {
-    public class SpotlightSelector : CompositeDrawable, IHasCurrentValue<APISpotlight>
+    public class SpotlightSelector : VisibilityContainer, IHasCurrentValue<APISpotlight>
     {
+        private const int height = 100;
+        private const int duration = 200;
+
         private readonly Box background;
         private readonly SpotlightsDropdown dropdown;
 
@@ -36,54 +39,60 @@ namespace osu.Game.Overlays.Rankings
             set => dropdown.Items = value;
         }
 
+        protected override bool StartHidden => true;
+
         private readonly InfoColumn startDateColumn;
         private readonly InfoColumn endDateColumn;
         private readonly InfoColumn mapCountColumn;
         private readonly InfoColumn participantsColumn;
+        private readonly Container content;
 
         public SpotlightSelector()
         {
             RelativeSizeAxes = Axes.X;
-            Height = 100;
-
-            InternalChildren = new Drawable[]
+            Add(content = new Container
             {
-                background = new Box
+                Height = height,
+                RelativeSizeAxes = Axes.X,
+                Children = new Drawable[]
                 {
-                    RelativeSizeAxes = Axes.Both,
-                },
-                new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Horizontal = UserProfileOverlay.CONTENT_X_MARGIN, Vertical = 10 },
-                    Children = new Drawable[]
+                    background = new Box
                     {
-                        dropdown = new SpotlightsDropdown
+                        RelativeSizeAxes = Axes.Both,
+                    },
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Padding = new MarginPadding { Horizontal = UserProfileOverlay.CONTENT_X_MARGIN, Vertical = 10 },
+                        Children = new Drawable[]
                         {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                            RelativeSizeAxes = Axes.X,
-                            Current = Current,
-                            Depth = -float.MaxValue
-                        },
-                        new FillFlowContainer
-                        {
-                            Anchor = Anchor.BottomRight,
-                            Origin = Anchor.BottomRight,
-                            AutoSizeAxes = Axes.Both,
-                            Direction = FillDirection.Horizontal,
-                            Spacing = new Vector2(15, 0),
-                            Children = new Drawable[]
+                            dropdown = new SpotlightsDropdown
                             {
-                                startDateColumn = new InfoColumn(@"Start Date"),
-                                endDateColumn = new InfoColumn(@"End Date"),
-                                mapCountColumn = new InfoColumn(@"Map Count"),
-                                participantsColumn = new InfoColumn(@"Participants")
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.TopCentre,
+                                RelativeSizeAxes = Axes.X,
+                                Current = Current,
+                                Depth = -float.MaxValue
+                            },
+                            new FillFlowContainer
+                            {
+                                Anchor = Anchor.BottomRight,
+                                Origin = Anchor.BottomRight,
+                                AutoSizeAxes = Axes.Both,
+                                Direction = FillDirection.Horizontal,
+                                Spacing = new Vector2(15, 0),
+                                Children = new Drawable[]
+                                {
+                                    startDateColumn = new InfoColumn(@"Start Date"),
+                                    endDateColumn = new InfoColumn(@"End Date"),
+                                    mapCountColumn = new InfoColumn(@"Map Count"),
+                                    participantsColumn = new InfoColumn(@"Participants")
+                                }
                             }
                         }
-                    }
-                },
-            };
+                    },
+                }
+            });
         }
 
         [BackgroundDependencyLoader]
@@ -100,6 +109,18 @@ namespace osu.Game.Overlays.Rankings
             participantsColumn.Value = spotlight.Participants?.ToString("N0");
         }
 
+        protected override void PopIn()
+        {
+            this.ResizeHeightTo(height, duration, Easing.OutQuint);
+            content.FadeIn(duration, Easing.OutQuint);
+        }
+
+        protected override void PopOut()
+        {
+            this.ResizeHeightTo(0, duration, Easing.OutQuint);
+            content.FadeOut(duration, Easing.OutQuint);
+        }
+
         private string dateToString(DateTimeOffset date) => date.ToString("yyyy-MM-dd");
 
         private class InfoColumn : FillFlowContainer

From 00e010a06151a085636dcdfa5fbae2167470780e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 5 Feb 2020 13:11:02 +0300
Subject: [PATCH 0269/1142] Add visibility test for SpotlightSelector

---
 .../Visual/Online/TestSceneRankingsSpotlightSelector.cs     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
index e46c8a4a71..f27ab1e775 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
@@ -35,6 +35,12 @@ namespace osu.Game.Tests.Visual.Online
             Add(selector = new SpotlightSelector());
         }
 
+        [Test]
+        public void TestVisibility()
+        {
+            AddStep("Toggle Visibility", selector.ToggleVisibility);
+        }
+
         [Test]
         public void TestLocalSpotlights()
         {

From f5edad16e67d3a9151dd0118f11d5b48bf4c2e91 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 5 Feb 2020 19:43:13 +0900
Subject: [PATCH 0270/1142] Improve visuals

---
 .../Timeline/TimelineHitObjectBlueprint.cs    | 184 ++++++++++++------
 1 file changed, 125 insertions(+), 59 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 5a15cb42fa..b46a373818 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -2,14 +2,17 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
@@ -22,8 +25,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
     {
         private readonly Circle circle;
 
-        private readonly Container extensionBar;
-
         protected override bool ShouldBeConsideredForInput(Drawable child) => true;
 
         [UsedImplicitly]
@@ -31,11 +32,20 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         public Action<DragEvent> OnDragHandled;
 
-        public const float THICKNESS = 5;
+        private readonly DragBar dragBar;
+
+        private readonly List<Container> shadowComponents = new List<Container>();
+
+        private const float thickness = 5;
+
+        private const float shadow_radius = 5;
 
         private const float circle_size = 16;
 
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => base.ReceivePositionalInputAt(screenSpacePos) || circle.ReceivePositionalInputAt(screenSpacePos);
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
+            base.ReceivePositionalInputAt(screenSpacePos) ||
+            circle.ReceivePositionalInputAt(screenSpacePos) ||
+            dragBar?.ReceivePositionalInputAt(screenSpacePos) == true;
 
         public TimelineHitObjectBlueprint(HitObject hitObject)
             : base(hitObject)
@@ -51,7 +61,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
-            AddInternal(circle = new Circle
+            circle = new Circle
             {
                 Size = new Vector2(circle_size),
                 Anchor = Anchor.CentreLeft,
@@ -59,34 +69,126 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 RelativePositionAxes = Axes.X,
                 AlwaysPresent = true,
                 Colour = Color4.White,
-                BorderColour = Color4.Black,
-                BorderThickness = THICKNESS,
-            });
+                EdgeEffect = new EdgeEffectParameters
+                {
+                    Type = EdgeEffectType.Shadow,
+                    Radius = shadow_radius,
+                    Colour = Color4.Black
+                },
+            };
+
+            shadowComponents.Add(circle);
 
             if (hitObject is IHasEndTime)
             {
+                DragBar dragBarUnderlay;
+                Container extensionBar;
+
                 AddRangeInternal(new Drawable[]
                 {
                     extensionBar = new Container
                     {
-                        CornerRadius = 2,
                         Masking = true,
-                        Size = new Vector2(1, THICKNESS),
+                        Size = new Vector2(1, thickness),
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
                         RelativePositionAxes = Axes.X,
                         RelativeSizeAxes = Axes.X,
+                        EdgeEffect = new EdgeEffectParameters
+                        {
+                            Type = EdgeEffectType.Shadow,
+                            Radius = shadow_radius,
+                            Colour = Color4.Black
+                        },
                         Child = new Box
                         {
                             RelativeSizeAxes = Axes.Both,
                         }
                     },
-                    new DragBar(hitObject) { OnDragHandled = e => OnDragHandled?.Invoke(e) }
+                    circle,
+                    // only used for drawing the shadow
+                    dragBarUnderlay = new DragBar(null),
+                    // cover up the shadow on the join
+                    new Box
+                    {
+                        Height = thickness,
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        RelativeSizeAxes = Axes.X,
+                    },
+                    dragBar = new DragBar(hitObject) { OnDragHandled = e => OnDragHandled?.Invoke(e) },
                 });
+
+                shadowComponents.Add(dragBarUnderlay);
+                shadowComponents.Add(extensionBar);
+            }
+            else
+            {
+                AddInternal(circle);
+            }
+
+            updateShadows();
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            // no bindable so we perform this every update
+            Width = (float)(HitObject.GetEndTime() - HitObject.StartTime);
+        }
+
+        protected override void OnSelected()
+        {
+            updateShadows();
+        }
+
+        private void updateShadows()
+        {
+            foreach (var s in shadowComponents)
+            {
+                if (State == SelectionState.Selected)
+                {
+                    s.EdgeEffect = new EdgeEffectParameters
+                    {
+                        Type = EdgeEffectType.Shadow,
+                        Radius = shadow_radius / 2,
+                        Colour = Color4.Orange,
+                    };
+                }
+                else
+                {
+                    s.EdgeEffect = new EdgeEffectParameters
+                    {
+                        Type = EdgeEffectType.Shadow,
+                        Radius = shadow_radius,
+                        Colour = State == SelectionState.Selected ? Color4.Orange : Color4.Black
+                    };
+                }
             }
         }
 
-        public class DragBar : CompositeDrawable
+        protected override void OnDeselected()
+        {
+            updateShadows();
+        }
+
+        public override Quad SelectionQuad
+        {
+            get
+            {
+                // correctly include the circle in the selection quad region, as it is usually outside the blueprint itself.
+                var leftQuad = circle.ScreenSpaceDrawQuad;
+                var rightQuad = dragBar?.ScreenSpaceDrawQuad ?? ScreenSpaceDrawQuad;
+
+                return new Quad(leftQuad.TopLeft, Vector2.ComponentMax(rightQuad.TopRight, leftQuad.TopRight),
+                    leftQuad.BottomLeft, Vector2.ComponentMax(rightQuad.BottomRight, leftQuad.BottomRight));
+            }
+        }
+
+        public override Vector2 SelectionPoint => ScreenSpaceDrawQuad.TopLeft;
+
+        public class DragBar : Container
         {
             private readonly HitObject hitObject;
 
@@ -95,20 +197,26 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             public Action<DragEvent> OnDragHandled;
 
+            public override bool HandlePositionalInput => hitObject != null;
+
             public DragBar(HitObject hitObject)
             {
                 this.hitObject = hitObject;
 
                 CornerRadius = 2;
                 Masking = true;
-                Size = new Vector2(THICKNESS, 1.5f);
+                Size = new Vector2(5, 1);
                 Anchor = Anchor.CentreRight;
-                Origin = Anchor.CentreRight;
+                Origin = Anchor.Centre;
                 RelativePositionAxes = Axes.X;
                 RelativeSizeAxes = Axes.Y;
-                InternalChild = new Box
+
+                InternalChildren = new Drawable[]
                 {
-                    RelativeSizeAxes = Axes.Both,
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                    }
                 };
             }
 
@@ -143,12 +251,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             private void updateState()
             {
-                if (IsHovered || hasMouseDown)
-                    Colour = Color4.Orange;
-                else
-                {
-                    Colour = Color4.White;
-                }
+                Colour = IsHovered || hasMouseDown ? Color4.OrangeRed : Color4.White;
             }
 
             protected override bool OnDragStart(DragStartEvent e) => true;
@@ -200,42 +303,5 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 OnDragHandled?.Invoke(null);
             }
         }
-
-        protected override void Update()
-        {
-            base.Update();
-
-            // no bindable so we perform this every update
-            Width = (float)(HitObject.GetEndTime() - HitObject.StartTime);
-        }
-
-        protected override void OnSelected()
-        {
-            circle.BorderColour = Color4.Orange;
-            if (extensionBar != null)
-                extensionBar.BorderColour = Color4.Orange;
-        }
-
-        protected override void OnDeselected()
-        {
-            circle.BorderColour = Color4.Black;
-            if (extensionBar != null)
-                extensionBar.BorderColour = Color4.Black;
-        }
-
-        public override Quad SelectionQuad
-        {
-            get
-            {
-                // correctly include the circle in the selection quad region, as it is usually outside the blueprint itself.
-                var circleQuad = circle.ScreenSpaceDrawQuad;
-                var actualQuad = ScreenSpaceDrawQuad;
-
-                return new Quad(circleQuad.TopLeft, Vector2.ComponentMax(actualQuad.TopRight, circleQuad.TopRight),
-                    circleQuad.BottomLeft, Vector2.ComponentMax(actualQuad.BottomRight, circleQuad.BottomRight));
-            }
-        }
-
-        public override Vector2 SelectionPoint => ScreenSpaceDrawQuad.TopLeft;
     }
 }

From f4ee281dd6474552d935bda91234daf6c575d5ba Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 5 Feb 2020 16:15:55 +0100
Subject: [PATCH 0271/1142] Add optional decimal place

---
 osu.Game/Overlays/BeatmapSet/SuccessRate.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/SuccessRate.cs b/osu.Game/Overlays/BeatmapSet/SuccessRate.cs
index dac750dacf..15216b6e69 100644
--- a/osu.Game/Overlays/BeatmapSet/SuccessRate.cs
+++ b/osu.Game/Overlays/BeatmapSet/SuccessRate.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Overlays.BeatmapSet
             int playCount = beatmap?.OnlineInfo?.PlayCount ?? 0;
 
             var rate = playCount != 0 ? (float)passCount / playCount : 0;
-            successPercent.Text = rate.ToString("0%");
+            successPercent.Text = rate.ToString("0.#%");
             successRate.Length = rate;
             percentContainer.ResizeWidthTo(successRate.Length, 250, Easing.InOutCubic);
 

From 76037e4ffddab6a219219b8a909209dcb06a002f Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 5 Feb 2020 16:31:14 +0100
Subject: [PATCH 0272/1142] Recolour ranked status pill

---
 .../Beatmaps/Drawables/BeatmapSetOnlineStatusPill.cs     | 9 ++++++++-
 osu.Game/Overlays/BeatmapSet/Header.cs                   | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/Drawables/BeatmapSetOnlineStatusPill.cs b/osu.Game/Beatmaps/Drawables/BeatmapSetOnlineStatusPill.cs
index 351e5df17a..f6e03d40ff 100644
--- a/osu.Game/Beatmaps/Drawables/BeatmapSetOnlineStatusPill.cs
+++ b/osu.Game/Beatmaps/Drawables/BeatmapSetOnlineStatusPill.cs
@@ -13,6 +13,7 @@ namespace osu.Game.Beatmaps.Drawables
     public class BeatmapSetOnlineStatusPill : CircularContainer
     {
         private readonly OsuSpriteText statusText;
+        private readonly Box background;
 
         private BeatmapSetOnlineStatus status;
 
@@ -43,6 +44,12 @@ namespace osu.Game.Beatmaps.Drawables
             set => statusText.Padding = value;
         }
 
+        public Color4 BackgroundColour
+        {
+            get => background.Colour;
+            set => background.Colour = value;
+        }
+
         public BeatmapSetOnlineStatusPill()
         {
             AutoSizeAxes = Axes.Both;
@@ -50,7 +57,7 @@ namespace osu.Game.Beatmaps.Drawables
 
             Children = new Drawable[]
             {
-                new Box
+                background = new Box
                 {
                     RelativeSizeAxes = Axes.Both,
                     Colour = Color4.Black,
diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index 9f79b92cb6..1b111ced1f 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -218,6 +218,7 @@ namespace osu.Game.Overlays.BeatmapSet
         private void load(OverlayColourProvider colourProvider)
         {
             coverGradient.Colour = ColourInfo.GradientVertical(colourProvider.Background6.Opacity(0.3f), colourProvider.Background6.Opacity(0.8f));
+            onlineStatusPill.BackgroundColour = colourProvider.Background6;
 
             State.BindValueChanged(_ => updateDownloadButtons());
 

From e1e1c1a11af6a8397b43d250d0fba0edcb0268b2 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 5 Feb 2020 16:34:39 +0100
Subject: [PATCH 0273/1142] Match osu-web display accuracy

Decided to change this only locally instead of modifying FormatAccuracy which would affect everywhere else in the game as well.
---
 osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index f04477d911..9c71cabfa6 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -120,7 +120,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 new OsuSpriteText
                 {
                     Margin = new MarginPadding { Right = horizontal_inset },
-                    Text = score.DisplayAccuracy,
+                    Text = $@"{score.Accuracy:0.00%}",
                     Font = OsuFont.GetFont(size: text_size),
                     Colour = score.Accuracy == 1 ? highAccuracyColour : Color4.White
                 },

From fa3934ddb474b605b3147a364f43ce968984f7b5 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 5 Feb 2020 17:16:20 +0100
Subject: [PATCH 0274/1142] Match osu-web button description

---
 osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs
index e0360c6312..5ed15cecd5 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs
@@ -150,7 +150,7 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
                             },
                             new OsuSpriteText
                             {
-                                Text = BeatmapSet.Value.OnlineInfo.HasVideo && noVideo ? "without Video" : string.Empty,
+                                Text = BeatmapSet.Value.OnlineInfo.HasVideo ? (noVideo ? "without Video" : "with Video") : string.Empty,
                                 Font = OsuFont.GetFont(size: 11, weight: FontWeight.Bold)
                             },
                         };

From e79ba9a1299fc54728d9762af30e5e38a02f0e4b Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 5 Feb 2020 17:41:57 +0100
Subject: [PATCH 0275/1142] Add alwaysShowDecimals param to FormatAccuracy

This allows us to specify whether we want it to show decimal places if accuracy is 100%.
---
 osu.Game/Utils/FormatUtils.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Utils/FormatUtils.cs b/osu.Game/Utils/FormatUtils.cs
index b3758b3375..f0b8b470f1 100644
--- a/osu.Game/Utils/FormatUtils.cs
+++ b/osu.Game/Utils/FormatUtils.cs
@@ -7,18 +7,18 @@ namespace osu.Game.Utils
     {
         /// <summary>
         /// Turns the provided accuracy into a percentage with 2 decimal places.
-        /// Omits all decimal places when <paramref name="accuracy"/> equals 1d.
         /// </summary>
         /// <param name="accuracy">The accuracy to be formatted</param>
+        /// <param name="alwaysShowDecimals">Whether to show decimal places if <paramref name="accuracy"/> equals 1d</param>
         /// <returns>formatted accuracy in percentage</returns>
-        public static string FormatAccuracy(this double accuracy) => accuracy == 1 ? "100%" : $"{accuracy:0.00%}";
+        public static string FormatAccuracy(this double accuracy, bool alwaysShowDecimals = false) => accuracy == 1 && !alwaysShowDecimals ? "100%" : $"{accuracy:0.00%}";
 
         /// <summary>
         /// Turns the provided accuracy into a percentage with 2 decimal places.
-        /// Omits all decimal places when <paramref name="accuracy"/> equals 100m.
         /// </summary>
         /// <param name="accuracy">The accuracy to be formatted</param>
+        /// <param name="alwaysShowDecimals">Whether to show decimal places if <paramref name="accuracy"/> equals 100m</param>
         /// <returns>formatted accuracy in percentage</returns>
-        public static string FormatAccuracy(this decimal accuracy) => accuracy == 100 ? "100%" : $"{accuracy:0.00}%";
+        public static string FormatAccuracy(this decimal accuracy, bool alwaysShowDecimals = false) => accuracy == 100 && !alwaysShowDecimals ? "100%" : $"{accuracy:0.00}%";
     }
 }

From 63df6b8da6255116b7c6fe25df8c5d09fe797cc3 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 5 Feb 2020 17:42:14 +0100
Subject: [PATCH 0276/1142] Change accuracy formatting method

---
 osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 9c71cabfa6..4d5bd84090 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -16,6 +16,7 @@ using osu.Game.Scoring;
 using osu.Game.Users.Drawables;
 using osuTK;
 using osuTK.Graphics;
+using osu.Game.Utils;
 
 namespace osu.Game.Overlays.BeatmapSet.Scores
 {
@@ -120,7 +121,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 new OsuSpriteText
                 {
                     Margin = new MarginPadding { Right = horizontal_inset },
-                    Text = $@"{score.Accuracy:0.00%}",
+                    Text = score.Accuracy.FormatAccuracy(alwaysShowDecimals: true),
                     Font = OsuFont.GetFont(size: text_size),
                     Colour = score.Accuracy == 1 ? highAccuracyColour : Color4.White
                 },

From c93d2c7f00240ec8126732e801c66389f041457b Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 5 Feb 2020 18:26:01 +0100
Subject: [PATCH 0277/1142] Adjust loading container corner radius

---
 osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index 0a3b5d9457..8560232209 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -164,7 +164,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     Masking = true,
-                                    CornerRadius = 10,
+                                    CornerRadius = 5,
                                     Child = loading = new DimmedLoadingLayer(iconScale: 0.8f)
                                     {
                                         Alpha = 0,

From 24e8a2bd6920cae69a957c807c60648bd9c7ea86 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 5 Feb 2020 22:59:01 +0300
Subject: [PATCH 0278/1142] Make SpotlightSelector.ShowInfo use the full
 rankings response

---
 osu.Game/Overlays/Rankings/SpotlightSelector.cs | 11 ++++++-----
 osu.Game/Overlays/RankingsOverlay.cs            |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Rankings/SpotlightSelector.cs b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
index 8af6c0bb3b..8bf75b2357 100644
--- a/osu.Game/Overlays/Rankings/SpotlightSelector.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
@@ -14,6 +14,7 @@ using osuTK;
 using System;
 using System.Collections.Generic;
 using osu.Framework.Graphics.UserInterface;
+using osu.Game.Online.API.Requests;
 
 namespace osu.Game.Overlays.Rankings
 {
@@ -101,12 +102,12 @@ namespace osu.Game.Overlays.Rankings
             background.Colour = colourProvider.Dark3;
         }
 
-        public void ShowInfo(APISpotlight spotlight, int mapCount)
+        public void ShowInfo(GetSpotlightRankingsResponse response)
         {
-            startDateColumn.Value = dateToString(spotlight.StartDate);
-            endDateColumn.Value = dateToString(spotlight.EndDate);
-            mapCountColumn.Value = mapCount.ToString();
-            participantsColumn.Value = spotlight.Participants?.ToString("N0");
+            startDateColumn.Value = dateToString(response.Spotlight.StartDate);
+            endDateColumn.Value = dateToString(response.Spotlight.EndDate);
+            mapCountColumn.Value = response.BeatmapSets.Count.ToString();
+            participantsColumn.Value = response.Spotlight.Participants?.ToString("N0");
         }
 
         protected override void PopIn()
diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index ba0cc29d6d..99e81eef15 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -217,7 +217,7 @@ namespace osu.Game.Overlays
                     return new CountriesTable(1, countryRequest.Result.Countries);
 
                 case GetSpotlightRankingsRequest spotlightRequest:
-                    header.SpotlightSelector.ShowInfo(spotlightRequest.Result.Spotlight, spotlightRequest.Result.BeatmapSets.Count);
+                    header.SpotlightSelector.ShowInfo(spotlightRequest.Result);
                     return new FillFlowContainer
                     {
                         AutoSizeAxes = Axes.Y,

From 4dd25b42aeee0fb158dcdb05ab128733332842f5 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 5 Feb 2020 23:00:42 +0300
Subject: [PATCH 0279/1142] Move spotlightsRequest to another place

---
 osu.Game/Overlays/RankingsOverlay.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index 99e81eef15..084c8b6e5a 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -36,7 +36,6 @@ namespace osu.Game.Overlays
 
         private APIRequest lastRequest;
         private CancellationTokenSource cancellationToken;
-        private GetSpotlightsRequest spotlightsRequest;
 
         [Resolved]
         private IAPIProvider api { get; set; }
@@ -148,6 +147,8 @@ namespace osu.Game.Overlays
             Country.Value = requested;
         }
 
+        private GetSpotlightsRequest spotlightsRequest;
+
         private void getSpotlights()
         {
             loading.Show();

From 7757a3a30bb7cfe33c0def5fe4489cddf7949796 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 5 Feb 2020 23:06:13 +0300
Subject: [PATCH 0280/1142] Move spotlight layout to it's own method

---
 osu.Game/Overlays/RankingsOverlay.cs | 52 ++++++++++++++++------------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index 084c8b6e5a..4fc94420a4 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -218,34 +218,40 @@ namespace osu.Game.Overlays
                     return new CountriesTable(1, countryRequest.Result.Countries);
 
                 case GetSpotlightRankingsRequest spotlightRequest:
-                    header.SpotlightSelector.ShowInfo(spotlightRequest.Result);
-                    return new FillFlowContainer
-                    {
-                        AutoSizeAxes = Axes.Y,
-                        RelativeSizeAxes = Axes.X,
-                        Direction = FillDirection.Vertical,
-                        Spacing = new Vector2(0, 20),
-                        Children = new Drawable[]
-                        {
-                            new ScoresTable(1, spotlightRequest.Result.Users),
-                            new FillFlowContainer
-                            {
-                                AutoSizeAxes = Axes.Y,
-                                RelativeSizeAxes = Axes.X,
-                                Spacing = new Vector2(10),
-                                Children = spotlightRequest.Result.BeatmapSets.Select(b => new DirectGridPanel(b.ToBeatmapSet(rulesets))
-                                {
-                                    Anchor = Anchor.TopCentre,
-                                    Origin = Anchor.TopCentre,
-                                }).ToList()
-                            }
-                        }
-                    };
+                    return getSpotlightContent(spotlightRequest.Result);
             }
 
             return null;
         }
 
+        private Drawable getSpotlightContent(GetSpotlightRankingsResponse response)
+        {
+            header.SpotlightSelector.ShowInfo(response);
+
+            return new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Y,
+                RelativeSizeAxes = Axes.X,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 20),
+                Children = new Drawable[]
+                {
+                    new ScoresTable(1, response.Users),
+                    new FillFlowContainer
+                    {
+                        AutoSizeAxes = Axes.Y,
+                        RelativeSizeAxes = Axes.X,
+                        Spacing = new Vector2(10),
+                        Children = response.BeatmapSets.Select(b => new DirectGridPanel(b.ToBeatmapSet(rulesets))
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                        }).ToList()
+                    }
+                }
+            };
+        }
+
         private void loadContent(Drawable content)
         {
             scrollFlow.ScrollToStart();

From 00edc7e66fd527d87f7ec2a80751544e863aec12 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Feb 2020 12:12:52 +0900
Subject: [PATCH 0281/1142] Fix RoomsContainer test scene not displaying

---
 .../Multi/Lounge/Components/RoomsContainer.cs | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
index 607b081653..6ef0f6b6db 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
@@ -47,22 +47,13 @@ namespace osu.Game.Screens.Multi.Lounge.Components
             };
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            rooms.BindTo(roomManager.Rooms);
-
-            rooms.ItemsAdded += addRooms;
-            rooms.ItemsRemoved += removeRooms;
-
-            roomManager.RoomsUpdated += updateSorting;
-
-            addRooms(rooms);
-        }
-
         protected override void LoadComplete()
         {
-            filter?.BindValueChanged(f => Filter(f.NewValue), true);
+            rooms.ItemsAdded += addRooms;
+            rooms.ItemsRemoved += removeRooms;
+            roomManager.RoomsUpdated += updateSorting;
+
+            rooms.BindTo(roomManager.Rooms);
         }
 
         public void Filter(FilterCriteria criteria)
@@ -94,8 +85,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
             foreach (var r in rooms)
                 roomFlow.Add(new DrawableRoom(r) { Action = () => selectRoom(r) });
 
-            if (filter != null)
-                Filter(filter.Value);
+            Filter(filter?.Value);
         }
 
         private void removeRooms(IEnumerable<Room> rooms)

From 7f0a134bc8c55ec7dac0dac6daf4c5e48ef6936c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Feb 2020 12:17:05 +0900
Subject: [PATCH 0282/1142] Bring test scene structure up-to-date

---
 .../Multiplayer/TestSceneLoungeRoomsContainer.cs   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
index eb4dc909df..cb873fc3eb 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -27,11 +28,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Cached(Type = typeof(IRoomManager))]
         private TestRoomManager roomManager = new TestRoomManager();
 
+        private RoomsContainer container;
+
         [BackgroundDependencyLoader]
         private void load()
         {
-            RoomsContainer container;
-
             Child = container = new RoomsContainer
             {
                 Anchor = Anchor.Centre,
@@ -39,9 +40,18 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 Width = 0.5f,
                 JoinRequested = joinRequested
             };
+        }
+
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
 
             AddStep("clear rooms", () => roomManager.Rooms.Clear());
+        }
 
+        [Test]
+        public void TestBasicListChanges()
+        {
             AddStep("add rooms", () =>
             {
                 for (int i = 0; i < 3; i++)

From 50c4e34c92091616053871ae652e11f10a7800e5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Feb 2020 11:56:09 +0900
Subject: [PATCH 0283/1142] Add ruleset to multiplayer filter criteria

---
 osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs | 8 +++++++-
 .../Screens/Multi/Lounge/Components/FilterCriteria.cs     | 3 +++
 .../Screens/Multi/Lounge/Components/RoomsContainer.cs     | 3 +++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
index 29d41132a7..9f93afec9d 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
@@ -7,6 +7,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Threading;
 using osu.Game.Graphics;
 using osu.Game.Overlays.SearchableList;
+using osu.Game.Rulesets;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Multi.Lounge.Components
@@ -22,6 +23,9 @@ namespace osu.Game.Screens.Multi.Lounge.Components
         [Resolved(CanBeNull = true)]
         private Bindable<FilterCriteria> filter { get; set; }
 
+        [Resolved]
+        private IBindable<RulesetInfo> ruleset { get; set; }
+
         public FilterControl()
         {
             DisplayStyleControl.Hide();
@@ -38,6 +42,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
         {
             base.LoadComplete();
 
+            ruleset.BindValueChanged(_ => updateFilter());
             Search.Current.BindValueChanged(_ => scheduleUpdateFilter());
             Tabs.Current.BindValueChanged(_ => updateFilter(), true);
         }
@@ -58,7 +63,8 @@ namespace osu.Game.Screens.Multi.Lounge.Components
             {
                 SearchString = Search.Current.Value ?? string.Empty,
                 PrimaryFilter = Tabs.Current.Value,
-                SecondaryFilter = DisplayStyleControl.Dropdown.Current.Value
+                SecondaryFilter = DisplayStyleControl.Dropdown.Current.Value,
+                Ruleset = ruleset.Value
             };
         }
     }
diff --git a/osu.Game/Screens/Multi/Lounge/Components/FilterCriteria.cs b/osu.Game/Screens/Multi/Lounge/Components/FilterCriteria.cs
index 666bc44a8d..26d445e151 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/FilterCriteria.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/FilterCriteria.cs
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Game.Rulesets;
+
 namespace osu.Game.Screens.Multi.Lounge.Components
 {
     public class FilterCriteria
@@ -8,5 +10,6 @@ namespace osu.Game.Screens.Multi.Lounge.Components
         public string SearchString;
         public PrimaryFilter PrimaryFilter;
         public SecondaryFilter SecondaryFilter;
+        public RulesetInfo Ruleset;
     }
 }
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
index 6ef0f6b6db..f5e0e2bbee 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
@@ -65,6 +65,9 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                 else
                 {
                     bool matchingFilter = true;
+
+                    matchingFilter &= r.Room.Playlist.Any(i => i.Ruleset.Equals(criteria.Ruleset));
+
                     matchingFilter &= r.FilterTerms.Any(term => term.IndexOf(criteria.SearchString, StringComparison.InvariantCultureIgnoreCase) >= 0);
 
                     switch (criteria.SecondaryFilter)

From 304a071e39578def381a4edc9b5c6638d2c9f613 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Feb 2020 11:56:20 +0900
Subject: [PATCH 0284/1142] Remove leasing at a Multiplayer screen level

---
 osu.Game/Screens/Multi/Multiplayer.cs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 9d6a459d14..72bf5a37e8 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -32,8 +32,6 @@ namespace osu.Game.Screens.Multi
     {
         public override bool CursorVisible => (screenStack.CurrentScreen as IMultiplayerSubScreen)?.CursorVisible ?? true;
 
-        public override bool DisallowExternalBeatmapRulesetChanges => true;
-
         private readonly MultiplayerWaveContainer waves;
 
         private readonly OsuButton createButton;
@@ -277,11 +275,7 @@ namespace osu.Game.Screens.Multi
 
         private void updateTrack(ValueChangedEvent<WorkingBeatmap> _ = null)
         {
-            bool isMatch = screenStack.CurrentScreen is MatchSubScreen;
-
-            Beatmap.Disabled = isMatch;
-
-            if (isMatch)
+            if (screenStack.CurrentScreen is MatchSubScreen)
             {
                 var track = Beatmap.Value?.Track;
 

From a79d6ff27a68b6a9dd5b3abc901451b30dab3bd5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Feb 2020 11:59:33 +0900
Subject: [PATCH 0285/1142] Change transition to better handle mass filter
 cases

---
 osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
index f6cbe300f3..d45dac1ae6 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
@@ -75,8 +75,13 @@ namespace osu.Game.Screens.Multi.Lounge.Components
             {
                 matchingFilter = value;
 
-                if (IsLoaded)
-                    this.FadeTo(MatchingFilter ? 1 : 0, 200);
+                if (!IsLoaded)
+                    return;
+
+                if (matchingFilter)
+                    this.FadeIn(200);
+                else
+                    Hide();
             }
         }
 

From 1dc7fc4a33aee7e68dcc25789892d49cb69caa2c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Feb 2020 12:26:14 +0900
Subject: [PATCH 0286/1142] Fix case where playlist is empty

---
 osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
index f5e0e2bbee..a5881cc2f7 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                 {
                     bool matchingFilter = true;
 
-                    matchingFilter &= r.Room.Playlist.Any(i => i.Ruleset.Equals(criteria.Ruleset));
+                    matchingFilter &= r.Room.Playlist.Count == 0 || r.Room.Playlist.Any(i => i.Ruleset.Equals(criteria.Ruleset));
 
                     matchingFilter &= r.FilterTerms.Any(term => term.IndexOf(criteria.SearchString, StringComparison.InvariantCultureIgnoreCase) >= 0);
 

From d32bb79e5a7bb3a78bc670f35cf074a6c2a656a4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Feb 2020 12:26:08 +0900
Subject: [PATCH 0287/1142] Add simple filtering test

---
 .../TestSceneLoungeRoomsContainer.cs          | 45 ++++++++++++++-----
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
index cb873fc3eb..8bc780f4e0 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
@@ -51,10 +51,42 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         [Test]
         public void TestBasicListChanges()
+        {
+            addRooms(3);
+
+            AddAssert("has 3 rooms", () => container.Rooms.Count == 3);
+            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());
+
+            AddStep("join first room", () => container.Rooms.First().Action?.Invoke());
+            AddAssert("first room joined", () => roomManager.Rooms.First().Status.Value is JoinedRoomStatus);
+        }
+
+        [Test]
+        public void TestStringFiltering()
+        {
+            addRooms(4);
+
+            AddUntilStep("4 rooms visible", () => container.Rooms.Count(r => r.IsPresent) == 4);
+
+            AddStep("filter one room", () => container.Filter(new FilterCriteria { SearchString = "1" }));
+
+            AddUntilStep("1 rooms visible", () => container.Rooms.Count(r => r.IsPresent) == 1);
+
+            AddStep("remove filter", () => container.Filter(null));
+
+            AddUntilStep("4 rooms visible", () => container.Rooms.Count(r => r.IsPresent) == 4);
+        }
+
+        private void addRooms(int count)
         {
             AddStep("add rooms", () =>
             {
-                for (int i = 0; i < 3; i++)
+                for (int i = 0; i < count; i++)
                 {
                     roomManager.Rooms.Add(new Room
                     {
@@ -65,17 +97,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     });
                 }
             });
-
-            AddAssert("has 2 rooms", () => container.Rooms.Count == 3);
-            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());
-
-            AddStep("join first room", () => container.Rooms.First().Action?.Invoke());
-            AddAssert("first room joined", () => roomManager.Rooms.First().Status.Value is JoinedRoomStatus);
         }
 
         private void joinRequested(Room room) => room.Status.Value = new JoinedRoomStatus();

From 061b8c389fa12112f17071e5044de143f187a999 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Feb 2020 13:02:38 +0900
Subject: [PATCH 0288/1142] Fix null search string causing an exception

---
 osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
index a5881cc2f7..88cc348000 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
@@ -68,7 +68,8 @@ namespace osu.Game.Screens.Multi.Lounge.Components
 
                     matchingFilter &= r.Room.Playlist.Count == 0 || r.Room.Playlist.Any(i => i.Ruleset.Equals(criteria.Ruleset));
 
-                    matchingFilter &= r.FilterTerms.Any(term => term.IndexOf(criteria.SearchString, StringComparison.InvariantCultureIgnoreCase) >= 0);
+                    if (!string.IsNullOrEmpty(criteria.SearchString))
+                        matchingFilter &= r.FilterTerms.Any(term => term.IndexOf(criteria.SearchString, StringComparison.InvariantCultureIgnoreCase) >= 0);
 
                     switch (criteria.SecondaryFilter)
                     {

From 43b22e3b63d9480e0a20b8f83ff3420577f575bf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Feb 2020 13:03:15 +0900
Subject: [PATCH 0289/1142] Add a ruleset filtering test

---
 .../TestSceneLoungeRoomsContainer.cs          | 39 +++++++++++++++++--
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
index 8bc780f4e0..af02f1e514 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
@@ -8,8 +8,12 @@ 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;
@@ -82,19 +86,48 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddUntilStep("4 rooms visible", () => container.Rooms.Count(r => r.IsPresent) == 4);
         }
 
-        private void addRooms(int count)
+        [Test]
+        public void TestRulesetFiltering()
+        {
+            addRooms(2, new OsuRuleset().RulesetInfo);
+            addRooms(3, new CatchRuleset().RulesetInfo);
+
+            AddUntilStep("5 rooms visible", () => container.Rooms.Count(r => r.IsPresent) == 5);
+
+            AddStep("filter osu! rooms", () => container.Filter(new FilterCriteria { Ruleset = new OsuRuleset().RulesetInfo }));
+
+            AddUntilStep("2 rooms visible", () => container.Rooms.Count(r => r.IsPresent) == 2);
+
+            AddStep("filter catch rooms", () => container.Filter(new FilterCriteria { Ruleset = new CatchRuleset().RulesetInfo }));
+
+            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++)
                 {
-                    roomManager.Rooms.Add(new Room
+                    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 = ruleset,
+                            Beatmap = new BeatmapInfo
+                            {
+                                Metadata = new BeatmapMetadata()
+                            }
+                        });
+
+                    roomManager.Rooms.Add(room);
                 }
             });
         }

From 49ec1d4a9938e02f07b24a1167e08efd391612d8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Feb 2020 13:04:29 +0900
Subject: [PATCH 0290/1142] Fix braces style

---
 .../Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
index af02f1e514..fe14a1ff0a 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
@@ -118,6 +118,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     };
 
                     if (ruleset != null)
+                    {
                         room.Playlist.Add(new PlaylistItem
                         {
                             Ruleset = ruleset,
@@ -126,6 +127,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                                 Metadata = new BeatmapMetadata()
                             }
                         });
+                    }
 
                     roomManager.Rooms.Add(room);
                 }

From daf5fa9da4ade1124f75a250e0c1c8964372fe16 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Feb 2020 13:16:32 +0900
Subject: [PATCH 0291/1142] Throw NotSupportedException instead

---
 osu.Game.Rulesets.Catch/Objects/JuiceStream.cs    | 2 +-
 osu.Game.Rulesets.Osu/Objects/Slider.cs           | 2 +-
 osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index 4d68bf592c..b014b32305 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -113,7 +113,7 @@ namespace osu.Game.Rulesets.Catch.Objects
         public double EndTime
         {
             get => StartTime + this.SpanCount() * Path.Distance / Velocity;
-            set => throw new System.NotImplementedException();
+            set => throw new System.NotSupportedException($"Adjust via {nameof(RepeatCount)} instead"); // can be implemented if/when needed.
         }
 
         public float EndX => X + this.CurvePositionAt(1).X / CatchPlayfield.BASE_WIDTH;
diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index bab7e6dbee..95fb6d9d48 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Objects
         public double EndTime
         {
             get => StartTime + this.SpanCount() * Path.Distance / Velocity;
-            set => throw new System.NotImplementedException();
+            set => throw new System.NotSupportedException($"Adjust via {nameof(RepeatCount)} instead"); // can be implemented if/when needed.
         }
 
         public double Duration => EndTime - StartTime;
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
index b5cd9be245..53cdf457c4 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
         public double EndTime
         {
             get => StartTime + this.SpanCount() * Distance / Velocity;
-            set => throw new System.NotImplementedException();
+            set => throw new System.NotSupportedException($"Adjust via {nameof(RepeatCount)} instead"); // can be implemented if/when needed.
         }
 
         public double Duration => EndTime - StartTime;

From e548a4b8ddba4b6c90dfdab0935715a5da008341 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Feb 2020 13:36:49 +0900
Subject: [PATCH 0292/1142] Fix missing bind causing regression in filter

---
 osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
index 88cc348000..e306706be9 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
@@ -54,6 +54,8 @@ namespace osu.Game.Screens.Multi.Lounge.Components
             roomManager.RoomsUpdated += updateSorting;
 
             rooms.BindTo(roomManager.Rooms);
+
+            filter.BindValueChanged(criteria => Filter(criteria.NewValue));
         }
 
         public void Filter(FilterCriteria criteria)

From 114fd967c190988dab88aca1fc0f3eea0bcf9627 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Feb 2020 13:47:34 +0900
Subject: [PATCH 0293/1142] Revert "Remove leasing at a Multiplayer screen
 level"

This reverts commit 304a071e39578def381a4edc9b5c6638d2c9f613.
---
 osu.Game/Screens/Multi/Multiplayer.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 72bf5a37e8..9d6a459d14 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -32,6 +32,8 @@ namespace osu.Game.Screens.Multi
     {
         public override bool CursorVisible => (screenStack.CurrentScreen as IMultiplayerSubScreen)?.CursorVisible ?? true;
 
+        public override bool DisallowExternalBeatmapRulesetChanges => true;
+
         private readonly MultiplayerWaveContainer waves;
 
         private readonly OsuButton createButton;
@@ -275,7 +277,11 @@ namespace osu.Game.Screens.Multi
 
         private void updateTrack(ValueChangedEvent<WorkingBeatmap> _ = null)
         {
-            if (screenStack.CurrentScreen is MatchSubScreen)
+            bool isMatch = screenStack.CurrentScreen is MatchSubScreen;
+
+            Beatmap.Disabled = isMatch;
+
+            if (isMatch)
             {
                 var track = Beatmap.Value?.Track;
 

From 81cadb787569559fe22e058c59b8f456443136bd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Feb 2020 14:22:01 +0900
Subject: [PATCH 0294/1142] Simplify the way multiple subscreens handle their
 disable states via a custom stack

---
 .../Screens/Multi/Lounge/LoungeSubScreen.cs   | 24 ++++++++++++-------
 osu.Game/Screens/Multi/Multiplayer.cs         | 10 ++++----
 .../Multi/MultiplayerSubScreenStack.cs        | 24 +++++++++++++++++++
 osu.Game/Screens/OsuScreenStack.cs            |  6 ++---
 osu.Game/Screens/Select/MatchSongSelect.cs    | 13 ----------
 5 files changed, 47 insertions(+), 30 deletions(-)
 create mode 100644 osu.Game/Screens/Multi/MultiplayerSubScreenStack.cs

diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index 0a48f761cf..3709b85fcb 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -91,6 +91,22 @@ namespace osu.Game.Screens.Multi.Lounge
         public override void OnEntering(IScreen last)
         {
             base.OnEntering(last);
+
+            onReturning();
+        }
+
+        public override void OnResuming(IScreen last)
+        {
+            base.OnResuming(last);
+
+            if (currentRoom.Value?.RoomID.Value == null)
+                currentRoom.Value = new Room();
+
+            onReturning();
+        }
+
+        private void onReturning()
+        {
             Filter.Search.HoldFocus = true;
         }
 
@@ -106,14 +122,6 @@ namespace osu.Game.Screens.Multi.Lounge
             Filter.Search.HoldFocus = false;
         }
 
-        public override void OnResuming(IScreen last)
-        {
-            base.OnResuming(last);
-
-            if (currentRoom.Value?.RoomID.Value == null)
-                currentRoom.Value = new Room();
-        }
-
         private void joinRequested(Room room)
         {
             processingOverlay.Show();
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 9d6a459d14..2277157134 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -32,6 +32,8 @@ namespace osu.Game.Screens.Multi
     {
         public override bool CursorVisible => (screenStack.CurrentScreen as IMultiplayerSubScreen)?.CursorVisible ?? true;
 
+        // this is required due to PlayerLoader eventually being pushed to the main stack
+        // while leases may be taken out by a subscreen.
         public override bool DisallowExternalBeatmapRulesetChanges => true;
 
         private readonly MultiplayerWaveContainer waves;
@@ -96,7 +98,7 @@ namespace osu.Game.Screens.Multi
                     {
                         RelativeSizeAxes = Axes.Both,
                         Padding = new MarginPadding { Top = Header.HEIGHT },
-                        Child = screenStack = new OsuScreenStack { RelativeSizeAxes = Axes.Both }
+                        Child = screenStack = new MultiplayerSubScreenStack { RelativeSizeAxes = Axes.Both }
                     },
                     new Header(screenStack),
                     createButton = new HeaderButton
@@ -277,11 +279,7 @@ namespace osu.Game.Screens.Multi
 
         private void updateTrack(ValueChangedEvent<WorkingBeatmap> _ = null)
         {
-            bool isMatch = screenStack.CurrentScreen is MatchSubScreen;
-
-            Beatmap.Disabled = isMatch;
-
-            if (isMatch)
+            if (screenStack.CurrentScreen is MatchSubScreen)
             {
                 var track = Beatmap.Value?.Track;
 
diff --git a/osu.Game/Screens/Multi/MultiplayerSubScreenStack.cs b/osu.Game/Screens/Multi/MultiplayerSubScreenStack.cs
new file mode 100644
index 0000000000..3b0ed0dba1
--- /dev/null
+++ b/osu.Game/Screens/Multi/MultiplayerSubScreenStack.cs
@@ -0,0 +1,24 @@
+// 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.Screens;
+
+namespace osu.Game.Screens.Multi
+{
+    public class MultiplayerSubScreenStack : OsuScreenStack
+    {
+        protected override void ScreenChanged(IScreen prev, IScreen next)
+        {
+            base.ScreenChanged(prev, next);
+
+            // because this is a screen stack within a screen stack, let's manually handle disabled changes to simplify things.
+            var osuScreen = ((OsuScreen)next);
+
+            bool disallowChanges = osuScreen.DisallowExternalBeatmapRulesetChanges;
+
+            osuScreen.Beatmap.Disabled = disallowChanges;
+            osuScreen.Ruleset.Disabled = disallowChanges;
+            osuScreen.Mods.Disabled = disallowChanges;
+        }
+    }
+}
diff --git a/osu.Game/Screens/OsuScreenStack.cs b/osu.Game/Screens/OsuScreenStack.cs
index a05933ef0e..e2a0414df7 100644
--- a/osu.Game/Screens/OsuScreenStack.cs
+++ b/osu.Game/Screens/OsuScreenStack.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Screens
             };
 
             ScreenPushed += screenPushed;
-            ScreenExited += screenExited;
+            ScreenExited += ScreenChanged;
         }
 
         private void screenPushed(IScreen prev, IScreen next)
@@ -42,10 +42,10 @@ namespace osu.Game.Screens
             // create dependencies synchronously to ensure leases are in a sane state.
             ((OsuScreen)next).CreateLeasedDependencies((prev as OsuScreen)?.Dependencies ?? Dependencies);
 
-            setParallax(next);
+            ScreenChanged(prev, next);
         }
 
-        private void screenExited(IScreen prev, IScreen next)
+        protected virtual void ScreenChanged(IScreen prev, IScreen next)
         {
             setParallax(next);
         }
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index a78477c771..6ba4157797 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -65,20 +65,7 @@ namespace osu.Game.Screens.Select
                 Mods.Value = CurrentItem.Value.RequiredMods?.ToArray() ?? Array.Empty<Mod>();
             }
 
-            Beatmap.Disabled = true;
-            Ruleset.Disabled = true;
-            Mods.Disabled = true;
-
             return false;
         }
-
-        public override void OnEntering(IScreen last)
-        {
-            base.OnEntering(last);
-
-            Beatmap.Disabled = false;
-            Ruleset.Disabled = false;
-            Mods.Disabled = false;
-        }
     }
 }

From fd71a53717bf57782cb2e0f8379e4379ea7b191d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Feb 2020 14:28:09 +0900
Subject: [PATCH 0295/1142] Fix test regression

---
 osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
index e306706be9..063957d816 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
 
             rooms.BindTo(roomManager.Rooms);
 
-            filter.BindValueChanged(criteria => Filter(criteria.NewValue));
+            filter?.BindValueChanged(criteria => Filter(criteria.NewValue));
         }
 
         public void Filter(FilterCriteria criteria)

From c138e3907e13543a95a86a25021d5f35b56af285 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 6 Feb 2020 14:35:45 +0900
Subject: [PATCH 0296/1142] Move methods below ctor

---
 .../Timeline/TimelineHitObjectBlueprint.cs         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index b46a373818..5225a4299e 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -25,8 +25,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
     {
         private readonly Circle circle;
 
-        protected override bool ShouldBeConsideredForInput(Drawable child) => true;
-
         [UsedImplicitly]
         private readonly Bindable<double> startTime;
 
@@ -42,11 +40,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private const float circle_size = 16;
 
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
-            base.ReceivePositionalInputAt(screenSpacePos) ||
-            circle.ReceivePositionalInputAt(screenSpacePos) ||
-            dragBar?.ReceivePositionalInputAt(screenSpacePos) == true;
-
         public TimelineHitObjectBlueprint(HitObject hitObject)
             : base(hitObject)
         {
@@ -138,6 +131,13 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             Width = (float)(HitObject.GetEndTime() - HitObject.StartTime);
         }
 
+        protected override bool ShouldBeConsideredForInput(Drawable child) => true;
+
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
+            base.ReceivePositionalInputAt(screenSpacePos) ||
+            circle.ReceivePositionalInputAt(screenSpacePos) ||
+            dragBar?.ReceivePositionalInputAt(screenSpacePos) == true;
+
         protected override void OnSelected()
         {
             updateShadows();

From 6ae0efa40d350521d28720fccd050ce7502fb8e3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 6 Feb 2020 14:47:43 +0900
Subject: [PATCH 0297/1142] Fix adjustment not working when dragged before
 object

---
 .../Components/Timeline/TimelineHitObjectBlueprint.cs     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
index 5225a4299e..8f12c2f0ed 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs
@@ -275,18 +275,18 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                     case IHasRepeats repeatHitObject:
                         // find the number of repeats which can fit in the requested time.
                         var lengthOfOneRepeat = repeatHitObject.Duration / (repeatHitObject.RepeatCount + 1);
-                        var proposedCount = (int)((time - hitObject.StartTime) / lengthOfOneRepeat) - 1;
+                        var proposedCount = Math.Max(0, (int)((time - hitObject.StartTime) / lengthOfOneRepeat) - 1);
 
-                        if (proposedCount == repeatHitObject.RepeatCount || proposedCount < 0)
+                        if (proposedCount == repeatHitObject.RepeatCount)
                             return;
 
                         repeatHitObject.RepeatCount = proposedCount;
                         break;
 
                     case IHasEndTime endTimeHitObject:
-                        var snappedTime = beatSnapProvider.SnapTime(time);
+                        var snappedTime = Math.Max(hitObject.StartTime, beatSnapProvider.SnapTime(time));
 
-                        if (endTimeHitObject.EndTime == snappedTime || snappedTime <= hitObject.StartTime)
+                        if (endTimeHitObject.EndTime == snappedTime)
                             return;
 
                         endTimeHitObject.EndTime = snappedTime;

From 6b67b601e9033f6d48d813561fd602be25863bef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Feb 2020 17:35:13 +0900
Subject: [PATCH 0298/1142] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index e5a1ec2f4e..702591231b 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -54,6 +54,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.131.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.206.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index ce58be52ee..81f59a4993 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.131.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.206.0" />
     <PackageReference Include="Sentry" Version="2.0.1" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 6ab3c0f2d2..8e359970a1 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -74,7 +74,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.131.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.206.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
@@ -82,7 +82,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.131.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.206.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 48350638a247faea83506b24b2eb5bd4b5a48803 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Feb 2020 18:38:00 +0900
Subject: [PATCH 0299/1142] Hide drag handles of all playlist items not
 currently being dragged

---
 osu.Game/Overlays/Music/Playlist.cs     |  6 ++++++
 osu.Game/Overlays/Music/PlaylistItem.cs | 20 +++++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Music/Playlist.cs b/osu.Game/Overlays/Music/Playlist.cs
index 8744a6db8b..1ba568443d 100644
--- a/osu.Game/Overlays/Music/Playlist.cs
+++ b/osu.Game/Overlays/Music/Playlist.cs
@@ -18,6 +18,11 @@ namespace osu.Game.Overlays.Music
 
         public readonly Bindable<BeatmapSetInfo> SelectedSet = new Bindable<BeatmapSetInfo>();
 
+        /// <summary>
+        /// Whether any item is currently being dragged. Used to hide other items' drag handles.
+        /// </summary>
+        private readonly BindableBool playlistDragActive = new BindableBool();
+
         public new MarginPadding Padding
         {
             get => base.Padding;
@@ -31,6 +36,7 @@ namespace osu.Game.Overlays.Music
         protected override RearrangeableListItem<BeatmapSetInfo> CreateDrawable(BeatmapSetInfo item) => new PlaylistItem(item)
         {
             SelectedSet = { BindTarget = SelectedSet },
+            PlaylistDragActive = { BindTarget = playlistDragActive },
             RequestSelection = set => RequestSelection?.Invoke(set)
         };
 
diff --git a/osu.Game/Overlays/Music/PlaylistItem.cs b/osu.Game/Overlays/Music/PlaylistItem.cs
index 0f68df737e..0569261867 100644
--- a/osu.Game/Overlays/Music/PlaylistItem.cs
+++ b/osu.Game/Overlays/Music/PlaylistItem.cs
@@ -23,7 +23,10 @@ namespace osu.Game.Overlays.Music
     {
         private const float fade_duration = 100;
 
+        public BindableBool PlaylistDragActive = new BindableBool();
+
         public readonly Bindable<BeatmapSetInfo> SelectedSet = new Bindable<BeatmapSetInfo>();
+
         public Action<BeatmapSetInfo> RequestSelection;
 
         private PlaylistItemHandle handle;
@@ -122,11 +125,26 @@ namespace osu.Game.Overlays.Music
             return true;
         }
 
+        protected override bool OnDragStart(DragStartEvent e)
+        {
+            if (!base.OnDragStart(e))
+                return false;
+
+            PlaylistDragActive.Value = true;
+            return true;
+        }
+
+        protected override void OnDragEnd(DragEndEvent e)
+        {
+            PlaylistDragActive.Value = false;
+            base.OnDragEnd(e);
+        }
+
         protected override bool IsDraggableAt(Vector2 screenSpacePos) => handle.HandlingDrag;
 
         protected override bool OnHover(HoverEvent e)
         {
-            handle.UpdateHoverState(true);
+            handle.UpdateHoverState(IsDragged || !PlaylistDragActive.Value);
             return base.OnHover(e);
         }
 

From 1613198834e3b32bda05096704a0f47c3ddddb5c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Feb 2020 19:43:33 +0900
Subject: [PATCH 0300/1142] Set a sane default keyboard step for mod settings

---
 osu.Game/Configuration/SettingSourceAttribute.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index f859dccc80..a3788e4582 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -45,7 +45,8 @@ namespace osu.Game.Configuration
                         yield return new SettingsSlider<float>
                         {
                             LabelText = attr.Label,
-                            Bindable = bNumber
+                            Bindable = bNumber,
+                            KeyboardStep = 0.1f,
                         };
 
                         break;
@@ -54,7 +55,8 @@ namespace osu.Game.Configuration
                         yield return new SettingsSlider<double>
                         {
                             LabelText = attr.Label,
-                            Bindable = bNumber
+                            Bindable = bNumber,
+                            KeyboardStep = 0.1f,
                         };
 
                         break;

From 5946ad7d809f7e7500ecc1a18d1f5310d47b635a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 6 Feb 2020 16:54:02 +0300
Subject: [PATCH 0301/1142] Fix possible memory leak and better user change
 test support

---
 .../Online/TestSceneCommentsContainer.cs      | 24 ++++++++++---------
 .../Overlays/Comments/CommentsContainer.cs    |  7 +++++-
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
index 33acc75fa8..2a43ba3f99 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
@@ -10,7 +10,8 @@ using osu.Framework.Graphics;
 using osu.Game.Overlays.Comments;
 using osu.Game.Overlays;
 using osu.Framework.Allocation;
-using osu.Game.Online.API;
+using osu.Framework.Bindables;
+using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -35,31 +36,32 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
-        private CommentsContainer comments;
-        private readonly BasicScrollContainer scroll;
-
         public TestSceneCommentsContainer()
         {
+            BasicScrollContainer scroll;
+            TestCommentsContainer comments;
+
             Add(scroll = new BasicScrollContainer
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = comments = new CommentsContainer()
+                Child = comments = new TestCommentsContainer()
             });
-        }
 
-        [BackgroundDependencyLoader]
-        private void load(IAPIProvider api)
-        {
             AddStep("Big Black comments", () => comments.ShowComments(CommentableType.Beatmapset, 41823));
             AddStep("Airman comments", () => comments.ShowComments(CommentableType.Beatmapset, 24313));
             AddStep("Lazer build comments", () => comments.ShowComments(CommentableType.Build, 4772));
             AddStep("News comments", () => comments.ShowComments(CommentableType.NewsPost, 715));
-            AddStep("Trigger user change", api.LocalUser.TriggerChange);
+            AddStep("Trigger user change", comments.User.TriggerChange);
             AddStep("Idle state", () =>
             {
                 scroll.Clear();
-                scroll.Add(comments = new CommentsContainer());
+                scroll.Add(comments = new TestCommentsContainer());
             });
         }
+
+        private class TestCommentsContainer : CommentsContainer
+        {
+            public new Bindable<User> User => base.User;
+        }
     }
 }
diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index 3d68f453b7..33a6be0d7a 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -12,6 +12,7 @@ using osu.Game.Online.API.Requests.Responses;
 using System.Threading;
 using System.Linq;
 using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Game.Users;
 
 namespace osu.Game.Overlays.Comments
 {
@@ -23,6 +24,8 @@ namespace osu.Game.Overlays.Comments
         public readonly Bindable<CommentsSortCriteria> Sort = new Bindable<CommentsSortCriteria>();
         public readonly BindableBool ShowDeleted = new BindableBool();
 
+        protected readonly Bindable<User> User = new Bindable<User>();
+
         [Resolved]
         private IAPIProvider api { get; set; }
 
@@ -109,11 +112,13 @@ namespace osu.Game.Overlays.Comments
                     }
                 }
             });
+
+            User.BindTo(api.LocalUser);
         }
 
         protected override void LoadComplete()
         {
-            api.LocalUser.BindValueChanged(_ => refetchComments());
+            User.BindValueChanged(_ => refetchComments());
             Sort.BindValueChanged(_ => refetchComments(), true);
             base.LoadComplete();
         }

From c09af0052bf3f2e1a2e4809b12aeeb166f0501af Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Thu, 6 Feb 2020 20:21:47 +0100
Subject: [PATCH 0302/1142] Revert accuracy display and column sorting changes

---
 osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs | 7 +------
 osu.Game/Utils/FormatUtils.cs                     | 8 ++++----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 4d5bd84090..2310b2a0f5 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -16,7 +16,6 @@ using osu.Game.Scoring;
 using osu.Game.Users.Drawables;
 using osuTK;
 using osuTK.Graphics;
-using osu.Game.Utils;
 
 namespace osu.Game.Overlays.BeatmapSet.Scores
 {
@@ -66,10 +65,6 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 for (int i = 0; i < value.Count; i++)
                     backgroundFlow.Add(new ScoreTableRowBackground(i, value[i]));
 
-                // Ensure correct column order
-                foreach (ScoreInfo score in value)
-                    score.Statistics = score.Statistics.OrderByDescending(pair => pair.Key).ToDictionary(pair => pair.Key, pair => pair.Value);
-
                 Columns = createHeaders(value[0]);
                 Content = value.Select((s, i) => createContent(i, s)).ToArray().ToRectangular();
             }
@@ -121,7 +116,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 new OsuSpriteText
                 {
                     Margin = new MarginPadding { Right = horizontal_inset },
-                    Text = score.Accuracy.FormatAccuracy(alwaysShowDecimals: true),
+                    Text = score.DisplayAccuracy,
                     Font = OsuFont.GetFont(size: text_size),
                     Colour = score.Accuracy == 1 ? highAccuracyColour : Color4.White
                 },
diff --git a/osu.Game/Utils/FormatUtils.cs b/osu.Game/Utils/FormatUtils.cs
index f0b8b470f1..b3758b3375 100644
--- a/osu.Game/Utils/FormatUtils.cs
+++ b/osu.Game/Utils/FormatUtils.cs
@@ -7,18 +7,18 @@ namespace osu.Game.Utils
     {
         /// <summary>
         /// Turns the provided accuracy into a percentage with 2 decimal places.
+        /// Omits all decimal places when <paramref name="accuracy"/> equals 1d.
         /// </summary>
         /// <param name="accuracy">The accuracy to be formatted</param>
-        /// <param name="alwaysShowDecimals">Whether to show decimal places if <paramref name="accuracy"/> equals 1d</param>
         /// <returns>formatted accuracy in percentage</returns>
-        public static string FormatAccuracy(this double accuracy, bool alwaysShowDecimals = false) => accuracy == 1 && !alwaysShowDecimals ? "100%" : $"{accuracy:0.00%}";
+        public static string FormatAccuracy(this double accuracy) => accuracy == 1 ? "100%" : $"{accuracy:0.00%}";
 
         /// <summary>
         /// Turns the provided accuracy into a percentage with 2 decimal places.
+        /// Omits all decimal places when <paramref name="accuracy"/> equals 100m.
         /// </summary>
         /// <param name="accuracy">The accuracy to be formatted</param>
-        /// <param name="alwaysShowDecimals">Whether to show decimal places if <paramref name="accuracy"/> equals 100m</param>
         /// <returns>formatted accuracy in percentage</returns>
-        public static string FormatAccuracy(this decimal accuracy, bool alwaysShowDecimals = false) => accuracy == 100 && !alwaysShowDecimals ? "100%" : $"{accuracy:0.00}%";
+        public static string FormatAccuracy(this decimal accuracy) => accuracy == 100 ? "100%" : $"{accuracy:0.00}%";
     }
 }

From 83b2b63d2c0bbb4d92e785777191331c0ef5ff2c Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Thu, 6 Feb 2020 23:02:03 +0300
Subject: [PATCH 0303/1142] Make ScreenshotManager a Drawable

---
 osu.Game/Graphics/ScreenshotManager.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/ScreenshotManager.cs b/osu.Game/Graphics/ScreenshotManager.cs
index 3ad36577b5..dc681102ce 100644
--- a/osu.Game/Graphics/ScreenshotManager.cs
+++ b/osu.Game/Graphics/ScreenshotManager.cs
@@ -9,7 +9,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Platform;
@@ -22,7 +22,7 @@ using SixLabors.ImageSharp;
 
 namespace osu.Game.Graphics
 {
-    public class ScreenshotManager : Container, IKeyBindingHandler<GlobalAction>, IHandleGlobalKeyboardInput
+    public class ScreenshotManager : Drawable, IKeyBindingHandler<GlobalAction>, IHandleGlobalKeyboardInput
     {
         private readonly BindableBool cursorVisibility = new BindableBool(true);
 

From 4495192c25ba78891aec846caedbbebe3fc48792 Mon Sep 17 00:00:00 2001
From: UselessToucan <TocoToucanMS@gmail.com>
Date: Thu, 6 Feb 2020 23:22:30 +0300
Subject: [PATCH 0304/1142] Make ScreenshotManager a Component

Co-Authored-By: Salman Ahmed <email@iisalman.me>
---
 osu.Game/Graphics/ScreenshotManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/ScreenshotManager.cs b/osu.Game/Graphics/ScreenshotManager.cs
index dc681102ce..e21545688b 100644
--- a/osu.Game/Graphics/ScreenshotManager.cs
+++ b/osu.Game/Graphics/ScreenshotManager.cs
@@ -22,7 +22,7 @@ using SixLabors.ImageSharp;
 
 namespace osu.Game.Graphics
 {
-    public class ScreenshotManager : Drawable, IKeyBindingHandler<GlobalAction>, IHandleGlobalKeyboardInput
+    public class ScreenshotManager : Component, IKeyBindingHandler<GlobalAction>, IHandleGlobalKeyboardInput
     {
         private readonly BindableBool cursorVisibility = new BindableBool(true);
 

From ecde641729da944bd819136b6fb9080012222339 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 5 Feb 2020 21:52:36 +0100
Subject: [PATCH 0305/1142] Randomise colours in scrolling test scene

Switch to using randomised colours in TestSceneScrollingHitObjects to
better distinguish individual hit objects.
---
 .../Visual/Gameplay/TestSceneScrollingHitObjects.cs       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
index 8629522dc2..da5a83e194 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Threading;
+using osu.Framework.Utils;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
@@ -19,6 +20,7 @@ using osu.Game.Rulesets.Timing;
 using osu.Game.Rulesets.UI;
 using osu.Game.Rulesets.UI.Scrolling;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -236,7 +238,11 @@ namespace osu.Game.Tests.Visual.Gameplay
 
                 AutoSizeAxes = Axes.Both;
 
-                AddInternal(new Box { Size = new Vector2(75) });
+                AddInternal(new Box
+                {
+                    Size = new Vector2(75),
+                    Colour = new Color4(RNG.NextSingle(), RNG.NextSingle(), RNG.NextSingle(), 1)
+                });
             }
         }
     }

From 12469469ad14bd48de4721832ede56b972028b72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 5 Feb 2020 22:56:44 +0100
Subject: [PATCH 0306/1142] Add reproduction test steps for lifetime bug

Modify TestSceneScrollingHitObjects to contain a test case that serves
as a reproduction for a visual bug in which using the overlapping scroll
algorithm results in an incorrect origin adjustment for lifetime.
---
 .../Gameplay/TestSceneScrollingHitObjects.cs  | 88 ++++++++++++-------
 1 file changed, 56 insertions(+), 32 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
index da5a83e194..d03716db2e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
@@ -32,7 +32,8 @@ namespace osu.Game.Tests.Visual.Gameplay
         [Cached(typeof(IReadOnlyList<Mod>))]
         private IReadOnlyList<Mod> mods { get; set; } = Array.Empty<Mod>();
 
-        private const int spawn_interval = 5000;
+        private const int time_range = 5000;
+        private const int spawn_rate = time_range / 10;
 
         private readonly ScrollingTestContainer[] scrollContainers = new ScrollingTestContainer[4];
         private readonly TestPlayfield[] playfields = new TestPlayfield[4];
@@ -52,13 +53,13 @@ namespace osu.Game.Tests.Visual.Gameplay
                         {
                             RelativeSizeAxes = Axes.Both,
                             Child = playfields[0] = new TestPlayfield(),
-                            TimeRange = spawn_interval
+                            TimeRange = time_range
                         },
                         scrollContainers[1] = new ScrollingTestContainer(ScrollingDirection.Down)
                         {
                             RelativeSizeAxes = Axes.Both,
                             Child = playfields[1] = new TestPlayfield(),
-                            TimeRange = spawn_interval
+                            TimeRange = time_range
                         },
                     },
                     new Drawable[]
@@ -67,13 +68,13 @@ namespace osu.Game.Tests.Visual.Gameplay
                         {
                             RelativeSizeAxes = Axes.Both,
                             Child = playfields[2] = new TestPlayfield(),
-                            TimeRange = spawn_interval
+                            TimeRange = time_range
                         },
                         scrollContainers[3] = new ScrollingTestContainer(ScrollingDirection.Right)
                         {
                             RelativeSizeAxes = Axes.Both,
                             Child = playfields[3] = new TestPlayfield(),
-                            TimeRange = spawn_interval
+                            TimeRange = time_range
                         }
                     }
                 }
@@ -86,31 +87,55 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             scrollContainers.ForEach(c => c.ControlPoints.Add(new MultiplierControlPoint(0)));
 
-            for (int i = 0; i <= spawn_interval; i += 1000)
+            for (int i = spawn_rate / 2; i <= time_range; i += spawn_rate)
                 addHitObject(Time.Current + i);
 
             hitObjectSpawnDelegate?.Cancel();
-            hitObjectSpawnDelegate = Scheduler.AddDelayed(() => addHitObject(Time.Current + spawn_interval), 1000, true);
+            hitObjectSpawnDelegate = Scheduler.AddDelayed(() => addHitObject(Time.Current + time_range), spawn_rate, true);
         }
 
+        private IList<MultiplierControlPoint> testControlPoints => new List<MultiplierControlPoint>
+        {
+            new MultiplierControlPoint(time_range) { DifficultyPoint = { SpeedMultiplier = 1.25 } },
+            new MultiplierControlPoint(1.5 * time_range) { DifficultyPoint = { SpeedMultiplier = 1 } },
+            new MultiplierControlPoint(2 * time_range) { DifficultyPoint = { SpeedMultiplier = 1.5 } }
+        };
+
         [Test]
         public void TestScrollAlgorithms()
         {
-            AddStep("Constant scroll", () => setScrollAlgorithm(ScrollVisualisationMethod.Constant));
-            AddStep("Overlapping scroll", () => setScrollAlgorithm(ScrollVisualisationMethod.Overlapping));
-            AddStep("Sequential scroll", () => setScrollAlgorithm(ScrollVisualisationMethod.Sequential));
+            AddStep("constant scroll", () => setScrollAlgorithm(ScrollVisualisationMethod.Constant));
+            AddStep("overlapping scroll", () => setScrollAlgorithm(ScrollVisualisationMethod.Overlapping));
+            AddStep("sequential scroll", () => setScrollAlgorithm(ScrollVisualisationMethod.Sequential));
 
-            AddSliderStep("Time range", 100, 10000, spawn_interval, v => scrollContainers.Where(c => c != null).ForEach(c => c.TimeRange = v));
-            AddStep("Add control point", () => addControlPoint(Time.Current + spawn_interval));
+            AddSliderStep("time range", 100, 10000, time_range, v => scrollContainers.Where(c => c != null).ForEach(c => c.TimeRange = v));
+
+            AddStep("add control points", () => addControlPoints(testControlPoints, Time.Current));
         }
 
         [Test]
-        public void TestScrollLifetime()
+        public void TestConstantScrollLifetime()
         {
-            AddStep("Set constant scroll", () => setScrollAlgorithm(ScrollVisualisationMethod.Constant));
+            AddStep("set constant scroll", () => setScrollAlgorithm(ScrollVisualisationMethod.Constant));
             // scroll container time range must be less than the rate of spawning hitobjects
             // otherwise the hitobjects will spawn already partly visible on screen and look wrong
-            AddStep("Set time range", () => scrollContainers.ForEach(c => c.TimeRange = spawn_interval / 2.0));
+            AddStep("set time range", () => scrollContainers.ForEach(c => c.TimeRange = time_range / 2.0));
+        }
+
+        [Test]
+        public void TestSequentialScrollLifetime()
+        {
+            AddStep("set sequential scroll", () => setScrollAlgorithm(ScrollVisualisationMethod.Sequential));
+            AddStep("set time range", () => scrollContainers.ForEach(c => c.TimeRange = time_range / 2.0));
+            AddStep("add control points", () => addControlPoints(testControlPoints, Time.Current));
+        }
+
+        [Test]
+        public void TestOverlappingScrollLifetime()
+        {
+            AddStep("set overlapping scroll", () => setScrollAlgorithm(ScrollVisualisationMethod.Overlapping));
+            AddStep("set time range", () => scrollContainers.ForEach(c => c.TimeRange = time_range / 2.0));
+            AddStep("add control points", () => addControlPoints(testControlPoints, Time.Current));
         }
 
         private void addHitObject(double time)
@@ -124,28 +149,27 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
         }
 
-        private void addControlPoint(double time)
+        private TestDrawableControlPoint createDrawablePoint(TestPlayfield playfield, double t)
         {
-            scrollContainers.ForEach(c =>
+            var obj = new TestDrawableControlPoint(playfield.Direction, t);
+            setAnchor(obj, playfield);
+            return obj;
+        }
+
+        private void addControlPoints(IList<MultiplierControlPoint> controlPoints, double sequenceStartTime)
+        {
+            controlPoints.ForEach(point => point.StartTime += sequenceStartTime);
+
+            scrollContainers.ForEach(container =>
             {
-                c.ControlPoints.Add(new MultiplierControlPoint(time) { DifficultyPoint = { SpeedMultiplier = 3 } });
-                c.ControlPoints.Add(new MultiplierControlPoint(time + 2000) { DifficultyPoint = { SpeedMultiplier = 2 } });
-                c.ControlPoints.Add(new MultiplierControlPoint(time + 3000) { DifficultyPoint = { SpeedMultiplier = 1 } });
+                container.ControlPoints.AddRange(controlPoints);
             });
 
-            playfields.ForEach(p =>
+            foreach (var playfield in playfields)
             {
-                TestDrawableControlPoint createDrawablePoint(double t)
-                {
-                    var obj = new TestDrawableControlPoint(p.Direction, t);
-                    setAnchor(obj, p);
-                    return obj;
-                }
-
-                p.Add(createDrawablePoint(time));
-                p.Add(createDrawablePoint(time + 2000));
-                p.Add(createDrawablePoint(time + 3000));
-            });
+                foreach (var controlPoint in controlPoints)
+                    playfield.Add(createDrawablePoint(playfield, controlPoint.StartTime));
+            }
         }
 
         private void setAnchor(DrawableHitObject obj, TestPlayfield playfield)

From 5fde4f2c0cda1c48a130fb4771eac1230ff5ba45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 6 Feb 2020 22:46:31 +0100
Subject: [PATCH 0307/1142] Fix lifetime calculation in overlapping algorithm

Changes to lifetime calculation in scrolling rulesets introduced in
#7367, which aimed to account for the distance between hit objects'
origin and its edge entering the scrolling area, fixed some issues with
hitobjects appearing abruptly, but also regressed some other scenarios.

Upon investigation, the regression was localised to the overlapping
scroll algorithm. The reason for this was two-fold:

* The previous code used TimeAt() to calculate the time of travel from
  the hit object's edge to its origin. For other algorithms, that time
  can be accurately reconstructed, because they don't have periods of
  time where there are multiple hit objects scrolling at different
  velocities.

  That invariant does not hold for the overlapping algorithm, therefore
  it is possible for different values to be technically correct for
  TimeAt(). However, the only value that matters for the adjustment
  is the one that's indicated by the control point that applies to the
  hit object origin, which can be uniquely identified.

* Additionally, the offset returned (even if correct) was applied
  externally to the hit object's start time and passed to
  GetDisplayStartTime(). In the overlapping algorithm, the choice of
  control point used in GetDisplayStartTime() is important, since
  the value of the speed multiplier is read within.

  Externally rewinding the hit object's start time meant that in some
  cases the speed multiplier of the *previous* control point is applied,
  which led to hit objects appearing too late if the scrolling rate
  decreased.

Because of the above, modify GetDisplayStartTime() to take the offset
into account in all algorithms, and apply the adjustment correctly
inside of them. The constant and sequential algorithms needed no
adjustment from the previous logic, since:

* the constant algorithm disregarded control points, and
* the sequential algorithm would effectively rewind to time = 0,
  calculate the absolute distance from time = 0 to the hit object start,
  apply the origin offset *to the absolute distance*, and then convert
  back to time, applying all control points in sequence. Due to this
  it was impossible for control points to get mixed up while
  calculating.

As for the overlapping algorithm, the high-level logic is as follows:

* The distance that the origin has to travel is the length of the scroll
  plus the distance from the origin to the object edge.
* The above distance divided by the scroll length gives the relative
  scroll lengths that the object has to travel.
* As one relative scroll length takes one time range, the relative
  travel length multiplied by the time range gives the absolute travel
  time of the object origin.
* Finally, the control point multiplier applicable at origin time is
  applied to the whole travel time.

Correctness of the above is demonstrated by visual tests added before
and headless unit tests of the algorithms themselves. The sequential
scroll algorithm was not covered by unit tests, and remains uncovered
due to floating-point inaccuracies that should be addressed separately.
---
 .../ScrollAlgorithms/ConstantScrollTest.cs    | 19 ++++++++---
 .../ScrollAlgorithms/OverlappingScrollTest.cs | 19 ++++++++---
 .../Algorithms/ConstantScrollAlgorithm.cs     |  6 +++-
 .../Scrolling/Algorithms/IScrollAlgorithm.cs  | 32 +++++++++++++++----
 .../Algorithms/OverlappingScrollAlgorithm.cs  |  7 ++--
 .../Algorithms/SequentialScrollAlgorithm.cs   |  6 +++-
 .../Scrolling/ScrollingHitObjectContainer.cs  |  3 +-
 .../Tests/Visual/ScrollingTestContainer.cs    |  4 +--
 8 files changed, 71 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Tests/ScrollAlgorithms/ConstantScrollTest.cs b/osu.Game.Tests/ScrollAlgorithms/ConstantScrollTest.cs
index d7f709dc03..a6e8622b6f 100644
--- a/osu.Game.Tests/ScrollAlgorithms/ConstantScrollTest.cs
+++ b/osu.Game.Tests/ScrollAlgorithms/ConstantScrollTest.cs
@@ -18,12 +18,21 @@ namespace osu.Game.Tests.ScrollAlgorithms
         }
 
         [Test]
-        public void TestDisplayStartTime()
+        public void TestPointDisplayStartTime()
         {
-            Assert.AreEqual(-8000, algorithm.GetDisplayStartTime(2000, 10000));
-            Assert.AreEqual(-3000, algorithm.GetDisplayStartTime(2000, 5000));
-            Assert.AreEqual(2000, algorithm.GetDisplayStartTime(7000, 5000));
-            Assert.AreEqual(7000, algorithm.GetDisplayStartTime(17000, 10000));
+            Assert.AreEqual(-8000, algorithm.GetDisplayStartTime(2000, 0, 10000, 1));
+            Assert.AreEqual(-3000, algorithm.GetDisplayStartTime(2000, 0, 5000, 1));
+            Assert.AreEqual(2000, algorithm.GetDisplayStartTime(7000, 0, 5000, 1));
+            Assert.AreEqual(7000, algorithm.GetDisplayStartTime(17000, 0, 10000, 1));
+        }
+
+        [Test]
+        public void TestObjectDisplayStartTime()
+        {
+            Assert.AreEqual(900, algorithm.GetDisplayStartTime(2000, 50, 1000, 500)); // 2000 - (1 + 50 / 500) * 1000
+            Assert.AreEqual(8900, algorithm.GetDisplayStartTime(10000, 50, 1000, 500)); // 10000 - (1 + 50 / 500) * 1000
+            Assert.AreEqual(13500, algorithm.GetDisplayStartTime(15000, 250, 1000, 500)); // 15000 - (1 + 250 / 500) * 1000
+            Assert.AreEqual(19000, algorithm.GetDisplayStartTime(25000, 100, 5000, 500)); // 25000 - (1 + 100 / 500) * 5000
         }
 
         [Test]
diff --git a/osu.Game.Tests/ScrollAlgorithms/OverlappingScrollTest.cs b/osu.Game.Tests/ScrollAlgorithms/OverlappingScrollTest.cs
index 106aa88be3..1429d22c1a 100644
--- a/osu.Game.Tests/ScrollAlgorithms/OverlappingScrollTest.cs
+++ b/osu.Game.Tests/ScrollAlgorithms/OverlappingScrollTest.cs
@@ -27,11 +27,22 @@ namespace osu.Game.Tests.ScrollAlgorithms
         }
 
         [Test]
-        public void TestDisplayStartTime()
+        public void TestPointDisplayStartTime()
         {
-            Assert.AreEqual(1000, algorithm.GetDisplayStartTime(2000, 1000)); // Like constant
-            Assert.AreEqual(10000, algorithm.GetDisplayStartTime(10500, 1000)); // 10500 - (1000 * 0.5)
-            Assert.AreEqual(20000, algorithm.GetDisplayStartTime(22000, 1000)); // 23000 - (1000 / 0.5)
+            Assert.AreEqual(1000, algorithm.GetDisplayStartTime(2000, 0, 1000, 1)); // Like constant
+            Assert.AreEqual(10000, algorithm.GetDisplayStartTime(10500, 0, 1000, 1)); // 10500 - (1000 * 0.5)
+            Assert.AreEqual(20000, algorithm.GetDisplayStartTime(22000, 0, 1000, 1)); // 23000 - (1000 / 0.5)
+        }
+
+        [Test]
+        public void TestObjectDisplayStartTime()
+        {
+            Assert.AreEqual(900, algorithm.GetDisplayStartTime(2000, 50, 1000, 500)); // 2000 - (1 + 50 / 500) * 1000 / 1
+            Assert.AreEqual(9450, algorithm.GetDisplayStartTime(10000, 50, 1000, 500)); // 10000 - (1 + 50 / 500) * 1000 / 2
+            Assert.AreEqual(14250, algorithm.GetDisplayStartTime(15000, 250, 1000, 500)); // 15000 - (1 + 250 / 500) * 1000 / 2
+            Assert.AreEqual(16500, algorithm.GetDisplayStartTime(18000, 250, 2000, 500)); // 18000 - (1 + 250 / 500) * 2000 / 2
+            Assert.AreEqual(17800, algorithm.GetDisplayStartTime(20000, 50, 1000, 500)); // 20000 - (1 + 50 / 500) * 1000 / 0.5
+            Assert.AreEqual(19800, algorithm.GetDisplayStartTime(22000, 50, 1000, 500)); // 22000 - (1 + 50 / 500) * 1000 / 0.5
         }
 
         [Test]
diff --git a/osu.Game/Rulesets/UI/Scrolling/Algorithms/ConstantScrollAlgorithm.cs b/osu.Game/Rulesets/UI/Scrolling/Algorithms/ConstantScrollAlgorithm.cs
index 75ea3efdf2..0d4283e319 100644
--- a/osu.Game/Rulesets/UI/Scrolling/Algorithms/ConstantScrollAlgorithm.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/Algorithms/ConstantScrollAlgorithm.cs
@@ -5,7 +5,11 @@ namespace osu.Game.Rulesets.UI.Scrolling.Algorithms
 {
     public class ConstantScrollAlgorithm : IScrollAlgorithm
     {
-        public double GetDisplayStartTime(double time, double timeRange) => time - timeRange;
+        public double GetDisplayStartTime(double originTime, float offset, double timeRange, float scrollLength)
+        {
+            var adjustedTime = TimeAt(-offset, originTime, timeRange, scrollLength);
+            return adjustedTime - timeRange;
+        }
 
         public float GetLength(double startTime, double endTime, double timeRange, float scrollLength)
         {
diff --git a/osu.Game/Rulesets/UI/Scrolling/Algorithms/IScrollAlgorithm.cs b/osu.Game/Rulesets/UI/Scrolling/Algorithms/IScrollAlgorithm.cs
index 5f053975c7..c394a05bcc 100644
--- a/osu.Game/Rulesets/UI/Scrolling/Algorithms/IScrollAlgorithm.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/Algorithms/IScrollAlgorithm.cs
@@ -6,15 +6,33 @@ namespace osu.Game.Rulesets.UI.Scrolling.Algorithms
     public interface IScrollAlgorithm
     {
         /// <summary>
-        /// Given a point in time, computes the time at which it enters the time range.
+        /// Given a point in time associated with an object's origin
+        /// and the spatial distance between the edge and the origin of the object along the scrolling axis,
+        /// computes the time at which the object initially enters the time range.
         /// </summary>
-        /// <remarks>
-        /// E.g. For a constant time range of 5000ms, the time at which t=7000ms enters the time range is 2000ms.
-        /// </remarks>
-        /// <param name="time">The point in time.</param>
+        /// <example>
+        /// Let's assume the following parameters:
+        /// <list type="bullet">
+        ///     <item><paramref name="originTime"/> = 7000ms,</item>
+        ///     <item><paramref name="offset"/> = 100px,</item>
+        ///     <item><paramref name="timeRange"/> = 5000ms,</item>
+        ///     <item><paramref name="scrollLength"/> = 1000px</item>
+        /// </list>
+        /// and a constant scrolling rate.
+        /// To arrive at the end of the scrolling container, the object's origin has to cover
+        /// <code>1000 + 100 = 1100px</code>
+        /// so that the edge starts at the end of the scrolling container.
+        /// One scroll length of 1000px covers 5000ms of time, so the time required to cover 1100px is equal to
+        /// <code>5000 * (1100 / 1000) = 5500ms,</code>
+        /// and therefore the object should start being visible at
+        /// <code>7000 - 5500 = 1500ms.</code>
+        /// </example>
+        /// <param name="originTime">The time point at which the object origin should enter the time range.</param>
+        /// <param name="offset">The spatial distance between the object's edge and its origin along the scrolling axis.</param>
         /// <param name="timeRange">The amount of visible time.</param>
-        /// <returns>The time at which <paramref name="time"/> enters <paramref name="timeRange"/>.</returns>
-        double GetDisplayStartTime(double time, double timeRange);
+        /// <param name="scrollLength">The absolute spatial length through <paramref name="timeRange"/>.</param>
+        /// <returns>The time at which the object should enter the time range.</returns>
+        double GetDisplayStartTime(double originTime, float offset, double timeRange, float scrollLength);
 
         /// <summary>
         /// Computes the spatial length within a start and end time.
diff --git a/osu.Game/Rulesets/UI/Scrolling/Algorithms/OverlappingScrollAlgorithm.cs b/osu.Game/Rulesets/UI/Scrolling/Algorithms/OverlappingScrollAlgorithm.cs
index fe22a86fad..7b827e0c63 100644
--- a/osu.Game/Rulesets/UI/Scrolling/Algorithms/OverlappingScrollAlgorithm.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/Algorithms/OverlappingScrollAlgorithm.cs
@@ -20,11 +20,12 @@ namespace osu.Game.Rulesets.UI.Scrolling.Algorithms
             searchPoint = new MultiplierControlPoint();
         }
 
-        public double GetDisplayStartTime(double time, double timeRange)
+        public double GetDisplayStartTime(double originTime, float offset, double timeRange, float scrollLength)
         {
+            var controlPoint = controlPointAt(originTime);
             // The total amount of time that the hitobject will remain visible within the timeRange, which decreases as the speed multiplier increases
-            double visibleDuration = timeRange / controlPointAt(time).Multiplier;
-            return time - visibleDuration;
+            double visibleDuration = (scrollLength + offset) * timeRange / controlPoint.Multiplier / scrollLength;
+            return originTime - visibleDuration;
         }
 
         public float GetLength(double startTime, double endTime, double timeRange, float scrollLength)
diff --git a/osu.Game/Rulesets/UI/Scrolling/Algorithms/SequentialScrollAlgorithm.cs b/osu.Game/Rulesets/UI/Scrolling/Algorithms/SequentialScrollAlgorithm.cs
index 3c9a205412..41f9ebdb82 100644
--- a/osu.Game/Rulesets/UI/Scrolling/Algorithms/SequentialScrollAlgorithm.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/Algorithms/SequentialScrollAlgorithm.cs
@@ -20,7 +20,11 @@ namespace osu.Game.Rulesets.UI.Scrolling.Algorithms
             positionCache = new Dictionary<double, double>();
         }
 
-        public double GetDisplayStartTime(double time, double timeRange) => time - timeRange - 1000;
+        public double GetDisplayStartTime(double originTime, float offset, double timeRange, float scrollLength)
+        {
+            double adjustedTime = TimeAt(-offset, originTime, timeRange, scrollLength);
+            return adjustedTime - timeRange - 1000;
+        }
 
         public float GetLength(double startTime, double endTime, double timeRange, float scrollLength)
         {
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 04b4374fc4..83a7f7289f 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -133,8 +133,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
                     break;
             }
 
-            var adjustedStartTime = scrollingInfo.Algorithm.TimeAt(-originAdjustment, hitObject.HitObject.StartTime, timeRange.Value, scrollLength);
-            return scrollingInfo.Algorithm.GetDisplayStartTime(adjustedStartTime, timeRange.Value);
+            return scrollingInfo.Algorithm.GetDisplayStartTime(hitObject.HitObject.StartTime, originAdjustment, timeRange.Value, scrollLength);
         }
 
         // Cant use AddOnce() since the delegate is re-constructed every invocation
diff --git a/osu.Game/Tests/Visual/ScrollingTestContainer.cs b/osu.Game/Tests/Visual/ScrollingTestContainer.cs
index 161ebe7030..18326a78ad 100644
--- a/osu.Game/Tests/Visual/ScrollingTestContainer.cs
+++ b/osu.Game/Tests/Visual/ScrollingTestContainer.cs
@@ -86,8 +86,8 @@ namespace osu.Game.Tests.Visual
                 }
             }
 
-            public double GetDisplayStartTime(double time, double timeRange)
-                => implementation.GetDisplayStartTime(time, timeRange);
+            public double GetDisplayStartTime(double originTime, float offset, double timeRange, float scrollLength)
+                => implementation.GetDisplayStartTime(originTime, offset, timeRange, scrollLength);
 
             public float GetLength(double startTime, double endTime, double timeRange, float scrollLength)
                 => implementation.GetLength(startTime, endTime, timeRange, scrollLength);

From 7460018cd3775394d3eca84e282bb0b165633b41 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Feb 2020 14:58:07 +0900
Subject: [PATCH 0308/1142] Move combo colours to GlobalSkinColours

---
 .../TestSceneLegacyBeatmapSkin.cs                 |  2 +-
 .../Gameplay/TestSceneHitObjectAccentColour.cs    |  4 ++--
 .../Skins/TestSceneSkinConfigurationLookup.cs     |  6 +++---
 .../Objects/Drawables/DrawableHitObject.cs        |  2 +-
 osu.Game/Screens/Menu/LogoVisualisation.cs        |  2 +-
 osu.Game/Screens/Menu/MenuSideFlashes.cs          |  2 +-
 osu.Game/Skinning/DefaultSkin.cs                  |  4 ++--
 .../{GlobalSkinColour.cs => GlobalSkinColours.cs} |  3 ++-
 osu.Game/Skinning/GlobalSkinConfiguration.cs      |  1 -
 osu.Game/Skinning/LegacySkin.cs                   | 15 +++++++++------
 10 files changed, 22 insertions(+), 19 deletions(-)
 rename osu.Game/Skinning/{GlobalSkinColour.cs => GlobalSkinColours.cs} (79%)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
index bbb50c287b..3ff37c4147 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneLegacyBeatmapSkin.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             public IReadOnlyList<Color4> UsableComboColours =>
                 GameplayClockContainer.ChildrenOfType<BeatmapSkinProvidingContainer>()
                                       .First()
-                                      .GetConfig<GlobalSkinConfiguration, IReadOnlyList<Color4>>(GlobalSkinConfiguration.ComboColours)?.Value;
+                                      .GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
         }
 
         private class CustomSkinWorkingBeatmap : ClockBackedTestWorkingBeatmap
diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
index c6d1f9da29..17dc27543d 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
@@ -126,10 +126,10 @@ namespace osu.Game.Tests.Gameplay
             {
                 switch (lookup)
                 {
-                    case GlobalSkinConfiguration global:
+                    case GlobalSkinColours global:
                         switch (global)
                         {
-                            case GlobalSkinConfiguration.ComboColours:
+                            case GlobalSkinColours.ComboColours:
                                 return SkinUtils.As<TValue>(new Bindable<IReadOnlyList<Color4>>(ComboColours));
                         }
 
diff --git a/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs b/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
index ed54cc982d..35313ee858 100644
--- a/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
+++ b/osu.Game.Tests/Skins/TestSceneSkinConfigurationLookup.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Tests.Skins
         [Test]
         public void TestGlobalLookup()
         {
-            AddAssert("Check combo colours", () => requester.GetConfig<GlobalSkinConfiguration, IReadOnlyList<Color4>>(GlobalSkinConfiguration.ComboColours)?.Value?.Count > 0);
+            AddAssert("Check combo colours", () => requester.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value?.Count > 0);
         }
 
         [Test]
@@ -121,7 +121,7 @@ namespace osu.Game.Tests.Skins
         public void TestEmptyComboColours()
         {
             AddAssert("Check retrieved combo colours is skin default colours", () =>
-                requester.GetConfig<GlobalSkinConfiguration, IReadOnlyList<Color4>>(GlobalSkinConfiguration.ComboColours)?.Value?.SequenceEqual(SkinConfiguration.DefaultComboColours) ?? false);
+                requester.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value?.SequenceEqual(SkinConfiguration.DefaultComboColours) ?? false);
         }
 
         [Test]
@@ -136,7 +136,7 @@ namespace osu.Game.Tests.Skins
             AddStep("Disallow default colours fallback in source2", () => source2.Configuration.AllowDefaultComboColoursFallback = false);
 
             AddAssert("Check retrieved combo colours from source1", () =>
-                requester.GetConfig<GlobalSkinConfiguration, IReadOnlyList<Color4>>(GlobalSkinConfiguration.ComboColours)?.Value?.SequenceEqual(source1.Configuration.ComboColours) ?? false);
+                requester.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value?.SequenceEqual(source1.Configuration.ComboColours) ?? false);
         }
 
         [Test]
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 4ac30fe7fb..e391157b5b 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -349,7 +349,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
             if (HitObject is IHasComboInformation combo)
             {
-                var comboColours = CurrentSkin.GetConfig<GlobalSkinConfiguration, IReadOnlyList<Color4>>(GlobalSkinConfiguration.ComboColours)?.Value;
+                var comboColours = CurrentSkin.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
                 AccentColour.Value = comboColours?.Count > 0 ? comboColours[combo.ComboIndex % comboColours.Count] : Color4.White;
             }
         }
diff --git a/osu.Game/Screens/Menu/LogoVisualisation.cs b/osu.Game/Screens/Menu/LogoVisualisation.cs
index 8fc07f5989..06ca161fed 100644
--- a/osu.Game/Screens/Menu/LogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/LogoVisualisation.cs
@@ -123,7 +123,7 @@ namespace osu.Game.Screens.Menu
             Color4 defaultColour = Color4.White.Opacity(0.2f);
 
             if (user.Value?.IsSupporter ?? false)
-                AccentColour = skin.Value.GetConfig<GlobalSkinColour, Color4>(GlobalSkinColour.MenuGlow)?.Value ?? defaultColour;
+                AccentColour = skin.Value.GetConfig<GlobalSkinColours, Color4>(GlobalSkinColours.MenuGlow)?.Value ?? defaultColour;
             else
                 AccentColour = defaultColour;
         }
diff --git a/osu.Game/Screens/Menu/MenuSideFlashes.cs b/osu.Game/Screens/Menu/MenuSideFlashes.cs
index 3a88cda4ef..321381ac8d 100644
--- a/osu.Game/Screens/Menu/MenuSideFlashes.cs
+++ b/osu.Game/Screens/Menu/MenuSideFlashes.cs
@@ -112,7 +112,7 @@ namespace osu.Game.Screens.Menu
             Color4 baseColour = colours.Blue;
 
             if (user.Value?.IsSupporter ?? false)
-                baseColour = skin.Value.GetConfig<GlobalSkinColour, Color4>(GlobalSkinColour.MenuGlow)?.Value ?? baseColour;
+                baseColour = skin.Value.GetConfig<GlobalSkinColours, Color4>(GlobalSkinColours.MenuGlow)?.Value ?? baseColour;
 
             // linear colour looks better in this case, so let's use it for now.
             Color4 gradientDark = baseColour.Opacity(0).ToLinear();
diff --git a/osu.Game/Skinning/DefaultSkin.cs b/osu.Game/Skinning/DefaultSkin.cs
index 2a065ea3d7..6b4af21b37 100644
--- a/osu.Game/Skinning/DefaultSkin.cs
+++ b/osu.Game/Skinning/DefaultSkin.cs
@@ -31,10 +31,10 @@ namespace osu.Game.Skinning
             {
                 // todo: this code is pulled from LegacySkin and should not exist.
                 // will likely change based on how databased storage of skin configuration goes.
-                case GlobalSkinConfiguration global:
+                case GlobalSkinColours global:
                     switch (global)
                     {
-                        case GlobalSkinConfiguration.ComboColours:
+                        case GlobalSkinColours.ComboColours:
                             return SkinUtils.As<TValue>(new Bindable<IReadOnlyList<Color4>>(Configuration.ComboColours));
                     }
 
diff --git a/osu.Game/Skinning/GlobalSkinColour.cs b/osu.Game/Skinning/GlobalSkinColours.cs
similarity index 79%
rename from osu.Game/Skinning/GlobalSkinColour.cs
rename to osu.Game/Skinning/GlobalSkinColours.cs
index d039be98ce..f889371b98 100644
--- a/osu.Game/Skinning/GlobalSkinColour.cs
+++ b/osu.Game/Skinning/GlobalSkinColours.cs
@@ -3,8 +3,9 @@
 
 namespace osu.Game.Skinning
 {
-    public enum GlobalSkinColour
+    public enum GlobalSkinColours
     {
+        ComboColours,
         MenuGlow
     }
 }
diff --git a/osu.Game/Skinning/GlobalSkinConfiguration.cs b/osu.Game/Skinning/GlobalSkinConfiguration.cs
index 66dc9a9395..0532e64546 100644
--- a/osu.Game/Skinning/GlobalSkinConfiguration.cs
+++ b/osu.Game/Skinning/GlobalSkinConfiguration.cs
@@ -5,6 +5,5 @@ namespace osu.Game.Skinning
 {
     public enum GlobalSkinConfiguration
     {
-        ComboColours
     }
 }
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 671d37fda4..609fb79d9a 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -68,22 +69,22 @@ namespace osu.Game.Skinning
         {
             switch (lookup)
             {
-                case GlobalSkinConfiguration global:
-                    switch (global)
+                case GlobalSkinColours colour:
+                    switch (colour)
                     {
-                        case GlobalSkinConfiguration.ComboColours:
+                        case GlobalSkinColours.ComboColours:
                             var comboColours = Configuration.ComboColours;
                             if (comboColours != null)
                                 return SkinUtils.As<TValue>(new Bindable<IReadOnlyList<Color4>>(comboColours));
 
                             break;
+
+                        default:
+                            return SkinUtils.As<TValue>(getCustomColour(colour.ToString()));
                     }
 
                     break;
 
-                case GlobalSkinColour colour:
-                    return SkinUtils.As<TValue>(getCustomColour(colour.ToString()));
-
                 case LegacySkinConfiguration.LegacySetting legacy:
                     switch (legacy)
                     {
@@ -100,6 +101,8 @@ namespace osu.Game.Skinning
                     return SkinUtils.As<TValue>(getCustomColour(customColour.Lookup.ToString()));
 
                 default:
+                    // handles lookups like GlobalSkinConfiguration
+
                     try
                     {
                         if (Configuration.ConfigDictionary.TryGetValue(lookup.ToString(), out var val))

From 544685be4863631b47df94f19d4f6307cb014d71 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Feb 2020 14:58:29 +0900
Subject: [PATCH 0309/1142] Add support for reading skin frame rate from
 configuration file

---
 .../Skinning/OsuLegacySkinTransformer.cs      |  9 ++-
 osu.Game/Skinning/GlobalSkinConfiguration.cs  |  1 +
 osu.Game/Skinning/LegacySkinExtensions.cs     | 72 +++++++++++--------
 3 files changed, 51 insertions(+), 31 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
index 266b619334..d6c3f443eb 100644
--- a/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/OsuLegacySkinTransformer.cs
@@ -46,17 +46,20 @@ namespace osu.Game.Rulesets.Osu.Skinning
             switch (osuComponent.Component)
             {
                 case OsuSkinComponents.FollowPoint:
-                    return this.GetAnimation(component.LookupName, true, false);
+                    return this.GetAnimation(component.LookupName, true, false, true);
 
                 case OsuSkinComponents.SliderFollowCircle:
-                    var followCircle = this.GetAnimation("sliderfollowcircle", true, true);
+                    var followCircle = this.GetAnimation("sliderfollowcircle", true, true, true);
                     if (followCircle != null)
                         // follow circles are 2x the hitcircle resolution in legacy skins (since they are scaled down from >1x
                         followCircle.Scale *= 0.5f;
                     return followCircle;
 
                 case OsuSkinComponents.SliderBall:
-                    var sliderBallContent = this.GetAnimation("sliderb", true, true, "");
+                    var sliderBallContent = this.GetAnimation("sliderb", true, true, animationSeparator: "");
+
+                    // todo: slider ball has a custom frame delay based on velocity
+                    // Math.Max((150 / Velocity) * GameBase.SIXTY_FRAME_TIME, GameBase.SIXTY_FRAME_TIME);
 
                     if (sliderBallContent != null)
                     {
diff --git a/osu.Game/Skinning/GlobalSkinConfiguration.cs b/osu.Game/Skinning/GlobalSkinConfiguration.cs
index 0532e64546..8774fe5a97 100644
--- a/osu.Game/Skinning/GlobalSkinConfiguration.cs
+++ b/osu.Game/Skinning/GlobalSkinConfiguration.cs
@@ -5,5 +5,6 @@ namespace osu.Game.Skinning
 {
     public enum GlobalSkinConfiguration
     {
+        AnimationFramerate
     }
 }
diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index c758b699ed..fa4de21eec 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Sprites;
@@ -10,48 +12,62 @@ namespace osu.Game.Skinning
 {
     public static class LegacySkinExtensions
     {
-        public static Drawable GetAnimation(this ISkin source, string componentName, bool animatable, bool looping, string animationSeparator = "-")
+        public static Drawable GetAnimation(this ISkin source, string componentName, bool animatable, bool looping, bool applyConfigFrameRate = false, string animationSeparator = "-")
         {
-            const double default_frame_time = 1000 / 60d;
-
             Texture texture;
 
-            Texture getFrameTexture(int frame) => source.GetTexture($"{componentName}{animationSeparator}{frame}");
-
-            TextureAnimation animation = null;
-
             if (animatable)
             {
-                for (int i = 0; true; i++)
+                var textures = getTextures().ToArray();
+
+                if (textures.Length > 0)
                 {
-                    if ((texture = getFrameTexture(i)) == null)
-                        break;
-
-                    if (animation == null)
+                    var animation = new TextureAnimation
                     {
-                        animation = new TextureAnimation
-                        {
-                            DefaultFrameLength = default_frame_time,
-                            Repeat = looping
-                        };
-                    }
+                        DefaultFrameLength = getFrameLength(source, applyConfigFrameRate, textures),
+                        Repeat = looping,
+                    };
 
-                    animation.AddFrame(texture);
+                    foreach (var t in textures)
+                        animation.AddFrame(t);
+
+                    return animation;
                 }
             }
 
-            if (animation != null)
-                return animation;
-
+            // if an animation was not allowed or not found, fall back to a sprite retrieval.
             if ((texture = source.GetTexture(componentName)) != null)
-            {
-                return new Sprite
-                {
-                    Texture = texture
-                };
-            }
+                return new Sprite { Texture = texture };
 
             return null;
+
+            IEnumerable<Texture> getTextures()
+            {
+                for (int i = 0; true; i++)
+                {
+                    if ((texture = source.GetTexture($"{componentName}{animationSeparator}{i}")) == null)
+                        break;
+
+                    yield return texture;
+                }
+            }
+        }
+
+        private const double default_frame_time = 1000 / 60d;
+
+        private static double getFrameLength(ISkin source, bool applyConfigFrameRate, Texture[] textures)
+        {
+            if (applyConfigFrameRate)
+            {
+                var iniRate = source.GetConfig<GlobalSkinConfiguration, int>(GlobalSkinConfiguration.AnimationFramerate);
+
+                if (iniRate != null)
+                    return 1000f / iniRate.Value;
+
+                return 1000f / textures.Length;
+            }
+
+            return default_frame_time;
         }
     }
 }

From 9181bb41c621c217c187535e9d899a7d8a76258d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Feb 2020 15:11:09 +0900
Subject: [PATCH 0310/1142] Remove unused using

---
 osu.Game/Skinning/LegacySkin.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 609fb79d9a..94611317d5 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.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 System.Collections.Generic;
 using System.IO;
 using System.Linq;

From c392ba6a7e35c7a6546cb21168ea9241264158e6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Feb 2020 15:46:10 +0900
Subject: [PATCH 0311/1142] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 702591231b..25bde037db 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -54,6 +54,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.206.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.207.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 81f59a4993..21c9eab4c6 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.206.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.207.0" />
     <PackageReference Include="Sentry" Version="2.0.1" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 8e359970a1..3ed25360c5 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -74,7 +74,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.206.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.207.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
@@ -82,7 +82,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.206.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.207.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From f63bf0637305ecdd866dfa9667a8dfa6442c80c9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Feb 2020 16:09:54 +0900
Subject: [PATCH 0312/1142] Fix incorrect distance snap grid being displayed
 when in selection mode

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 0014360d24..afe5d2b93b 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -174,7 +174,7 @@ namespace osu.Game.Rulesets.Edit
         {
             base.Update();
 
-            if (EditorClock.CurrentTime != lastGridUpdateTime && blueprintContainer.CurrentTool != null)
+            if (EditorClock.CurrentTime != lastGridUpdateTime && !(blueprintContainer.CurrentTool is SelectTool))
                 showGridFor(Enumerable.Empty<HitObject>());
         }
 
@@ -328,7 +328,7 @@ namespace osu.Game.Rulesets.Edit
         /// Creates the <see cref="DistanceSnapGrid"/> applicable for a <see cref="HitObject"/> selection.
         /// </summary>
         /// <param name="selectedHitObjects">The <see cref="HitObject"/> selection.</param>
-        /// <returns>The <see cref="DistanceSnapGrid"/> for <paramref name="selectedHitObjects"/>.</returns>
+        /// <returns>The <see cref="DistanceSnapGrid"/> for <paramref name="selectedHitObjects"/>. If empty, a grid is returned for the current poitn in time.</returns>
         [CanBeNull]
         protected virtual DistanceSnapGrid CreateDistanceSnapGrid([NotNull] IEnumerable<HitObject> selectedHitObjects) => null;
 

From 3aa18abd99b492cd6b01aa1d777ed5559134dbe9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Feb 2020 16:22:59 +0900
Subject: [PATCH 0313/1142] Fix typo in xmldoc

Co-Authored-By: Tree <thewildtree@outlook.com>
---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index afe5d2b93b..6c81d70190 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -328,7 +328,7 @@ namespace osu.Game.Rulesets.Edit
         /// Creates the <see cref="DistanceSnapGrid"/> applicable for a <see cref="HitObject"/> selection.
         /// </summary>
         /// <param name="selectedHitObjects">The <see cref="HitObject"/> selection.</param>
-        /// <returns>The <see cref="DistanceSnapGrid"/> for <paramref name="selectedHitObjects"/>. If empty, a grid is returned for the current poitn in time.</returns>
+        /// <returns>The <see cref="DistanceSnapGrid"/> for <paramref name="selectedHitObjects"/>. If empty, a grid is returned for the current point in time.</returns>
         [CanBeNull]
         protected virtual DistanceSnapGrid CreateDistanceSnapGrid([NotNull] IEnumerable<HitObject> selectedHitObjects) => null;
 

From 9997ae17bc17dc45cd790e151c416786a727f6e6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Feb 2020 16:42:56 +0900
Subject: [PATCH 0314/1142] Fix editor test scene exiting after loading

---
 osu.Game/Tests/Visual/EditorTestScene.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Tests/Visual/EditorTestScene.cs b/osu.Game/Tests/Visual/EditorTestScene.cs
index 75bbb3e110..80bc3bdb87 100644
--- a/osu.Game/Tests/Visual/EditorTestScene.cs
+++ b/osu.Game/Tests/Visual/EditorTestScene.cs
@@ -24,8 +24,13 @@ namespace osu.Game.Tests.Visual
         private void load()
         {
             Beatmap.Value = CreateWorkingBeatmap(ruleset.RulesetInfo);
+        }
 
-            LoadScreen(new Editor());
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+
+            AddStep("Load editor", () => LoadScreen(new Editor()));
         }
     }
 }

From 89901523159eaa8cbc01f473cb7e6142fed6a8ee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Feb 2020 16:43:50 +0900
Subject: [PATCH 0315/1142] Fix duration snapping still being incorrect

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 0014360d24..1312122cf4 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -289,7 +289,11 @@ namespace osu.Game.Rulesets.Edit
             => beatSnapProvider.SnapTime(referenceTime + DistanceToDuration(referenceTime, distance), referenceTime) - referenceTime;
 
         public override float GetSnappedDistanceFromDistance(double referenceTime, float distance)
-            => DurationToDistance(referenceTime, beatSnapProvider.SnapTime(DistanceToDuration(referenceTime, distance), referenceTime));
+        {
+            var snappedEndTime = beatSnapProvider.SnapTime(referenceTime + DistanceToDuration(referenceTime, distance), referenceTime);
+
+            return DurationToDistance(referenceTime, snappedEndTime - referenceTime);
+        }
 
         public override void UpdateHitObject(HitObject hitObject) => EditorBeatmap.UpdateHitObject(hitObject);
 

From b7996f91fc0849f767a9251be2763f81fdca8e60 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Feb 2020 17:51:38 +0900
Subject: [PATCH 0316/1142] Update the windows platform offset to match stable

---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 9f46fddc5e..1c061c215b 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Screens.Play
 
             // Lazer's audio timings in general doesn't match stable. This is the result of user testing, albeit limited.
             // This only seems to be required on windows. We need to eventually figure out why, with a bit of luck.
-            platformOffsetClock = new FramedOffsetClock(adjustableClock) { Offset = RuntimeInfo.OS == RuntimeInfo.Platform.Windows ? 22 : 0 };
+            platformOffsetClock = new FramedOffsetClock(adjustableClock) { Offset = RuntimeInfo.OS == RuntimeInfo.Platform.Windows ? 15 : 0 };
 
             // the final usable gameplay clock with user-set offsets applied.
             userOffsetClock = new FramedOffsetClock(platformOffsetClock);

From e31d69c7497b666aec2b3f982cd4d18a10df1e89 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Feb 2020 18:02:48 +0900
Subject: [PATCH 0317/1142] Add commit status to EndPlacement; call
 BeginPlacement on initial movement

---
 .../Edit/Blueprints/ManiaPlacementBlueprint.cs           | 2 +-
 .../Blueprints/HitCircles/HitCirclePlacementBlueprint.cs | 3 ++-
 .../Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs  | 3 ++-
 .../Blueprints/Spinners/SpinnerPlacementBlueprint.cs     | 2 +-
 osu.Game/Rulesets/Edit/HitObjectComposer.cs              | 9 ++++++---
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs             | 5 +++--
 .../Edit/Compose/Components/ComposeBlueprintContainer.cs | 2 ++
 osu.Game/Screens/Edit/Compose/IPlacementHandler.cs       | 3 ++-
 osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs     | 5 +++--
 9 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index 7a3b42914e..362d6d40a8 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
         protected override void OnMouseUp(MouseUpEvent e)
         {
-            EndPlacement();
+            EndPlacement(true);
             base.OnMouseUp(e);
         }
 
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
index bb47c7e464..407f5f540e 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/HitCircles/HitCirclePlacementBlueprint.cs
@@ -30,12 +30,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.HitCircles
 
         protected override bool OnClick(ClickEvent e)
         {
-            EndPlacement();
+            EndPlacement(true);
             return true;
         }
 
         public override void UpdatePosition(Vector2 screenSpacePosition)
         {
+            BeginPlacement();
             HitObject.Position = ToLocalSpace(screenSpacePosition);
         }
     }
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 90512849d4..75d05b9b6c 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -68,6 +68,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
             switch (state)
             {
                 case PlacementState.Initial:
+                    BeginPlacement();
                     HitObject.Position = ToLocalSpace(screenSpacePosition);
                     break;
 
@@ -132,7 +133,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
         private void endCurve()
         {
             updateSlider();
-            EndPlacement();
+            EndPlacement(true);
         }
 
         protected override void Update()
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs
index 5525b8936e..8dc3cb0855 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners
             if (isPlacingEnd)
             {
                 HitObject.EndTime = EditorClock.CurrentTime;
-                EndPlacement();
+                EndPlacement(true);
             }
             else
             {
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index e181e1f431..e3f2fa915a 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -254,11 +254,14 @@ namespace osu.Game.Rulesets.Edit
                 hitObject.StartTime = GetSnappedPosition(distanceSnapGrid.ToLocalSpace(inputManager.CurrentState.Mouse.Position), hitObject.StartTime).time;
         }
 
-        public void EndPlacement(HitObject hitObject)
+        public void EndPlacement(HitObject hitObject, bool commit)
         {
-            EditorBeatmap.Add(hitObject);
+            if (commit)
+            {
+                EditorBeatmap.Add(hitObject);
 
-            adjustableClock.Seek(hitObject.StartTime);
+                adjustableClock.Seek(hitObject.StartTime);
+            }
 
             showGridFor(Enumerable.Empty<HitObject>());
         }
diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index 07283d2245..24fa96e1c5 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -103,11 +103,12 @@ namespace osu.Game.Rulesets.Edit
         /// Signals that the placement of <see cref="HitObject"/> has finished.
         /// This will destroy this <see cref="PlacementBlueprint"/>, and add the <see cref="HitObject"/> to the <see cref="Beatmap"/>.
         /// </summary>
-        protected void EndPlacement()
+        /// <param name="commit">Whether the object should be committed.</param>
+        public void EndPlacement(bool commit)
         {
             if (!PlacementBegun)
                 BeginPlacement();
-            placementHandler.EndPlacement(HitObject);
+            placementHandler.EndPlacement(HitObject, commit);
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 3c41dead5d..b257688568 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -63,6 +63,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private void refreshTool()
         {
             placementBlueprintContainer.Clear();
+
+            currentPlacement?.EndPlacement(false);
             currentPlacement = null;
 
             var blueprint = CurrentTool?.CreatePlacementBlueprint();
diff --git a/osu.Game/Screens/Edit/Compose/IPlacementHandler.cs b/osu.Game/Screens/Edit/Compose/IPlacementHandler.cs
index 47a4277430..aefcbc6542 100644
--- a/osu.Game/Screens/Edit/Compose/IPlacementHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/IPlacementHandler.cs
@@ -17,7 +17,8 @@ namespace osu.Game.Screens.Edit.Compose
         /// Notifies that a placement has finished.
         /// </summary>
         /// <param name="hitObject">The <see cref="HitObject"/> that has been placed.</param>
-        void EndPlacement(HitObject hitObject);
+        /// <param name="commit">Whether the object should be committed.</param>
+        void EndPlacement(HitObject hitObject, bool commit);
 
         /// <summary>
         /// Deletes a <see cref="HitObject"/>.
diff --git a/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs b/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs
index 0688620b8e..ce95dfa62f 100644
--- a/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs
+++ b/osu.Game/Tests/Visual/PlacementBlueprintTestScene.cs
@@ -53,9 +53,10 @@ namespace osu.Game.Tests.Visual
         {
         }
 
-        public void EndPlacement(HitObject hitObject)
+        public void EndPlacement(HitObject hitObject, bool commit)
         {
-            AddHitObject(CreateHitObject(hitObject));
+            if (commit)
+                AddHitObject(CreateHitObject(hitObject));
 
             Remove(currentBlueprint);
             Add(currentBlueprint = CreateBlueprint());

From e08437c5dc34ec3bec18e81d5556e83c1fb56727 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Feb 2020 18:03:14 +0900
Subject: [PATCH 0318/1142] Track placement object in EditorBeatmap

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs |  4 ++++
 osu.Game/Screens/Edit/EditorBeatmap.cs      | 10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index e3f2fa915a..d946b2eb7f 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -250,12 +250,16 @@ namespace osu.Game.Rulesets.Edit
 
         public void BeginPlacement(HitObject hitObject)
         {
+            EditorBeatmap.PlacementObject.Value = hitObject;
+
             if (distanceSnapGrid != null)
                 hitObject.StartTime = GetSnappedPosition(distanceSnapGrid.ToLocalSpace(inputManager.CurrentState.Mouse.Position), hitObject.StartTime).time;
         }
 
         public void EndPlacement(HitObject hitObject, bool commit)
         {
+            EditorBeatmap.PlacementObject.Value = null;
+
             if (commit)
             {
                 EditorBeatmap.Add(hitObject);
diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index cacb539891..e1f3ddf191 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -33,7 +33,15 @@ namespace osu.Game.Screens.Edit
         /// </summary>
         public event Action<HitObject> StartTimeChanged;
 
-        public BindableList<HitObject> SelectedHitObjects { get; } = new BindableList<HitObject>();
+        /// <summary>
+        /// All currently selected <see cref="HitObject"/>s.
+        /// </summary>
+        public readonly BindableList<HitObject> SelectedHitObjects = new BindableList<HitObject>();
+
+        /// <summary>
+        /// The current placement
+        /// </summary>
+        public readonly Bindable<HitObject> PlacementObject = new Bindable<HitObject>();
 
         public readonly IBeatmap PlayableBeatmap;
 

From 56a091674b31fbe80d9ff08b704cfe8cd2fd7850 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Feb 2020 18:04:10 +0900
Subject: [PATCH 0319/1142] Add placement display to timeline

---
 .../Compose/Components/BlueprintContainer.cs  | 24 +++++++-------
 .../Timeline/TimelineBlueprintContainer.cs    | 31 +++++++++++++++++++
 2 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 675b2b648d..55b2b801e7 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected DragBox DragBox { get; private set; }
 
-        private Container<SelectionBlueprint> selectionBlueprints;
+        protected Container<SelectionBlueprint> SelectionBlueprints;
 
         private SelectionHandler selectionHandler;
 
@@ -62,7 +62,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 DragBox = CreateDragBox(select),
                 selectionHandler,
-                selectionBlueprints = CreateSelectionBlueprintContainer(),
+                SelectionBlueprints = CreateSelectionBlueprintContainer(),
                 DragBox.CreateProxy().With(p => p.Depth = float.MinValue)
             });
 
@@ -73,7 +73,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             selectedHitObjects.ItemsAdded += objects =>
             {
                 foreach (var o in objects)
-                    selectionBlueprints.FirstOrDefault(b => b.HitObject == o)?.Select();
+                    SelectionBlueprints.FirstOrDefault(b => b.HitObject == o)?.Select();
 
                 SelectionChanged?.Invoke(selectedHitObjects);
             };
@@ -81,7 +81,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             selectedHitObjects.ItemsRemoved += objects =>
             {
                 foreach (var o in objects)
-                    selectionBlueprints.FirstOrDefault(b => b.HitObject == o)?.Deselect();
+                    SelectionBlueprints.FirstOrDefault(b => b.HitObject == o)?.Deselect();
 
                 SelectionChanged?.Invoke(selectedHitObjects);
             };
@@ -230,7 +230,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         private void removeBlueprintFor(HitObject hitObject)
         {
-            var blueprint = selectionBlueprints.SingleOrDefault(m => m.HitObject == hitObject);
+            var blueprint = SelectionBlueprints.SingleOrDefault(m => m.HitObject == hitObject);
             if (blueprint == null)
                 return;
 
@@ -239,7 +239,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             blueprint.Selected -= onBlueprintSelected;
             blueprint.Deselected -= onBlueprintDeselected;
 
-            selectionBlueprints.Remove(blueprint);
+            SelectionBlueprints.Remove(blueprint);
         }
 
         protected virtual void AddBlueprintFor(HitObject hitObject)
@@ -251,7 +251,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             blueprint.Selected += onBlueprintSelected;
             blueprint.Deselected += onBlueprintDeselected;
 
-            selectionBlueprints.Add(blueprint);
+            SelectionBlueprints.Add(blueprint);
         }
 
         #endregion
@@ -278,7 +278,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             if (!allowDeselection && selectionHandler.SelectedBlueprints.Any(s => s.IsHovered))
                 return;
 
-            foreach (SelectionBlueprint blueprint in selectionBlueprints.AliveChildren)
+            foreach (SelectionBlueprint blueprint in SelectionBlueprints.AliveChildren)
             {
                 if (blueprint.IsHovered)
                 {
@@ -308,7 +308,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// <param name="rect">The rectangle to perform a selection on in screen-space coordinates.</param>
         private void select(RectangleF rect)
         {
-            foreach (var blueprint in selectionBlueprints)
+            foreach (var blueprint in SelectionBlueprints)
             {
                 if (blueprint.IsAlive && blueprint.IsPresent && rect.Contains(blueprint.SelectionPoint))
                     blueprint.Select();
@@ -322,7 +322,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         private void selectAll()
         {
-            selectionBlueprints.ToList().ForEach(m => m.Select());
+            SelectionBlueprints.ToList().ForEach(m => m.Select());
             selectionHandler.UpdateVisibility();
         }
 
@@ -334,14 +334,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
         private void onBlueprintSelected(SelectionBlueprint blueprint)
         {
             selectionHandler.HandleSelected(blueprint);
-            selectionBlueprints.ChangeChildDepth(blueprint, 1);
+            SelectionBlueprints.ChangeChildDepth(blueprint, 1);
             beatmap.SelectedHitObjects.Add(blueprint.HitObject);
         }
 
         private void onBlueprintDeselected(SelectionBlueprint blueprint)
         {
             selectionHandler.HandleDeselected(blueprint);
-            selectionBlueprints.ChangeChildDepth(blueprint, 0);
+            SelectionBlueprints.ChangeChildDepth(blueprint, 0);
             beatmap.SelectedHitObjects.Remove(blueprint.HitObject);
         }
 
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
index 9f3d776e5c..84328466c3 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs
@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
@@ -21,8 +22,15 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [Resolved(CanBeNull = true)]
         private Timeline timeline { get; set; }
 
+        [Resolved]
+        private EditorBeatmap beatmap { get; set; }
+
         private DragEvent lastDragEvent;
 
+        private Bindable<HitObject> placement;
+
+        private SelectionBlueprint placementBlueprint;
+
         public TimelineBlueprintContainer()
         {
             RelativeSizeAxes = Axes.Both;
@@ -43,6 +51,29 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         {
             base.LoadComplete();
             DragBox.Alpha = 0;
+
+            placement = beatmap.PlacementObject.GetBoundCopy();
+            placement.ValueChanged += placementChanged;
+        }
+
+        private void placementChanged(ValueChangedEvent<HitObject> obj)
+        {
+            if (obj.NewValue == null)
+            {
+                if (placementBlueprint != null)
+                {
+                    SelectionBlueprints.Remove(placementBlueprint);
+                    placementBlueprint = null;
+                }
+            }
+            else
+            {
+                placementBlueprint = CreateBlueprintFor(obj.NewValue);
+
+                placementBlueprint.Colour = Color4.MediumPurple;
+
+                SelectionBlueprints.Add(placementBlueprint);
+            }
         }
 
         protected override Container<SelectionBlueprint> CreateSelectionBlueprintContainer() => new TimelineSelectionBlueprintContainer { RelativeSizeAxes = Axes.Both };

From 881d192af3ecdc9cc9f950bd4e607b70bb3c969d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 7 Feb 2020 12:07:16 +0300
Subject: [PATCH 0320/1142] Fix crash when selecting spotlight tab with
 not-null country

---
 osu.Game/Overlays/RankingsOverlay.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index 4fc94420a4..a0aeff082e 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -110,7 +110,8 @@ namespace osu.Game.Overlays
                 if (Country.Value != null)
                     Scope.Value = RankingsScope.Performance;
 
-                Scheduler.AddOnce(loadNewContent);
+                if (Scope.Value != RankingsScope.Spotlights)
+                    Scheduler.AddOnce(loadNewContent);
             }, true);
 
             Scope.BindValueChanged(_ =>

From 2082948f9a4f1ee2573e4217b78068f561da0766 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Feb 2020 18:23:59 +0900
Subject: [PATCH 0321/1142] Make editor screens display below timeline

---
 .../Screens/Edit/EditorScreenWithTimeline.cs  | 86 +++++++++----------
 1 file changed, 40 insertions(+), 46 deletions(-)

diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
index 7ee1005add..e9ff0b5598 100644
--- a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
+++ b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -18,6 +18,8 @@ namespace osu.Game.Screens.Edit
         private const float vertical_margins = 10;
         private const float horizontal_margins = 20;
 
+        private const float timeline_height = 110;
+
         private readonly BindableBeatDivisor beatDivisor = new BindableBeatDivisor();
 
         private Container timelineContainer;
@@ -32,65 +34,57 @@ namespace osu.Game.Screens.Edit
 
             Children = new Drawable[]
             {
-                new GridContainer
+                mainContent = new Container
                 {
+                    Name = "Main content",
                     RelativeSizeAxes = Axes.Both,
-                    Content = new[]
+                    Padding = new MarginPadding
                     {
-                        new Drawable[]
+                        Horizontal = horizontal_margins,
+                        Top = vertical_margins + timeline_height,
+                        Bottom = vertical_margins
+                    },
+                },
+                new Container
+                {
+                    Name = "Timeline",
+                    RelativeSizeAxes = Axes.X,
+                    Height = timeline_height,
+                    Children = new Drawable[]
+                    {
+                        new Box
                         {
-                            new Container
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = Color4.Black.Opacity(0.5f)
+                        },
+                        new Container
+                        {
+                            Name = "Timeline content",
+                            RelativeSizeAxes = Axes.Both,
+                            Padding = new MarginPadding { Horizontal = horizontal_margins, Vertical = vertical_margins },
+                            Child = new GridContainer
                             {
-                                Name = "Timeline",
                                 RelativeSizeAxes = Axes.Both,
-                                Children = new Drawable[]
+                                Content = new[]
                                 {
-                                    new Box
+                                    new Drawable[]
                                     {
-                                        RelativeSizeAxes = Axes.Both,
-                                        Colour = Color4.Black.Opacity(0.5f)
-                                    },
-                                    new Container
-                                    {
-                                        Name = "Timeline content",
-                                        RelativeSizeAxes = Axes.Both,
-                                        Padding = new MarginPadding { Horizontal = horizontal_margins, Vertical = vertical_margins },
-                                        Child = new GridContainer
+                                        timelineContainer = new Container
                                         {
                                             RelativeSizeAxes = Axes.Both,
-                                            Content = new[]
-                                            {
-                                                new Drawable[]
-                                                {
-                                                    timelineContainer = new Container
-                                                    {
-                                                        RelativeSizeAxes = Axes.Both,
-                                                        Padding = new MarginPadding { Right = 5 },
-                                                    },
-                                                    new BeatDivisorControl(beatDivisor) { RelativeSizeAxes = Axes.Both }
-                                                },
-                                            },
-                                            ColumnDimensions = new[]
-                                            {
-                                                new Dimension(),
-                                                new Dimension(GridSizeMode.Absolute, 90),
-                                            }
+                                            Padding = new MarginPadding { Right = 5 },
                                         },
-                                    }
+                                        new BeatDivisorControl(beatDivisor) { RelativeSizeAxes = Axes.Both }
+                                    },
+                                },
+                                ColumnDimensions = new[]
+                                {
+                                    new Dimension(),
+                                    new Dimension(GridSizeMode.Absolute, 90),
                                 }
-                            }
-                        },
-                        new Drawable[]
-                        {
-                            mainContent = new Container
-                            {
-                                Name = "Main content",
-                                RelativeSizeAxes = Axes.Both,
-                                Padding = new MarginPadding { Horizontal = horizontal_margins, Vertical = vertical_margins },
-                            }
+                            },
                         }
-                    },
-                    RowDimensions = new[] { new Dimension(GridSizeMode.Absolute, 110) }
+                    }
                 },
             };
 

From 6297606baaec8865d2201647746bb379c0e37ac9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Feb 2020 19:08:37 +0900
Subject: [PATCH 0322/1142] Make sMake spinner's EndTime correct on
 construction

---
 osu.Game.Rulesets.Osu/Objects/Spinner.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Spinner.cs b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
index 2441a1449d..0b8d03d118 100644
--- a/osu.Game.Rulesets.Osu/Objects/Spinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Spinner.cs
@@ -13,8 +13,13 @@ namespace osu.Game.Rulesets.Osu.Objects
 {
     public class Spinner : OsuHitObject, IHasEndTime
     {
-        public double EndTime { get; set; }
-        public double Duration => EndTime - StartTime;
+        public double EndTime
+        {
+            get => StartTime + Duration;
+            set => Duration = value - StartTime;
+        }
+
+        public double Duration { get; set; }
 
         /// <summary>
         /// Number of spins required to finish the spinner without miss.

From a6531bf73e06504636f38d336aa397669cc41069 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Feb 2020 19:08:49 +0900
Subject: [PATCH 0323/1142] Don't show distance snap grid for spinners (for
 now)

---
 osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs |  6 ++++++
 osu.Game/Rulesets/Edit/HitObjectComposer.cs        | 11 ++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
index b01488e7c2..cdf78a5902 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
@@ -36,6 +36,9 @@ namespace osu.Game.Rulesets.Osu.Edit
 
         protected override DistanceSnapGrid CreateDistanceSnapGrid(IEnumerable<HitObject> selectedHitObjects)
         {
+            if (BlueprintContainer.CurrentTool is SpinnerCompositionTool)
+                return null;
+
             var objects = selectedHitObjects.ToList();
 
             if (objects.Count == 0)
@@ -89,6 +92,9 @@ namespace osu.Game.Rulesets.Osu.Edit
                 targetIndex++;
             }
 
+            if (sourceObject is Spinner)
+                return null;
+
             return new OsuDistanceSnapGrid((OsuHitObject)sourceObject, (OsuHitObject)targetObject);
         }
     }
diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index e181e1f431..7b7c154191 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -49,8 +49,9 @@ namespace osu.Game.Rulesets.Edit
         [Resolved]
         private IBeatSnapProvider beatSnapProvider { get; set; }
 
+        protected ComposeBlueprintContainer BlueprintContainer;
+
         private DrawableEditRulesetWrapper<TObject> drawableRulesetWrapper;
-        private ComposeBlueprintContainer blueprintContainer;
         private Container distanceSnapGridContainer;
         private DistanceSnapGrid distanceSnapGrid;
         private readonly List<Container> layerContainers = new List<Container>();
@@ -94,7 +95,7 @@ namespace osu.Game.Rulesets.Edit
                 new EditorPlayfieldBorder { RelativeSizeAxes = Axes.Both }
             });
 
-            var layerAboveRuleset = drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer().WithChild(blueprintContainer = CreateBlueprintContainer());
+            var layerAboveRuleset = drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer().WithChild(BlueprintContainer = CreateBlueprintContainer());
 
             layerContainers.Add(layerBelowRuleset);
             layerContainers.Add(layerAboveRuleset);
@@ -142,7 +143,7 @@ namespace osu.Game.Rulesets.Edit
 
             setSelectTool();
 
-            blueprintContainer.SelectionChanged += selectionChanged;
+            BlueprintContainer.SelectionChanged += selectionChanged;
         }
 
         protected override bool OnKeyDown(KeyDownEvent e)
@@ -174,7 +175,7 @@ namespace osu.Game.Rulesets.Edit
         {
             base.Update();
 
-            if (EditorClock.CurrentTime != lastGridUpdateTime && !(blueprintContainer.CurrentTool is SelectTool))
+            if (EditorClock.CurrentTime != lastGridUpdateTime && !(BlueprintContainer.CurrentTool is SelectTool))
                 showGridFor(Enumerable.Empty<HitObject>());
         }
 
@@ -210,7 +211,7 @@ namespace osu.Game.Rulesets.Edit
 
         private void toolSelected(HitObjectCompositionTool tool)
         {
-            blueprintContainer.CurrentTool = tool;
+            BlueprintContainer.CurrentTool = tool;
 
             if (tool is SelectTool)
                 distanceSnapGridContainer.Hide();

From 830afe52096961bde1f33201f63e376c654811ce Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Feb 2020 19:09:47 +0900
Subject: [PATCH 0324/1142] Make spinner blueprint update values more
 frequently. Also handle right-click

---
 .../Spinners/SpinnerPlacementBlueprint.cs        | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs
index 5525b8936e..6d881d5f71 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs
@@ -1,13 +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 osu.Framework.Graphics;
+using System;
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners.Components;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.UI;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners
 {
@@ -29,22 +30,29 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners
         {
             base.Update();
 
+            if (isPlacingEnd)
+                HitObject.EndTime = Math.Max(HitObject.StartTime, EditorClock.CurrentTime);
+
             piece.UpdateFrom(HitObject);
         }
 
-        protected override bool OnClick(ClickEvent e)
+        protected override bool OnMouseDown(MouseDownEvent e)
         {
             if (isPlacingEnd)
             {
+                if (e.Button != MouseButton.Right)
+                    return false;
+
                 HitObject.EndTime = EditorClock.CurrentTime;
                 EndPlacement();
             }
             else
             {
-                isPlacingEnd = true;
-                piece.FadeTo(1f, 150, Easing.OutQuint);
+                if (e.Button != MouseButton.Left)
+                    return false;
 
                 BeginPlacement();
+                isPlacingEnd = true;
             }
 
             return true;

From 2e50e56d7c63ab3484bbe0612e94a8edc29315ef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 7 Feb 2020 19:12:09 +0900
Subject: [PATCH 0325/1142] Seek to previous object endtime after successful
 placement

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index d946b2eb7f..df3a1384bb 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -264,7 +264,7 @@ namespace osu.Game.Rulesets.Edit
             {
                 EditorBeatmap.Add(hitObject);
 
-                adjustableClock.Seek(hitObject.StartTime);
+                adjustableClock.Seek(hitObject.GetEndTime());
             }
 
             showGridFor(Enumerable.Empty<HitObject>());

From 2d1afb66fb2d9c86b7bae7b930ee65710fe5508b Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 7 Feb 2020 16:21:47 +0300
Subject: [PATCH 0326/1142] Add history counts to user api

---
 osu.Game/Users/User.cs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 5d0ffd5a67..c573fdd089 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -203,6 +203,21 @@ namespace osu.Game.Users
             public int ID;
         }
 
+        [JsonProperty("monthly_playcounts")]
+        public UserHistoryCount[] MonthlyPlaycounts;
+
+        [JsonProperty("replays_watched_counts")]
+        public UserHistoryCount[] ReplaysWatchedCounts;
+
+        public class UserHistoryCount
+        {
+            [JsonProperty("start_date")]
+            public DateTime Date;
+
+            [JsonProperty("count")]
+            public long Count;
+        }
+
         public override string ToString() => Username;
 
         /// <summary>

From 678eb8ec3128a3ef0dd839b852041c72bd0947ee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 8 Feb 2020 00:12:23 +0900
Subject: [PATCH 0327/1142] Reduce accessibility to set

Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>
---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index 7b7c154191..f6c73d5e4c 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Edit
         [Resolved]
         private IBeatSnapProvider beatSnapProvider { get; set; }
 
-        protected ComposeBlueprintContainer BlueprintContainer;
+        protected ComposeBlueprintContainer BlueprintContainer { get; private set; }
 
         private DrawableEditRulesetWrapper<TObject> drawableRulesetWrapper;
         private Container distanceSnapGridContainer;

From 51edd8827772898e6e5ece224e4507cdeb182dac Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sat, 8 Feb 2020 00:28:52 +0900
Subject: [PATCH 0328/1142] Add back fade

---
 .../Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs
index 6d881d5f71..48c1ce11e0 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners.Components;
@@ -52,6 +53,8 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners
                     return false;
 
                 BeginPlacement();
+                piece.FadeTo(1f, 150, Easing.OutQuint);
+
                 isPlacingEnd = true;
             }
 

From 7395f01919a6710fda4127676b6482e06d882676 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Fri, 7 Feb 2020 20:28:02 +0100
Subject: [PATCH 0329/1142] Use osu-web font sizes

---
 osu.Game/Overlays/BeatmapSet/Header.cs                     | 2 +-
 osu.Game/Overlays/BeatmapSet/Info.cs                       | 2 +-
 osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs          | 4 ++--
 osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index 1b111ced1f..ab7b2d82ed 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -196,7 +196,7 @@ namespace osu.Game.Overlays.BeatmapSet
                                     {
                                         Anchor = Anchor.TopRight,
                                         Origin = Anchor.TopRight,
-                                        TextSize = 17,
+                                        TextSize = 14,
                                         TextPadding = new MarginPadding { Horizontal = 35, Vertical = 10 }
                                     },
                                     Details = new Details(),
diff --git a/osu.Game/Overlays/BeatmapSet/Info.cs b/osu.Game/Overlays/BeatmapSet/Info.cs
index a71409a05f..0a5415124e 100644
--- a/osu.Game/Overlays/BeatmapSet/Info.cs
+++ b/osu.Game/Overlays/BeatmapSet/Info.cs
@@ -118,7 +118,7 @@ namespace osu.Game.Overlays.BeatmapSet
                                     Origin = Anchor.Centre,
                                     Alpha = 0,
                                     Text = "Unranked beatmap",
-                                    Font = OsuFont.GetFont(size: 13)
+                                    Font = OsuFont.GetFont(size: 12)
                                 },
                             },
                         },
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 2310b2a0f5..7f55aecaf0 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
     {
         private const float horizontal_inset = 20;
         private const float row_height = 25;
-        private const int text_size = 14;
+        private const int text_size = 12;
 
         private readonly FillFlowContainer backgroundFlow;
 
@@ -190,7 +190,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             public HeaderText(string text)
             {
                 Text = text.ToUpper();
-                Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold);
+                Font = OsuFont.GetFont(size: 10, weight: FontWeight.Bold);
             }
 
             [BackgroundDependencyLoader]
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
index 00171e1170..8a368aa535 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
@@ -96,7 +96,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                             {
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.CentreLeft,
-                                Font = OsuFont.GetFont(size: 12)
+                                Font = OsuFont.GetFont(size: 10)
                             },
                             flag = new UpdateableFlag
                             {

From 59cf2037d062b7af68e7ea912a5a5715d1016d5a Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Fri, 7 Feb 2020 21:11:58 +0100
Subject: [PATCH 0330/1142] Introduce SortedStatistics

---
 osu.Game/Scoring/ScoreInfo.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Scoring/ScoreInfo.cs b/osu.Game/Scoring/ScoreInfo.cs
index bed9104cad..a40f436a6e 100644
--- a/osu.Game/Scoring/ScoreInfo.cs
+++ b/osu.Game/Scoring/ScoreInfo.cs
@@ -151,6 +151,8 @@ namespace osu.Game.Scoring
         [JsonProperty("statistics")]
         public Dictionary<HitResult, int> Statistics = new Dictionary<HitResult, int>();
 
+        public IOrderedEnumerable<KeyValuePair<HitResult, int>> SortedStatistics => Statistics.OrderByDescending(pair => pair.Key);
+
         [JsonIgnore]
         [Column("Statistics")]
         public string StatisticsJson

From 2770fb71b251fa315be1af4a83b1993ba5838e55 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Fri, 7 Feb 2020 21:12:21 +0100
Subject: [PATCH 0331/1142] Use SortedStatistics where needed

---
 osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs             | 4 ++--
 .../Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs   | 4 +---
 osu.Game/Screens/Ranking/Pages/ScoreResultsPage.cs            | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 7a17412722..758140a12d 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 new TableColumn("max combo", Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed, minSize: 70, maxSize: 90))
             };
 
-            foreach (var statistic in score.Statistics)
+            foreach (var statistic in score.SortedStatistics)
                 columns.Add(new TableColumn(statistic.Key.GetDescription(), Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed, minSize: 50, maxSize: 70)));
 
             columns.AddRange(new[]
@@ -150,7 +150,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 }
             });
 
-            foreach (var kvp in score.Statistics)
+            foreach (var kvp in score.SortedStatistics)
             {
                 content.Add(new OsuSpriteText
                 {
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index 8a17fef367..6c9f0b0321 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -99,9 +99,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 maxComboColumn.Text = $@"{value.MaxCombo:N0}x";
                 ppColumn.Text = $@"{value.PP:N0}";
 
-                statisticsColumns.ChildrenEnumerable = value.Statistics
-                                                            .OrderByDescending(pair => pair.Key)
-                                                            .Select(kvp => createStatisticsColumn(kvp.Key, kvp.Value));
+                statisticsColumns.ChildrenEnumerable = value.SortedStatistics.Select(kvp => createStatisticsColumn(kvp.Key, kvp.Value));
                 modsColumn.Mods = value.Mods;
             }
         }
diff --git a/osu.Game/Screens/Ranking/Pages/ScoreResultsPage.cs b/osu.Game/Screens/Ranking/Pages/ScoreResultsPage.cs
index 43234c0b29..0aab067de1 100644
--- a/osu.Game/Screens/Ranking/Pages/ScoreResultsPage.cs
+++ b/osu.Game/Screens/Ranking/Pages/ScoreResultsPage.cs
@@ -188,7 +188,7 @@ namespace osu.Game.Screens.Ranking.Pages
                 },
             };
 
-            statisticsContainer.ChildrenEnumerable = Score.Statistics.OrderByDescending(p => p.Key).Select(s => new DrawableScoreStatistic(s));
+            statisticsContainer.ChildrenEnumerable = Score.SortedStatistics.Select(s => new DrawableScoreStatistic(s));
         }
 
         protected override void LoadComplete()

From 1ba8cc904a5b72693bad9f5309be5f4ae5f095fd Mon Sep 17 00:00:00 2001
From: jorolf <jorolf@gmx.de>
Date: Fri, 7 Feb 2020 21:42:47 +0100
Subject: [PATCH 0332/1142] Make the caret blink to the beat

---
 osu.Game/Graphics/UserInterface/OsuTextBox.cs | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/osu.Game/Graphics/UserInterface/OsuTextBox.cs b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
index f5b7bc3073..36740fb015 100644
--- a/osu.Game/Graphics/UserInterface/OsuTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
@@ -9,6 +10,9 @@ using osu.Game.Graphics.Sprites;
 using osuTK.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Input.Events;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Graphics.Containers;
+using osuTK;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -59,5 +63,47 @@ namespace osu.Game.Graphics.UserInterface
         }
 
         protected override Drawable GetDrawableCharacter(char c) => new OsuSpriteText { Text = c.ToString(), Font = OsuFont.GetFont(size: CalculatedTextSize) };
+
+        protected override Caret CreateCaret() => new BeatCaret
+        {
+            CaretWidth = CaretWidth,
+            SelectionColour = SelectionColour,
+        };
+
+        private class BeatCaret : BasicCaret
+        {
+            private bool hasSelection;
+
+            public BeatCaret()
+            {
+                AddInternal(new CaretBeatSyncedContainer(this));
+            }
+
+            public override void DisplayAt(Vector2 position, float? selectionWidth)
+            {
+                base.DisplayAt(position, selectionWidth);
+
+                hasSelection = selectionWidth != null;
+                if (selectionWidth == null)
+                    ClearTransforms(targetMember: nameof(Alpha));
+            }
+
+            private class CaretBeatSyncedContainer : BeatSyncedContainer
+            {
+                private readonly BeatCaret caret;
+
+                public CaretBeatSyncedContainer(BeatCaret caret)
+                {
+                    this.caret = caret;
+                    MinimumBeatLength = 300;
+                }
+
+                protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
+                {
+                    if (!caret.hasSelection)
+                        caret.FadeTo(0.7f).FadeTo(0.4f, timingPoint.BeatLength, Easing.InOutSine);
+                }
+            }
+        }
     }
 }

From 8c10d31af947d8ace2265952bfa2bbbea62e2d43 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Fri, 7 Feb 2020 22:09:45 +0100
Subject: [PATCH 0333/1142] Make accuracy formatting more consistent

---
 osu.Game/Utils/FormatUtils.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Utils/FormatUtils.cs b/osu.Game/Utils/FormatUtils.cs
index b3758b3375..f2ab99f4b7 100644
--- a/osu.Game/Utils/FormatUtils.cs
+++ b/osu.Game/Utils/FormatUtils.cs
@@ -7,18 +7,16 @@ namespace osu.Game.Utils
     {
         /// <summary>
         /// Turns the provided accuracy into a percentage with 2 decimal places.
-        /// Omits all decimal places when <paramref name="accuracy"/> equals 1d.
         /// </summary>
         /// <param name="accuracy">The accuracy to be formatted</param>
         /// <returns>formatted accuracy in percentage</returns>
-        public static string FormatAccuracy(this double accuracy) => accuracy == 1 ? "100%" : $"{accuracy:0.00%}";
+        public static string FormatAccuracy(this double accuracy) => $"{accuracy:0.00%}";
 
         /// <summary>
         /// Turns the provided accuracy into a percentage with 2 decimal places.
-        /// Omits all decimal places when <paramref name="accuracy"/> equals 100m.
         /// </summary>
         /// <param name="accuracy">The accuracy to be formatted</param>
         /// <returns>formatted accuracy in percentage</returns>
-        public static string FormatAccuracy(this decimal accuracy) => accuracy == 100 ? "100%" : $"{accuracy:0.00}%";
+        public static string FormatAccuracy(this decimal accuracy) => $"{accuracy:0.00}%";
     }
 }

From 393b566966c5cd8d6be9b765ebd79e8e9280f1fd Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Fri, 7 Feb 2020 22:16:06 +0100
Subject: [PATCH 0334/1142] Make PercentageCounter use FormatAccuracy

---
 osu.Game/Graphics/UserInterface/PercentageCounter.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/PercentageCounter.cs b/osu.Game/Graphics/UserInterface/PercentageCounter.cs
index 064c663d59..940c9808ce 100644
--- a/osu.Game/Graphics/UserInterface/PercentageCounter.cs
+++ b/osu.Game/Graphics/UserInterface/PercentageCounter.cs
@@ -3,6 +3,7 @@
 
 using System;
 using osu.Framework.Allocation;
+using osu.Game.Utils;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -29,10 +30,7 @@ namespace osu.Game.Graphics.UserInterface
         [BackgroundDependencyLoader]
         private void load(OsuColour colours) => AccentColour = colours.BlueLighter;
 
-        protected override string FormatCount(double count)
-        {
-            return $@"{count:P2}";
-        }
+        protected override string FormatCount(double count) => count.FormatAccuracy();
 
         protected override double GetProportionalDuration(double currentValue, double newValue)
         {

From 9bfd3a1a6348e4f7be4ef305bfbec7b2d207f8ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 8 Feb 2020 00:11:19 +0100
Subject: [PATCH 0335/1142] Make PercentageBreakInfoLine use FormatAccuracy

---
 osu.Game/Screens/Play/Break/BreakInfoLine.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/Break/BreakInfoLine.cs b/osu.Game/Screens/Play/Break/BreakInfoLine.cs
index 70e7b8f297..18aab394f8 100644
--- a/osu.Game/Screens/Play/Break/BreakInfoLine.cs
+++ b/osu.Game/Screens/Play/Break/BreakInfoLine.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Utils;
 
 namespace osu.Game.Screens.Play.Break
 {
@@ -85,6 +86,6 @@ namespace osu.Game.Screens.Play.Break
         {
         }
 
-        protected override string Format(double count) => $@"{count:P2}";
+        protected override string Format(double count) => count.FormatAccuracy();
     }
 }

From 801e39a5433f12e385c61da0860a640d1d1a617f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 8 Feb 2020 11:35:27 +0900
Subject: [PATCH 0336/1142] Improve xmldoc for PlacementObject

---
 osu.Game/Screens/Edit/EditorBeatmap.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/EditorBeatmap.cs b/osu.Game/Screens/Edit/EditorBeatmap.cs
index e1f3ddf191..5216e85903 100644
--- a/osu.Game/Screens/Edit/EditorBeatmap.cs
+++ b/osu.Game/Screens/Edit/EditorBeatmap.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Screens.Edit
         public readonly BindableList<HitObject> SelectedHitObjects = new BindableList<HitObject>();
 
         /// <summary>
-        /// The current placement
+        /// The current placement. Null if there's no active placement.
         /// </summary>
         public readonly Bindable<HitObject> PlacementObject = new Bindable<HitObject>();
 

From e0de60a277c4f9792b889efc1bb44d39e0251f91 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Fri, 7 Feb 2020 21:03:33 -0800
Subject: [PATCH 0337/1142] Update default background dim to 80% to match
 stable

---
 osu.Game/Configuration/OsuConfigManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 4155381790..6ae3c7ac64 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Configuration
             Set(OsuSetting.MenuParallax, true);
 
             // Gameplay
-            Set(OsuSetting.DimLevel, 0.3, 0, 1, 0.01);
+            Set(OsuSetting.DimLevel, 0.8, 0, 1, 0.01);
             Set(OsuSetting.BlurLevel, 0, 0, 1, 0.01);
             Set(OsuSetting.LightenDuringBreaks, true);
 

From 6d51b344abfc6929f5029044dc01b10f8e9dc28d Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 19 Jan 2020 20:24:46 +0100
Subject: [PATCH 0338/1142] Display a loading animation when the user is
 connecting

---
 .../Online/TestSceneOnlineViewContainer.cs    |  4 ++
 osu.Game/Online/OnlineViewContainer.cs        | 57 ++++++++++++++-----
 2 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
index 4579e4f428..ddb672dbf4 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
@@ -57,6 +57,10 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("set status to online", () => ((DummyAPIAccess)API).State = APIState.Online);
 
             AddAssert("children are visible", () => onlineView.Children.First().Parent.IsPresent);
+
+            AddStep("set status to connecting", () => ((DummyAPIAccess)API).State = APIState.Connecting);
+
+            AddAssert("children are hidden", () => !onlineView.Children.First().Parent.IsPresent);
         }
     }
 }
diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
index 0a8432ee12..35296409e5 100644
--- a/osu.Game/Online/OnlineViewContainer.cs
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Online.Placeholders;
 
@@ -15,12 +16,13 @@ namespace osu.Game.Online
     /// </summary>
     public class OnlineViewContainer : Container, IOnlineComponent
     {
-        private readonly Container content;
         private readonly Container placeholderContainer;
         private readonly Placeholder placeholder;
+        private readonly LoadingAnimation loading;
 
         private const int transform_time = 300;
 
+        private readonly Container content;
         protected override Container<Drawable> Content => content;
 
         [Resolved]
@@ -40,6 +42,10 @@ namespace osu.Game.Online
                     Alpha = 0,
                     Child = placeholder = new LoginPlaceholder($@"Please sign in to {placeholderMessage}")
                 },
+                loading = new LoadingAnimation
+                {
+                    Alpha = 0,
+                }
             };
         }
 
@@ -47,29 +53,43 @@ namespace osu.Game.Online
         {
             switch (state)
             {
-                case APIState.Offline:
+                case APIState.Failing:
                 case APIState.Connecting:
-                    Schedule(() => updatePlaceholderVisibility(true));
+                    Schedule(() => UpdatePlaceholderVisibility(PlaceholderStatus.Connecting));
                     break;
 
-                default:
-                    Schedule(() => updatePlaceholderVisibility(false));
+                case APIState.Offline:
+                    Schedule(() => UpdatePlaceholderVisibility(PlaceholderStatus.Offline));
+                    break;
+
+                case APIState.Online:
+                    Schedule(() => UpdatePlaceholderVisibility(PlaceholderStatus.Online));
                     break;
             }
         }
 
-        private void updatePlaceholderVisibility(bool showPlaceholder)
+        protected void UpdatePlaceholderVisibility(PlaceholderStatus status)
         {
-            if (showPlaceholder)
+            switch (status)
             {
-                content.FadeOut(150, Easing.OutQuint);
-                placeholder.ScaleTo(0.8f).Then().ScaleTo(1, 3 * transform_time, Easing.OutQuint);
-                placeholderContainer.FadeInFromZero(2 * transform_time, Easing.OutQuint);
-            }
-            else
-            {
-                placeholderContainer.FadeOut(150, Easing.OutQuint);
-                content.FadeIn(transform_time, Easing.OutQuint);
+                case PlaceholderStatus.Offline:
+                    Content.FadeOut(150, Easing.OutQuint);
+                    placeholder.ScaleTo(0.8f).Then().ScaleTo(1, 3 * transform_time, Easing.OutQuint);
+                    placeholderContainer.FadeInFromZero(2 * transform_time, Easing.OutQuint);
+                    loading.Hide();
+                    break;
+
+                case PlaceholderStatus.Online:
+                    placeholderContainer.FadeOut(150, Easing.OutQuint);
+                    Content.FadeIn(transform_time, Easing.OutQuint);
+                    loading.Hide();
+                    break;
+
+                case PlaceholderStatus.Connecting:
+                    loading.Show();
+                    placeholderContainer.FadeOut(150, Easing.OutQuint);
+                    Content.FadeOut(150, Easing.OutQuint);
+                    break;
             }
         }
 
@@ -84,5 +104,12 @@ namespace osu.Game.Online
             API?.Unregister(this);
             base.Dispose(isDisposing);
         }
+
+        protected enum PlaceholderStatus
+        {
+            Offline,
+            Online,
+            Connecting,
+        }
     }
 }

From d3dc0b63ff9cc9715b5e46909e39ef76435d5007 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 23 Jan 2020 19:09:34 +0100
Subject: [PATCH 0339/1142] Remove string concatenation from ctor

---
 osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs | 2 +-
 osu.Game/Online/OnlineViewContainer.cs                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
index ddb672dbf4..fddb82d400 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Tests.Visual.Online
             Child = new Container
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = onlineView = new OnlineViewContainer(@"view dummy test content")
+                Child = onlineView = new OnlineViewContainer(@"Please sign in to view dummy test content")
                 {
                     RelativeSizeAxes = Axes.Both,
                     Children = new Drawable[]
diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
index 35296409e5..49174320d3 100644
--- a/osu.Game/Online/OnlineViewContainer.cs
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Online
                 {
                     RelativeSizeAxes = Axes.Both,
                     Alpha = 0,
-                    Child = placeholder = new LoginPlaceholder($@"Please sign in to {placeholderMessage}")
+                    Child = placeholder = new LoginPlaceholder(placeholderMessage)
                 },
                 loading = new LoadingAnimation
                 {

From 7ca9f4dc2091c56bd66b11365cbc2dfaa403e4df Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Fri, 24 Jan 2020 21:10:31 +0100
Subject: [PATCH 0340/1142] Apply review suggestions

---
 .../Online/TestSceneOnlineViewContainer.cs    | 85 ++++++++++++-------
 osu.Game/Online/OnlineViewContainer.cs        | 48 +++--------
 2 files changed, 66 insertions(+), 67 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
index fddb82d400..277146e4be 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
@@ -1,14 +1,13 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online;
 using osu.Game.Online.API;
 using osuTK.Graphics;
@@ -18,49 +17,75 @@ namespace osu.Game.Tests.Visual.Online
     [TestFixture]
     public class TestSceneOnlineViewContainer : OsuTestScene
     {
-        private readonly OnlineViewContainer onlineView;
+        private readonly TestOnlineViewContainer onlineView;
 
         public TestSceneOnlineViewContainer()
         {
             Child = new Container
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = onlineView = new OnlineViewContainer(@"Please sign in to view dummy test content")
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = Color4.Blue.Opacity(0.8f),
-                        },
-                        new OsuSpriteText
-                        {
-                            Text = "dummy online content",
-                            RelativeSizeAxes = Axes.Both,
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                        }
-                    }
-                }
+                Child = onlineView = new TestOnlineViewContainer()
             };
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        private class TestOnlineViewContainer : OnlineViewContainer
+        {
+            public new Container<Drawable> Content => base.Content;
+
+            public new LoadingAnimation LoadingAnimation => base.LoadingAnimation;
+
+            public TestOnlineViewContainer()
+                : base(@"Please sign in to view dummy test content")
+            {
+                RelativeSizeAxes = Axes.Both;
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.Blue.Opacity(0.8f),
+                    },
+                    new OsuSpriteText
+                    {
+                        Text = "dummy online content",
+                        RelativeSizeAxes = Axes.Both,
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    }
+                };
+            }
+        }
+
+        [Test]
+        public void TestOnlineStateVisibility()
+        {
+            AddStep("set status to online", () => ((DummyAPIAccess)API).State = APIState.Online);
+
+            AddAssert("children are visible", () => onlineView.Content.IsPresent);
+            AddAssert("loading animation is not visible", () => !onlineView.LoadingAnimation.IsPresent);
+        }
+
+        [Test]
+        public void TestOfflineStateVisibility()
         {
             AddStep("set status to offline", () => ((DummyAPIAccess)API).State = APIState.Offline);
 
-            AddAssert("children are hidden", () => !onlineView.Children.First().Parent.IsPresent);
-
-            AddStep("set status to online", () => ((DummyAPIAccess)API).State = APIState.Online);
-
-            AddAssert("children are visible", () => onlineView.Children.First().Parent.IsPresent);
+            AddAssert("children are hidden", () => !onlineView.Content.IsPresent);
+            AddAssert("loading animation is not visible", () => !onlineView.LoadingAnimation.IsPresent);
+        }
 
+        [Test]
+        public void TestConnectingStateVisibility()
+        {
             AddStep("set status to connecting", () => ((DummyAPIAccess)API).State = APIState.Connecting);
 
-            AddAssert("children are hidden", () => !onlineView.Children.First().Parent.IsPresent);
+            AddAssert("children are hidden", () => !onlineView.Content.IsPresent);
+            AddAssert("loading animation is visible", () => onlineView.LoadingAnimation.IsPresent);
+
+            AddStep("set status to failing", () => ((DummyAPIAccess)API).State = APIState.Failing);
+
+            AddAssert("children are hidden", () => !onlineView.Content.IsPresent);
+            AddAssert("loading animation is visible", () => onlineView.LoadingAnimation.IsPresent);
         }
     }
 }
diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
index 49174320d3..7874a9fcaf 100644
--- a/osu.Game/Online/OnlineViewContainer.cs
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -14,16 +14,15 @@ namespace osu.Game.Online
     /// A <see cref="Container"/> for dislaying online content who require a local user to be logged in.
     /// Shows its children only when the local user is logged in and supports displaying a placeholder if not.
     /// </summary>
-    public class OnlineViewContainer : Container, IOnlineComponent
+    public abstract class OnlineViewContainer : Container, IOnlineComponent
     {
         private readonly Container placeholderContainer;
         private readonly Placeholder placeholder;
-        private readonly LoadingAnimation loading;
+        protected readonly LoadingAnimation LoadingAnimation;
 
         private const int transform_time = 300;
 
-        private readonly Container content;
-        protected override Container<Drawable> Content => content;
+        protected override Container<Drawable> Content { get; }
 
         [Resolved]
         protected IAPIProvider API { get; private set; }
@@ -32,7 +31,7 @@ namespace osu.Game.Online
         {
             InternalChildren = new Drawable[]
             {
-                content = new Container
+                Content = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
                 },
@@ -42,7 +41,7 @@ namespace osu.Game.Online
                     Alpha = 0,
                     Child = placeholder = new LoginPlaceholder(placeholderMessage)
                 },
-                loading = new LoadingAnimation
+                LoadingAnimation = new LoadingAnimation
                 {
                     Alpha = 0,
                 }
@@ -53,40 +52,22 @@ namespace osu.Game.Online
         {
             switch (state)
             {
-                case APIState.Failing:
-                case APIState.Connecting:
-                    Schedule(() => UpdatePlaceholderVisibility(PlaceholderStatus.Connecting));
-                    break;
-
                 case APIState.Offline:
-                    Schedule(() => UpdatePlaceholderVisibility(PlaceholderStatus.Offline));
-                    break;
-
-                case APIState.Online:
-                    Schedule(() => UpdatePlaceholderVisibility(PlaceholderStatus.Online));
-                    break;
-            }
-        }
-
-        protected void UpdatePlaceholderVisibility(PlaceholderStatus status)
-        {
-            switch (status)
-            {
-                case PlaceholderStatus.Offline:
                     Content.FadeOut(150, Easing.OutQuint);
                     placeholder.ScaleTo(0.8f).Then().ScaleTo(1, 3 * transform_time, Easing.OutQuint);
                     placeholderContainer.FadeInFromZero(2 * transform_time, Easing.OutQuint);
-                    loading.Hide();
+                    LoadingAnimation.Hide();
                     break;
 
-                case PlaceholderStatus.Online:
+                case APIState.Online:
                     placeholderContainer.FadeOut(150, Easing.OutQuint);
                     Content.FadeIn(transform_time, Easing.OutQuint);
-                    loading.Hide();
+                    LoadingAnimation.Hide();
                     break;
 
-                case PlaceholderStatus.Connecting:
-                    loading.Show();
+                case APIState.Failing:
+                case APIState.Connecting:
+                    LoadingAnimation.Show();
                     placeholderContainer.FadeOut(150, Easing.OutQuint);
                     Content.FadeOut(150, Easing.OutQuint);
                     break;
@@ -104,12 +85,5 @@ namespace osu.Game.Online
             API?.Unregister(this);
             base.Dispose(isDisposing);
         }
-
-        protected enum PlaceholderStatus
-        {
-            Offline,
-            Online,
-            Connecting,
-        }
     }
 }

From 30e0a34e50d083af8726aaaff54fde5c3133f4b0 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Wed, 5 Feb 2020 15:04:10 +0100
Subject: [PATCH 0341/1142] Wrap Content into a container for animating
 visibility.

---
 .../Online/TestSceneOnlineViewContainer.cs    | 14 ++++---
 osu.Game/Online/OnlineViewContainer.cs        | 39 ++++++++++---------
 2 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
index 277146e4be..5427db5af3 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
@@ -30,8 +30,6 @@ namespace osu.Game.Tests.Visual.Online
 
         private class TestOnlineViewContainer : OnlineViewContainer
         {
-            public new Container<Drawable> Content => base.Content;
-
             public new LoadingAnimation LoadingAnimation => base.LoadingAnimation;
 
             public TestOnlineViewContainer()
@@ -54,6 +52,10 @@ namespace osu.Game.Tests.Visual.Online
                     }
                 };
             }
+
+            protected override void FadeContentOut(Drawable content) => content.Hide();
+
+            protected override void FadeContentIn(Drawable content) => content.Show();
         }
 
         [Test]
@@ -61,7 +63,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddStep("set status to online", () => ((DummyAPIAccess)API).State = APIState.Online);
 
-            AddAssert("children are visible", () => onlineView.Content.IsPresent);
+            AddAssert("children are visible", () => onlineView.TransformationTarget.IsPresent);
             AddAssert("loading animation is not visible", () => !onlineView.LoadingAnimation.IsPresent);
         }
 
@@ -70,7 +72,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddStep("set status to offline", () => ((DummyAPIAccess)API).State = APIState.Offline);
 
-            AddAssert("children are hidden", () => !onlineView.Content.IsPresent);
+            AddAssert("children are hidden", () => !onlineView.TransformationTarget.IsPresent);
             AddAssert("loading animation is not visible", () => !onlineView.LoadingAnimation.IsPresent);
         }
 
@@ -79,12 +81,12 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddStep("set status to connecting", () => ((DummyAPIAccess)API).State = APIState.Connecting);
 
-            AddAssert("children are hidden", () => !onlineView.Content.IsPresent);
+            AddAssert("children are hidden", () => !onlineView.TransformationTarget.IsPresent);
             AddAssert("loading animation is visible", () => onlineView.LoadingAnimation.IsPresent);
 
             AddStep("set status to failing", () => ((DummyAPIAccess)API).State = APIState.Failing);
 
-            AddAssert("children are hidden", () => !onlineView.Content.IsPresent);
+            AddAssert("children are hidden", () => !onlineView.TransformationTarget.IsPresent);
             AddAssert("loading animation is visible", () => onlineView.LoadingAnimation.IsPresent);
         }
     }
diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
index 7874a9fcaf..ac5a7941ea 100644
--- a/osu.Game/Online/OnlineViewContainer.cs
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -11,36 +11,35 @@ using osu.Game.Online.Placeholders;
 namespace osu.Game.Online
 {
     /// <summary>
-    /// A <see cref="Container"/> for dislaying online content who require a local user to be logged in.
+    /// A <see cref="Container"/> for dislaying online content which require a local user to be logged in.
     /// Shows its children only when the local user is logged in and supports displaying a placeholder if not.
     /// </summary>
     public abstract class OnlineViewContainer : Container, IOnlineComponent
     {
-        private readonly Container placeholderContainer;
         private readonly Placeholder placeholder;
         protected readonly LoadingAnimation LoadingAnimation;
 
-        private const int transform_time = 300;
+        protected const double TRANSFORM_TIME = 300.0;
 
+        internal readonly Container TransformationTarget;
         protected override Container<Drawable> Content { get; }
 
         [Resolved]
         protected IAPIProvider API { get; private set; }
 
-        public OnlineViewContainer(string placeholderMessage)
+        protected OnlineViewContainer(string placeholderMessage)
         {
             InternalChildren = new Drawable[]
             {
-                Content = new Container
+                TransformationTarget = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
+                    Child = Content = new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                    }
                 },
-                placeholderContainer = new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Alpha = 0,
-                    Child = placeholder = new LoginPlaceholder(placeholderMessage)
-                },
+                placeholder = new LoginPlaceholder(placeholderMessage),
                 LoadingAnimation = new LoadingAnimation
                 {
                     Alpha = 0,
@@ -53,27 +52,31 @@ namespace osu.Game.Online
             switch (state)
             {
                 case APIState.Offline:
-                    Content.FadeOut(150, Easing.OutQuint);
-                    placeholder.ScaleTo(0.8f).Then().ScaleTo(1, 3 * transform_time, Easing.OutQuint);
-                    placeholderContainer.FadeInFromZero(2 * transform_time, Easing.OutQuint);
+                    FadeContentOut(TransformationTarget);
+                    placeholder.ScaleTo(0.8f).Then().ScaleTo(1, 3 * TRANSFORM_TIME, Easing.OutQuint);
+                    placeholder.FadeInFromZero(2 * TRANSFORM_TIME, Easing.OutQuint);
                     LoadingAnimation.Hide();
                     break;
 
                 case APIState.Online:
-                    placeholderContainer.FadeOut(150, Easing.OutQuint);
-                    Content.FadeIn(transform_time, Easing.OutQuint);
+                    FadeContentIn(TransformationTarget);
+                    placeholder.FadeOut(TRANSFORM_TIME / 2, Easing.OutQuint);
                     LoadingAnimation.Hide();
                     break;
 
                 case APIState.Failing:
                 case APIState.Connecting:
+                    FadeContentOut(TransformationTarget);
                     LoadingAnimation.Show();
-                    placeholderContainer.FadeOut(150, Easing.OutQuint);
-                    Content.FadeOut(150, Easing.OutQuint);
+                    placeholder.FadeOut(TRANSFORM_TIME / 2, Easing.OutQuint);
                     break;
             }
         }
 
+        protected abstract void FadeContentOut(Drawable content);
+
+        protected abstract void FadeContentIn(Drawable content);
+
         protected override void LoadComplete()
         {
             API?.Register(this);

From 5b452293d6055754bf007582c5a151a9ad859ede Mon Sep 17 00:00:00 2001
From: Berkan Diler <b.diler@gmx.de>
Date: Sat, 8 Feb 2020 18:05:27 +0100
Subject: [PATCH 0342/1142] Minor cleanups for legacy beatmap decoders

Replaces some string.StartsWith(string, StringComparison.Ordinal) calls with ring.StartsWith(char) , when only one char is compared. Possible since .NET-Standard 2.1

And another LegacyStoryboardDecoder.handleEvents() cleanup, saves some MB of allocations.
---
 osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs    |  2 +-
 osu.Game/Beatmaps/Formats/LegacyDecoder.cs           |  2 +-
 osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs | 11 ++++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
index 009da0656b..4b01b2490e 100644
--- a/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyBeatmapDecoder.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Beatmaps.Formats
                 hitObject.ApplyDefaults(this.beatmap.ControlPointInfo, this.beatmap.BeatmapInfo.BaseDifficulty);
         }
 
-        protected override bool ShouldSkipLine(string line) => base.ShouldSkipLine(line) || line.StartsWith(" ", StringComparison.Ordinal) || line.StartsWith("_", StringComparison.Ordinal);
+        protected override bool ShouldSkipLine(string line) => base.ShouldSkipLine(line) || line.StartsWith(' ') || line.StartsWith('_');
 
         protected override void ParseLine(Beatmap beatmap, Section section, string line)
         {
diff --git a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
index 0ec80eee41..e28e235788 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDecoder.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Beatmaps.Formats
                 if (ShouldSkipLine(line))
                     continue;
 
-                if (line.StartsWith(@"[", StringComparison.Ordinal) && line.EndsWith(@"]", StringComparison.Ordinal))
+                if (line.StartsWith('[') && line.EndsWith(']'))
                 {
                     if (!Enum.TryParse(line[1..^1], out section))
                     {
diff --git a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
index 35576e0f33..6569f76b2d 100644
--- a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
@@ -64,15 +64,16 @@ namespace osu.Game.Beatmaps.Formats
         private void handleEvents(string line)
         {
             var depth = 0;
-            var lineSpan = line.AsSpan();
 
-            while (lineSpan.StartsWith(" ", StringComparison.Ordinal) || lineSpan.StartsWith("_", StringComparison.Ordinal))
+            foreach (char c in line)
             {
-                lineSpan = lineSpan.Slice(1);
-                ++depth;
+                if (c == ' ' || c == '_')
+                    depth++;
+                else
+                    break;
             }
 
-            line = lineSpan.ToString();
+            line = line.Substring(depth);
 
             decodeVariables(ref line);
 

From c2e0c83724f0d981c780d5a1fb337c84f4248db7 Mon Sep 17 00:00:00 2001
From: jorolf <jorolf@gmx.de>
Date: Sat, 8 Feb 2020 20:25:16 +0100
Subject: [PATCH 0343/1142] change the hierarchy layout

---
 osu.Game/Graphics/UserInterface/OsuTextBox.cs | 69 +++++++++++++++----
 1 file changed, 57 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuTextBox.cs b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
index 36740fb015..d58a22685e 100644
--- a/osu.Game/Graphics/UserInterface/OsuTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.Sprites;
 using osuTK.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Graphics.Containers;
@@ -70,38 +71,82 @@ namespace osu.Game.Graphics.UserInterface
             SelectionColour = SelectionColour,
         };
 
-        private class BeatCaret : BasicCaret
+        private class BeatCaret : Caret
         {
-            private bool hasSelection;
+            private const float caret_move_time = 60;
+
+            private readonly CaretBeatSyncedContainer beatSync;
 
             public BeatCaret()
             {
-                AddInternal(new CaretBeatSyncedContainer(this));
+                RelativeSizeAxes = Axes.Y;
+                Size = new Vector2(1, 0.9f);
+
+                Colour = Color4.Transparent;
+                Anchor = Anchor.CentreLeft;
+                Origin = Anchor.CentreLeft;
+
+                Masking = true;
+                CornerRadius = 1;
+                InternalChild = beatSync = new CaretBeatSyncedContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                };
             }
 
+            public override void Hide() => this.FadeOut(200);
+
+            public float CaretWidth { get; set; }
+
+            public Color4 SelectionColour { get; set; }
+
             public override void DisplayAt(Vector2 position, float? selectionWidth)
             {
-                base.DisplayAt(position, selectionWidth);
+                beatSync.HasSelection = selectionWidth != null;
 
-                hasSelection = selectionWidth != null;
-                if (selectionWidth == null)
-                    ClearTransforms(targetMember: nameof(Alpha));
+                if (selectionWidth != null)
+                {
+                    this.MoveTo(new Vector2(position.X, position.Y), 60, Easing.Out);
+                    this.ResizeWidthTo(selectionWidth.Value + CaretWidth / 2, caret_move_time, Easing.Out);
+                    this.FadeColour(SelectionColour, 200, Easing.Out);
+                }
+                else
+                {
+                    this.MoveTo(new Vector2(position.X - CaretWidth / 2, position.Y), 60, Easing.Out);
+                    this.ResizeWidthTo(CaretWidth, caret_move_time, Easing.Out);
+                    this.FadeColour(Color4.White, 200, Easing.Out);
+                }
             }
 
             private class CaretBeatSyncedContainer : BeatSyncedContainer
             {
-                private readonly BeatCaret caret;
+                private bool hasSelection;
 
-                public CaretBeatSyncedContainer(BeatCaret caret)
+                public bool HasSelection
+                {
+                    set
+                    {
+                        hasSelection = value;
+                        if (value)
+
+                            this.FadeTo(0.5f, 200, Easing.Out);
+                    }
+                }
+
+                public CaretBeatSyncedContainer()
                 {
-                    this.caret = caret;
                     MinimumBeatLength = 300;
+                    InternalChild = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.White,
+                    };
                 }
 
                 protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
                 {
-                    if (!caret.hasSelection)
-                        caret.FadeTo(0.7f).FadeTo(0.4f, timingPoint.BeatLength, Easing.InOutSine);
+                    if (!hasSelection)
+                        this.FadeTo(0.7f).FadeTo(0.4f, timingPoint.BeatLength, Easing.InOutSine);
                 }
             }
         }

From 93ff25d2a43ee62c40c46e4489515e51f39f5395 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 9 Feb 2020 15:36:44 +0900
Subject: [PATCH 0344/1142] Rename caret class

---
 osu.Game/Graphics/UserInterface/OsuTextBox.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuTextBox.cs b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
index d58a22685e..4abbf8db57 100644
--- a/osu.Game/Graphics/UserInterface/OsuTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
@@ -65,19 +65,19 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override Drawable GetDrawableCharacter(char c) => new OsuSpriteText { Text = c.ToString(), Font = OsuFont.GetFont(size: CalculatedTextSize) };
 
-        protected override Caret CreateCaret() => new BeatCaret
+        protected override Caret CreateCaret() => new OsuCaret
         {
             CaretWidth = CaretWidth,
             SelectionColour = SelectionColour,
         };
 
-        private class BeatCaret : Caret
+        private class OsuCaret : Caret
         {
             private const float caret_move_time = 60;
 
             private readonly CaretBeatSyncedContainer beatSync;
 
-            public BeatCaret()
+            public OsuCaret()
             {
                 RelativeSizeAxes = Axes.Y;
                 Size = new Vector2(1, 0.9f);

From 590429b43ba9ba9f12e0e7914d52fe866daf1a03 Mon Sep 17 00:00:00 2001
From: ProTheory8 <editaw5@gmail.com>
Date: Sun, 9 Feb 2020 09:15:32 +0000
Subject: [PATCH 0345/1142] Now TestAutoOpenOnModSelect checks if customisation
 closes after deselecting mod

---
 osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
index 22ba972390..a9353d189f 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         }
 
         [Test]
-        public void TestCustomisationOpensOnModSelect()
+        public void TestAutoOpenOnModSelect()
         {
             createModSelect();
 
@@ -71,6 +71,8 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddAssert("Customisation closed", () => modSelect.ModSettingsContainer.Alpha == 0);
             AddStep("select mod", () => modSelect.SelectMod(testCustomisableAutoOpenMod));
             AddAssert("Customisation opened", () => modSelect.ModSettingsContainer.Alpha == 1);
+            AddStep("deselect mod", () => modSelect.SelectMod(testCustomisableAutoOpenMod));
+            AddAssert("Customisation closed", () => modSelect.ModSettingsContainer.Alpha == 0);
         }
 
         private void createModSelect()

From d73ef7c37e86639fbbeac95431077ba2d374201d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 9 Feb 2020 21:25:11 +0900
Subject: [PATCH 0346/1142] Change DummyBeatmap's track to be 0 length

---
 osu.Game/Beatmaps/WorkingBeatmap.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 05c344b199..30f2045a83 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Beatmaps
             switch (lastObject)
             {
                 case null:
-                    length = excess_length;
+                    length = 0;
                     break;
 
                 case IHasEndTime endTime:

From c1f52ef5941dd5c84c3dd6432ccf261558dce8ba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 9 Feb 2020 21:25:28 +0900
Subject: [PATCH 0347/1142] Refactor BeatSyncContainer to handle zero length
 tracks

---
 .../Containers/BeatSyncedContainer.cs         | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
index be9aefa359..f36079682e 100644
--- a/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
+++ b/osu.Game/Graphics/Containers/BeatSyncedContainer.cs
@@ -59,9 +59,9 @@ namespace osu.Game.Graphics.Containers
             Track track = null;
             IBeatmap beatmap = null;
 
-            double currentTrackTime;
-            TimingControlPoint timingPoint;
-            EffectControlPoint effectPoint;
+            double currentTrackTime = 0;
+            TimingControlPoint timingPoint = null;
+            EffectControlPoint effectPoint = null;
 
             if (Beatmap.Value.TrackLoaded && Beatmap.Value.BeatmapLoaded)
             {
@@ -69,24 +69,18 @@ namespace osu.Game.Graphics.Containers
                 beatmap = Beatmap.Value.Beatmap;
             }
 
-            if (track != null && beatmap != null && track.IsRunning)
+            if (track != null && beatmap != null && track.IsRunning && track.Length > 0)
             {
-                currentTrackTime = track.Length > 0 ? track.CurrentTime + EarlyActivationMilliseconds : Clock.CurrentTime;
+                currentTrackTime = track.CurrentTime + EarlyActivationMilliseconds;
 
                 timingPoint = beatmap.ControlPointInfo.TimingPointAt(currentTrackTime);
                 effectPoint = beatmap.ControlPointInfo.EffectPointAt(currentTrackTime);
-
-                if (timingPoint.BeatLength == 0)
-                {
-                    IsBeatSyncedWithTrack = false;
-                    return;
-                }
-
-                IsBeatSyncedWithTrack = true;
             }
-            else
+
+            IsBeatSyncedWithTrack = timingPoint?.BeatLength > 0;
+
+            if (timingPoint == null || !IsBeatSyncedWithTrack)
             {
-                IsBeatSyncedWithTrack = false;
                 currentTrackTime = Clock.CurrentTime;
                 timingPoint = defaultTiming;
                 effectPoint = defaultEffect;

From 96574a98adc8b48c2637aabc3287562eb8893f06 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 9 Feb 2020 21:34:56 +0900
Subject: [PATCH 0348/1142] Use non-zero length for fallback virtual track
 (allows tests to work as expected)

---
 osu.Game/Beatmaps/WorkingBeatmap.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 30f2045a83..5dc483b61c 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Beatmaps
             BeatmapSetInfo = beatmapInfo.BeatmapSet;
             Metadata = beatmapInfo.Metadata ?? BeatmapSetInfo?.Metadata ?? new BeatmapMetadata();
 
-            track = new RecyclableLazy<Track>(() => GetTrack() ?? GetVirtualTrack());
+            track = new RecyclableLazy<Track>(() => GetTrack() ?? GetVirtualTrack(1000));
             background = new RecyclableLazy<Texture>(GetBackground, BackgroundStillValid);
             waveform = new RecyclableLazy<Waveform>(GetWaveform);
             storyboard = new RecyclableLazy<Storyboard>(GetStoryboard);
@@ -48,7 +48,7 @@ namespace osu.Game.Beatmaps
             total_count.Value++;
         }
 
-        protected virtual Track GetVirtualTrack()
+        protected virtual Track GetVirtualTrack(double emptyLength = 0)
         {
             const double excess_length = 1000;
 
@@ -59,7 +59,7 @@ namespace osu.Game.Beatmaps
             switch (lastObject)
             {
                 case null:
-                    length = 0;
+                    length = emptyLength;
                     break;
 
                 case IHasEndTime endTime:

From 404cb613429289faa85d05bdfcf1be181ecb6c69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 9 Feb 2020 14:39:27 +0100
Subject: [PATCH 0349/1142] Open mod select in a more reliable way

---
 .../Visual/UserInterface/TestSceneModSettings.cs     | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
index a9353d189f..7781eeb315 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
@@ -38,8 +38,8 @@ namespace osu.Game.Tests.Visual.UserInterface
         public void TestButtonShowsOnCustomisableMod()
         {
             createModSelect();
+            openModSelect();
 
-            AddStep("open", () => modSelect.Show());
             AddAssert("button disabled", () => !modSelect.CustomiseButton.Enabled.Value);
             AddUntilStep("wait for button load", () => modSelect.ButtonsLoaded);
             AddStep("select mod", () => modSelect.SelectMod(testCustomisableMod));
@@ -58,7 +58,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddAssert("mods still active", () => SelectedMods.Value.Count == 1);
 
-            AddStep("open", () => modSelect.Show());
+            openModSelect();
             AddAssert("button enabled", () => modSelect.CustomiseButton.Enabled.Value);
         }
 
@@ -66,8 +66,8 @@ namespace osu.Game.Tests.Visual.UserInterface
         public void TestAutoOpenOnModSelect()
         {
             createModSelect();
+            openModSelect();
 
-            AddStep("open", () => modSelect.Show());
             AddAssert("Customisation closed", () => modSelect.ModSettingsContainer.Alpha == 0);
             AddStep("select mod", () => modSelect.SelectMod(testCustomisableAutoOpenMod));
             AddAssert("Customisation opened", () => modSelect.ModSettingsContainer.Alpha == 1);
@@ -88,6 +88,12 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
         }
 
+        private void openModSelect()
+        {
+            AddStep("open", () => modSelect.Show());
+            AddUntilStep("wait for ready", () => modSelect.State.Value == Visibility.Visible && modSelect.ButtonsLoaded);
+        }
+
         private class TestModSelectOverlay : ModSelectOverlay
         {
             public new Container ModSettingsContainer => base.ModSettingsContainer;

From 7e28f2fe6aae19fdf91e68211cca5c0d19bee6be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 9 Feb 2020 14:41:02 +0100
Subject: [PATCH 0350/1142] Rename test to better reflect its purpose

---
 osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
index 7781eeb315..7ff463361a 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
@@ -63,7 +63,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         }
 
         [Test]
-        public void TestAutoOpenOnModSelect()
+        public void TestCustomisationMenuVisibility()
         {
             createModSelect();
             openModSelect();

From b45f1ef99a6489984534cf86ac219469b6d0265f Mon Sep 17 00:00:00 2001
From: Maximilian Junges <Maxi.Junges@gmx.de>
Date: Sun, 9 Feb 2020 22:27:37 +0100
Subject: [PATCH 0351/1142] make timestamps hoverable

---
 osu.Game/Overlays/BeatmapSet/AuthorInfo.cs | 26 +++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs b/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
index 096e91b65b..485ca100c6 100644
--- a/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
+++ b/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -50,7 +51,7 @@ namespace osu.Game.Overlays.BeatmapSet
             fields.Children = new Drawable[]
             {
                 new Field("mapped by", BeatmapSet.Metadata.Author.Username, OsuFont.GetFont(weight: FontWeight.Regular, italics: true)),
-                new Field("submitted on", online.Submitted.ToString(@"MMMM d, yyyy"), OsuFont.GetFont(weight: FontWeight.Bold))
+                new Field("submitted", online.Submitted, OsuFont.GetFont(weight: FontWeight.Bold))
                 {
                     Margin = new MarginPadding { Top = 5 },
                 },
@@ -58,11 +59,11 @@ namespace osu.Game.Overlays.BeatmapSet
 
             if (online.Ranked.HasValue)
             {
-                fields.Add(new Field("ranked on", online.Ranked.Value.ToString(@"MMMM d, yyyy"), OsuFont.GetFont(weight: FontWeight.Bold)));
+                fields.Add(new Field("ranked", online.Ranked.Value, OsuFont.GetFont(weight: FontWeight.Bold)));
             }
             else if (online.LastUpdated.HasValue)
             {
-                fields.Add(new Field("last updated on", online.LastUpdated.Value.ToString(@"MMMM d, yyyy"), OsuFont.GetFont(weight: FontWeight.Bold)));
+                fields.Add(new Field("last updated", online.LastUpdated.Value, OsuFont.GetFont(weight: FontWeight.Bold)));
             }
         }
 
@@ -126,6 +127,25 @@ namespace osu.Game.Overlays.BeatmapSet
                     },
                 };
             }
+
+            public Field(string first, DateTimeOffset second, FontUsage secondFont)
+            {
+                AutoSizeAxes = Axes.Both;
+                Direction = FillDirection.Horizontal;
+
+                Children = new[]
+                {
+                    new OsuSpriteText
+                    {
+                        Text = $"{first} ",
+                        Font = OsuFont.GetFont(size: 13)
+                    },
+                    new DrawableDate(second)
+                    {
+                        Font = secondFont.With(size: 13)
+                    }
+                };
+            }
         }
     }
 }

From 867c7338093934caf6164ba27029b3e65d006614 Mon Sep 17 00:00:00 2001
From: Maximilian Junges <Maxi.Junges@gmx.de>
Date: Sun, 9 Feb 2020 23:19:32 +0100
Subject: [PATCH 0352/1142] make score date hoverable

---
 .../BeatmapSet/Scores/TopScoreUserSection.cs  | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
index 72a7efd777..ba1db8ef03 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -12,7 +13,6 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Leaderboards;
 using osu.Game.Scoring;
 using osu.Game.Users.Drawables;
-using osu.Game.Utils;
 using osuTK;
 using osuTK.Graphics;
 
@@ -24,7 +24,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
         private readonly UpdateableRank rank;
         private readonly UpdateableAvatar avatar;
         private readonly LinkFlowContainer usernameText;
-        private readonly SpriteText date;
+        private readonly DrawableDate achievedOn;
         private readonly UpdateableFlag flag;
 
         public TopScoreUserSection()
@@ -92,11 +92,24 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                                 Origin = Anchor.CentreLeft,
                                 AutoSizeAxes = Axes.Both,
                             },
-                            date = new OsuSpriteText
+                            new FillFlowContainer()
                             {
+                                AutoSizeAxes = Axes.Both,
+                                Direction = FillDirection.Horizontal,
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.CentreLeft,
-                                Font = OsuFont.GetFont(size: 10, weight: FontWeight.Bold)
+                                Children = new[]
+                                {
+                                    new OsuSpriteText
+                                    {
+                                        Text = "achieved ",
+                                        Font = OsuFont.GetFont(size: 10, weight: FontWeight.Bold)
+                                    },
+                                    achievedOn = new DrawableDate(DateTimeOffset.MinValue)
+                                    {
+                                        Font = OsuFont.GetFont(size: 10, weight: FontWeight.Bold)
+                                    },
+                                }
                             },
                             flag = new UpdateableFlag
                             {
@@ -125,7 +138,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             {
                 avatar.User = value.User;
                 flag.Country = value.User.Country;
-                date.Text = $@"achieved {HumanizerUtils.Humanize(value.Date)}";
+                achievedOn.Date = value.Date;
 
                 usernameText.Clear();
                 usernameText.AddUserLink(value.User);
@@ -134,4 +147,4 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             }
         }
     }
-}
+}
\ No newline at end of file

From 3e06324f61770bd6bcee4135c0573d5fc1720b0a Mon Sep 17 00:00:00 2001
From: Maximilian Junges <Maxi.Junges@gmx.de>
Date: Sun, 9 Feb 2020 23:39:34 +0100
Subject: [PATCH 0353/1142] fix formatting issue

---
 osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
index ba1db8ef03..6c33629c0e 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                                 Origin = Anchor.CentreLeft,
                                 AutoSizeAxes = Axes.Both,
                             },
-                            new FillFlowContainer()
+                            new FillFlowContainer
                             {
                                 AutoSizeAxes = Axes.Both,
                                 Direction = FillDirection.Horizontal,

From ed8cb1d6bf42b35b97370810216404532acb114a Mon Sep 17 00:00:00 2001
From: Maximilian Junges <Maxi.Junges@gmx.de>
Date: Sun, 9 Feb 2020 23:46:06 +0100
Subject: [PATCH 0354/1142] add missing eof newline

---
 osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
index 6c33629c0e..94a6334401 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
@@ -147,4 +147,4 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             }
         }
     }
-}
\ No newline at end of file
+}

From 88a56d00bfde67ba143e7b1d87a90d5b4ba0b5c4 Mon Sep 17 00:00:00 2001
From: voidedWarranties <wz68.scratch@gmail.com>
Date: Sun, 9 Feb 2020 20:11:37 -0800
Subject: [PATCH 0355/1142] Allow specifying order to SettingSource

---
 .../Mods/CatchModDifficultyAdjust.cs          |  4 +--
 .../Mods/OsuModDifficultyAdjust.cs            |  4 +--
 .../Configuration/SettingSourceAttribute.cs   | 28 +++++++++++++++++--
 osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs |  4 +--
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
index 8377b3786a..802802c155 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Rulesets.Catch.Mods
 {
     public class CatchModDifficultyAdjust : ModDifficultyAdjust
     {
-        [SettingSource("Fruit Size", "Override a beatmap's set CS.")]
+        [SettingSource("Fruit Size", "Override a beatmap's set CS.", SettingSourceAttribute.FIRST)]
         public BindableNumber<float> CircleSize { get; } = new BindableFloat
         {
             Precision = 0.1f,
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Catch.Mods
             Value = 5,
         };
 
-        [SettingSource("Approach Rate", "Override a beatmap's set AR.")]
+        [SettingSource("Approach Rate", "Override a beatmap's set AR.", SettingSourceAttribute.LAST)]
         public BindableNumber<float> ApproachRate { get; } = new BindableFloat
         {
             Precision = 0.1f,
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index 7eee71be81..5326e36282 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 {
     public class OsuModDifficultyAdjust : ModDifficultyAdjust
     {
-        [SettingSource("Circle Size", "Override a beatmap's set CS.")]
+        [SettingSource("Circle Size", "Override a beatmap's set CS.", SettingSourceAttribute.FIRST)]
         public BindableNumber<float> CircleSize { get; } = new BindableFloat
         {
             Precision = 0.1f,
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             Value = 5,
         };
 
-        [SettingSource("Approach Rate", "Override a beatmap's set AR.")]
+        [SettingSource("Approach Rate", "Override a beatmap's set AR.", SettingSourceAttribute.LAST)]
         public BindableNumber<float> ApproachRate { get; } = new BindableFloat
         {
             Precision = 0.1f,
diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index a3788e4582..79232b70dc 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 using JetBrains.Annotations;
 using osu.Framework.Bindables;
@@ -20,14 +21,25 @@ namespace osu.Game.Configuration
     [AttributeUsage(AttributeTargets.Property)]
     public class SettingSourceAttribute : Attribute
     {
+        public const int FIRST = 0;
+        public const int ORDERED_RELATIVE = 1;
+        public const int UNORDERED = 2;
+        public const int LAST = 3;
+
         public string Label { get; }
 
         public string Description { get; }
 
-        public SettingSourceAttribute(string label, string description = null)
+        public int OrderMode { get; }
+
+        public int OrderPosition { get; }
+
+        public SettingSourceAttribute(string label, string description = null, int order = UNORDERED, int orderPosition = 0)
         {
             Label = label ?? string.Empty;
             Description = description ?? string.Empty;
+            OrderMode = order;
+            OrderPosition = orderPosition;
         }
     }
 
@@ -35,7 +47,7 @@ namespace osu.Game.Configuration
     {
         public static IEnumerable<Drawable> CreateSettingsControls(this object obj)
         {
-            foreach (var (attr, property) in obj.GetSettingsSourceProperties())
+            foreach (var (attr, property) in obj.GetOrderedSettingsSourceProperties())
             {
                 object value = property.GetValue(obj);
 
@@ -116,5 +128,17 @@ namespace osu.Game.Configuration
                 yield return (attr, property);
             }
         }
+
+        public static IEnumerable<(SettingSourceAttribute, PropertyInfo)> GetOrderedSettingsSourceProperties(this object obj)
+        {
+            var original = obj.GetSettingsSourceProperties();
+
+            var first = original.Where(attr => attr.Item1.OrderMode == SettingSourceAttribute.FIRST);
+            var orderedRelative = original.Where(attr => attr.Item1.OrderMode == SettingSourceAttribute.ORDERED_RELATIVE).OrderBy(attr => attr.Item1.OrderPosition);
+            var unordered = original.Where(attr => attr.Item1.OrderMode == SettingSourceAttribute.UNORDERED);
+            var last = original.Where(attr => attr.Item1.OrderMode == SettingSourceAttribute.LAST);
+
+            return first.Concat(orderedRelative).Concat(unordered).Concat(last);
+        }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index d74e2ce2bc..8c6b9658b0 100644
--- a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Mods
 
         public override Type[] IncompatibleMods => new[] { typeof(ModEasy), typeof(ModHardRock) };
 
-        [SettingSource("Drain Rate", "Override a beatmap's set HP.")]
+        [SettingSource("Drain Rate", "Override a beatmap's set HP.", SettingSourceAttribute.ORDERED_RELATIVE, 1)]
         public BindableNumber<float> DrainRate { get; } = new BindableFloat
         {
             Precision = 0.1f,
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Mods
             Value = 5,
         };
 
-        [SettingSource("Overall Difficulty", "Override a beatmap's set OD.")]
+        [SettingSource("Overall Difficulty", "Override a beatmap's set OD.", SettingSourceAttribute.ORDERED_RELATIVE, 1)]
         public BindableNumber<float> OverallDifficulty { get; } = new BindableFloat
         {
             Precision = 0.1f,

From 137181017b96ae3c7f786295c42023da197691ed Mon Sep 17 00:00:00 2001
From: voidedWarranties <wz68.scratch@gmail.com>
Date: Sun, 9 Feb 2020 20:36:54 -0800
Subject: [PATCH 0356/1142] Naming consistency with osu!web

---
 osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs | 2 +-
 osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
index 802802c155..f4754696ff 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Rulesets.Catch.Mods
 {
     public class CatchModDifficultyAdjust : ModDifficultyAdjust
     {
-        [SettingSource("Fruit Size", "Override a beatmap's set CS.", SettingSourceAttribute.FIRST)]
+        [SettingSource("Circle Size", "Override a beatmap's set CS.", SettingSourceAttribute.FIRST)]
         public BindableNumber<float> CircleSize { get; } = new BindableFloat
         {
             Precision = 0.1f,
diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index 8c6b9658b0..fae04dd13e 100644
--- a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Mods
 
         public override Type[] IncompatibleMods => new[] { typeof(ModEasy), typeof(ModHardRock) };
 
-        [SettingSource("Drain Rate", "Override a beatmap's set HP.", SettingSourceAttribute.ORDERED_RELATIVE, 1)]
+        [SettingSource("HP Drain", "Override a beatmap's set HP.", SettingSourceAttribute.ORDERED_RELATIVE, 1)]
         public BindableNumber<float> DrainRate { get; } = new BindableFloat
         {
             Precision = 0.1f,
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Mods
             Value = 5,
         };
 
-        [SettingSource("Overall Difficulty", "Override a beatmap's set OD.", SettingSourceAttribute.ORDERED_RELATIVE, 1)]
+        [SettingSource("Accuracy", "Override a beatmap's set OD.", SettingSourceAttribute.ORDERED_RELATIVE, 1)]
         public BindableNumber<float> OverallDifficulty { get; } = new BindableFloat
         {
             Precision = 0.1f,

From 28cf5c7a5983b5ab9f9b6366faf751a94afb695d Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 10 Feb 2020 14:28:43 +0900
Subject: [PATCH 0357/1142] Add accessor

---
 osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 55b2b801e7..417d32ca4f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         protected DragBox DragBox { get; private set; }
 
-        protected Container<SelectionBlueprint> SelectionBlueprints;
+        protected Container<SelectionBlueprint> SelectionBlueprints { get; private set; }
 
         private SelectionHandler selectionHandler;
 

From ea521b466fdaa28dda69d8388f3f19a6183f040b Mon Sep 17 00:00:00 2001
From: voidedWarranties <wz68.scratch@gmail.com>
Date: Sun, 9 Feb 2020 21:37:40 -0800
Subject: [PATCH 0358/1142] Switch numerical consts to an enum

---
 .../Mods/CatchModDifficultyAdjust.cs          |  5 ++--
 .../Mods/OsuModDifficultyAdjust.cs            |  5 ++--
 .../Configuration/SettingSourceAttribute.cs   | 25 +++++++++++--------
 osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs |  5 ++--
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
index f4754696ff..17a2847fd1 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
@@ -5,12 +5,13 @@ using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
+using static osu.Game.Configuration.SettingSourceAttribute;
 
 namespace osu.Game.Rulesets.Catch.Mods
 {
     public class CatchModDifficultyAdjust : ModDifficultyAdjust
     {
-        [SettingSource("Circle Size", "Override a beatmap's set CS.", SettingSourceAttribute.FIRST)]
+        [SettingSource("Circle Size", "Override a beatmap's set CS.", OrderMode.FIRST)]
         public BindableNumber<float> CircleSize { get; } = new BindableFloat
         {
             Precision = 0.1f,
@@ -20,7 +21,7 @@ namespace osu.Game.Rulesets.Catch.Mods
             Value = 5,
         };
 
-        [SettingSource("Approach Rate", "Override a beatmap's set AR.", SettingSourceAttribute.LAST)]
+        [SettingSource("Approach Rate", "Override a beatmap's set AR.", OrderMode.LAST)]
         public BindableNumber<float> ApproachRate { get; } = new BindableFloat
         {
             Precision = 0.1f,
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index 5326e36282..2b56042ead 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
@@ -5,12 +5,13 @@ using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
+using static osu.Game.Configuration.SettingSourceAttribute;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
     public class OsuModDifficultyAdjust : ModDifficultyAdjust
     {
-        [SettingSource("Circle Size", "Override a beatmap's set CS.", SettingSourceAttribute.FIRST)]
+        [SettingSource("Circle Size", "Override a beatmap's set CS.", OrderMode.FIRST)]
         public BindableNumber<float> CircleSize { get; } = new BindableFloat
         {
             Precision = 0.1f,
@@ -20,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             Value = 5,
         };
 
-        [SettingSource("Approach Rate", "Override a beatmap's set AR.", SettingSourceAttribute.LAST)]
+        [SettingSource("Approach Rate", "Override a beatmap's set AR.", OrderMode.LAST)]
         public BindableNumber<float> ApproachRate { get; } = new BindableFloat
         {
             Precision = 0.1f,
diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index 79232b70dc..06e01bb042 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -21,24 +21,27 @@ namespace osu.Game.Configuration
     [AttributeUsage(AttributeTargets.Property)]
     public class SettingSourceAttribute : Attribute
     {
-        public const int FIRST = 0;
-        public const int ORDERED_RELATIVE = 1;
-        public const int UNORDERED = 2;
-        public const int LAST = 3;
+        public enum OrderMode
+        {
+            FIRST,
+            ORDERED_RELATIVE,
+            UNORDERED,
+            LAST
+        }
 
         public string Label { get; }
 
         public string Description { get; }
 
-        public int OrderMode { get; }
+        public OrderMode OrderingMode { get; }
 
         public int OrderPosition { get; }
 
-        public SettingSourceAttribute(string label, string description = null, int order = UNORDERED, int orderPosition = 0)
+        public SettingSourceAttribute(string label, string description = null, OrderMode order = OrderMode.UNORDERED, int orderPosition = 0)
         {
             Label = label ?? string.Empty;
             Description = description ?? string.Empty;
-            OrderMode = order;
+            OrderingMode = order;
             OrderPosition = orderPosition;
         }
     }
@@ -133,10 +136,10 @@ namespace osu.Game.Configuration
         {
             var original = obj.GetSettingsSourceProperties();
 
-            var first = original.Where(attr => attr.Item1.OrderMode == SettingSourceAttribute.FIRST);
-            var orderedRelative = original.Where(attr => attr.Item1.OrderMode == SettingSourceAttribute.ORDERED_RELATIVE).OrderBy(attr => attr.Item1.OrderPosition);
-            var unordered = original.Where(attr => attr.Item1.OrderMode == SettingSourceAttribute.UNORDERED);
-            var last = original.Where(attr => attr.Item1.OrderMode == SettingSourceAttribute.LAST);
+            var first = original.Where(attr => attr.Item1.OrderingMode == SettingSourceAttribute.OrderMode.FIRST);
+            var orderedRelative = original.Where(attr => attr.Item1.OrderingMode == SettingSourceAttribute.OrderMode.ORDERED_RELATIVE).OrderBy(attr => attr.Item1.OrderPosition);
+            var unordered = original.Where(attr => attr.Item1.OrderingMode == SettingSourceAttribute.OrderMode.UNORDERED);
+            var last = original.Where(attr => attr.Item1.OrderingMode == SettingSourceAttribute.OrderMode.LAST);
 
             return first.Concat(orderedRelative).Concat(unordered).Concat(last);
         }
diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index fae04dd13e..958a0353ea 100644
--- a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics.Sprites;
 using System;
 using System.Collections.Generic;
 using osu.Game.Configuration;
+using static osu.Game.Configuration.SettingSourceAttribute;
 
 namespace osu.Game.Rulesets.Mods
 {
@@ -28,7 +29,7 @@ namespace osu.Game.Rulesets.Mods
 
         public override Type[] IncompatibleMods => new[] { typeof(ModEasy), typeof(ModHardRock) };
 
-        [SettingSource("HP Drain", "Override a beatmap's set HP.", SettingSourceAttribute.ORDERED_RELATIVE, 1)]
+        [SettingSource("HP Drain", "Override a beatmap's set HP.", OrderMode.ORDERED_RELATIVE, 1)]
         public BindableNumber<float> DrainRate { get; } = new BindableFloat
         {
             Precision = 0.1f,
@@ -38,7 +39,7 @@ namespace osu.Game.Rulesets.Mods
             Value = 5,
         };
 
-        [SettingSource("Accuracy", "Override a beatmap's set OD.", SettingSourceAttribute.ORDERED_RELATIVE, 1)]
+        [SettingSource("Accuracy", "Override a beatmap's set OD.", OrderMode.ORDERED_RELATIVE, 1)]
         public BindableNumber<float> OverallDifficulty { get; } = new BindableFloat
         {
             Precision = 0.1f,

From d61516e10c342a02ee20350bb49c7cd69a1eec05 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 Feb 2020 16:59:49 +0900
Subject: [PATCH 0359/1142] Add failing tests

---
 .../SongSelect/TestScenePlaySongSelect.cs     | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 80192b9ebc..a5145f420d 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -17,6 +17,7 @@ using osu.Framework.Screens;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
@@ -426,6 +427,40 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("start not requested", () => !startRequested);
         }
 
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestExternalBeatmapChangeWhileFiltered(bool differentRuleset)
+        {
+            createSongSelect();
+            addManyTestMaps();
+
+            changeRuleset(0);
+
+            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmap != null);
+
+            AddStep("set filter text", () => songSelect.FilterControl.ChildrenOfType<SearchTextBox>().First().Text = "nonono");
+
+            AddUntilStep("dummy selected", () => Beatmap.Value is DummyWorkingBeatmap);
+
+            BeatmapInfo target = null;
+
+            AddStep("select beatmap externally", () =>
+            {
+                target = manager.QueryBeatmapSets(b => b.Beatmaps.Any(bi => bi.RulesetID == (differentRuleset ? 1 : 0)))
+                                .ElementAt(5).Beatmaps.First();
+
+                Beatmap.Value = manager.GetWorkingBeatmap(target);
+            });
+
+            AddUntilStep("correct beatmap selected", () => Beatmap.Value.BeatmapInfo.OnlineBeatmapID == target.OnlineBeatmapID);
+            AddAssert("carousel also correct", () => songSelect.Carousel.SelectedBeatmap.OnlineBeatmapID == target.OnlineBeatmapID);
+
+            AddStep("reset filter text", () => songSelect.FilterControl.ChildrenOfType<SearchTextBox>().First().Text = string.Empty);
+
+            AddAssert("still selected", () => Beatmap.Value.BeatmapInfo.OnlineBeatmapID == target.OnlineBeatmapID);
+            AddAssert("carousel also correct", () => songSelect.Carousel.SelectedBeatmap.OnlineBeatmapID == target.OnlineBeatmapID);
+        }
+
         [Test]
         public void TestAutoplayViaCtrlEnter()
         {
@@ -468,6 +503,7 @@ namespace osu.Game.Tests.Visual.SongSelect
         private void importForRuleset(int id) => manager.Import(createTestBeatmapSet(getImportId(), rulesets.AvailableRulesets.Where(r => r.ID == id).ToArray())).Wait();
 
         private static int importId;
+
         private int getImportId() => ++importId;
 
         private void checkMusicPlaying(bool playing) =>
@@ -551,6 +587,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             public new Bindable<RulesetInfo> Ruleset => base.Ruleset;
 
+            public new FilterControl FilterControl => base.FilterControl;
+
             public WorkingBeatmap CurrentBeatmap => Beatmap.Value;
             public WorkingBeatmap CurrentBeatmapDetailsBeatmap => BeatmapDetails.Beatmap;
             public new BeatmapCarousel Carousel => base.Carousel;

From 66fb72cd8a476f33f07f408d0c0220d23233d950 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 Feb 2020 16:31:52 +0900
Subject: [PATCH 0360/1142] Fix song select not showing active beatmap if it is
 filtered by local criteria

---
 osu.Game/Screens/Select/BeatmapCarousel.cs       | 12 ++++++++++++
 .../Select/Carousel/CarouselBeatmapSet.cs        |  2 +-
 osu.Game/Screens/Select/Carousel/CarouselItem.cs |  2 +-
 osu.Game/Screens/Select/SongSelect.cs            | 16 +++++++++++-----
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 592e26adc2..5be4d24b2b 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -17,6 +17,7 @@ using osu.Framework.Caching;
 using osu.Framework.Threading;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Input.Events;
+using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
@@ -229,6 +230,17 @@ namespace osu.Game.Screens.Select
                 if (item != null)
                 {
                     select(item);
+
+                    // if we got here and the set is filtered, it means we were bypassing filters.
+                    // in this case, reapplying the filter is necessary to ensure the panel is in the correct place
+                    // (since it is forcefully being included in the carousel).
+                    if (set.Filtered.Value)
+                    {
+                        Debug.Assert(bypassFilters);
+
+                        applyActiveCriteria(false, true);
+                    }
+
                     return true;
                 }
             }
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
index 301d0d4dae..8e323c66e2 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Screens.Select.Carousel
         /// <summary>
         /// All beatmaps which are not filtered and valid for display.
         /// </summary>
-        protected IEnumerable<BeatmapInfo> ValidBeatmaps => Beatmaps.Where(b => !b.Filtered.Value).Select(b => b.Beatmap);
+        protected IEnumerable<BeatmapInfo> ValidBeatmaps => Beatmaps.Where(b => !b.Filtered.Value || b.State.Value == CarouselItemState.Selected).Select(b => b.Beatmap);
 
         private int compareUsingAggregateMax(CarouselBeatmapSet other, Func<BeatmapInfo, double> func)
         {
diff --git a/osu.Game/Screens/Select/Carousel/CarouselItem.cs b/osu.Game/Screens/Select/Carousel/CarouselItem.cs
index 79c1a4cb6b..1108b72bd2 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselItem.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselItem.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.Select.Carousel
         /// <summary>
         /// This item is not in a hidden state.
         /// </summary>
-        public bool Visible => State.Value != CarouselItemState.Collapsed && !Filtered.Value;
+        public bool Visible => State.Value == CarouselItemState.Selected || (State.Value != CarouselItemState.Collapsed && !Filtered.Value);
 
         public virtual List<DrawableCarouselItem> Drawables
         {
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 5037081b5e..0da260d752 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -376,16 +376,22 @@ namespace osu.Game.Screens.Select
 
         private void workingBeatmapChanged(ValueChangedEvent<WorkingBeatmap> e)
         {
-            if (e.NewValue is DummyWorkingBeatmap) return;
+            if (e.NewValue is DummyWorkingBeatmap || !this.IsCurrentScreen()) return;
 
-            if (this.IsCurrentScreen() && !Carousel.SelectBeatmap(e.NewValue?.BeatmapInfo, false))
+            if (!Carousel.SelectBeatmap(e.NewValue.BeatmapInfo, false))
             {
-                // If selecting new beatmap without bypassing filters failed, there's possibly a ruleset mismatch
-                if (e.NewValue?.BeatmapInfo?.Ruleset != null && !e.NewValue.BeatmapInfo.Ruleset.Equals(decoupledRuleset.Value))
+                // A selection may not have been possible with filters applied.
+
+                // There was possibly a ruleset mismatch. This is a case we can help things along by updating the game-wide ruleset to match.
+                if (e.NewValue.BeatmapInfo.Ruleset != null && !e.NewValue.BeatmapInfo.Ruleset.Equals(decoupledRuleset.Value))
                 {
                     Ruleset.Value = e.NewValue.BeatmapInfo.Ruleset;
-                    Carousel.SelectBeatmap(e.NewValue.BeatmapInfo);
+                    transferRulesetValue();
                 }
+
+                // Even if a ruleset mismatch was not the cause (ie. a text filter is applied),
+                // we still want to forcefully show the new beatmap, bypassing filters.
+                Carousel.SelectBeatmap(e.NewValue.BeatmapInfo);
             }
         }
 

From 2252f790848c8b8e695afab6d28be272229ce0e4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 10 Feb 2020 08:01:14 +0000
Subject: [PATCH 0361/1142] Bump Sentry from 2.0.1 to 2.0.2

Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 2.0.1 to 2.0.2.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/2.0.1...2.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Game/osu.Game.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 21c9eab4c6..389fbe8210 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2020.207.0" />
-    <PackageReference Include="Sentry" Version="2.0.1" />
+    <PackageReference Include="Sentry" Version="2.0.2" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />

From a988a53d69fc23585f1aaa08b79b03bb2c31f708 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 10 Feb 2020 16:41:10 +0900
Subject: [PATCH 0362/1142] Better handle beatmap task cancel exception

---
 osu.Game/Beatmaps/WorkingBeatmap.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 5dc483b61c..1adf502004 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -159,8 +159,16 @@ namespace osu.Game.Beatmaps
                 {
                     return LoadBeatmapAsync().Result;
                 }
-                catch (TaskCanceledException)
+                catch (AggregateException ae)
                 {
+                    foreach (var e in ae.InnerExceptions)
+                    {
+                        if (e is TaskCanceledException)
+                            continue;
+
+                        Logger.Log(e.ToString());
+                    }
+
                     return null;
                 }
             }

From 51e2a934bdbfa6045ec94ee04f6e629521e8cb9e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 10 Feb 2020 17:00:51 +0900
Subject: [PATCH 0363/1142] Fix possible beatmap nullref in logo visualisation

---
 osu.Game/Screens/Menu/LogoVisualisation.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Menu/LogoVisualisation.cs b/osu.Game/Screens/Menu/LogoVisualisation.cs
index 06ca161fed..dcc68296f6 100644
--- a/osu.Game/Screens/Menu/LogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/LogoVisualisation.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Screens.Menu
         private void updateAmplitudes()
         {
             var track = beatmap.Value.TrackLoaded ? beatmap.Value.Track : null;
-            var effect = beatmap.Value.BeatmapLoaded ? beatmap.Value.Beatmap.ControlPointInfo.EffectPointAt(track?.CurrentTime ?? Time.Current) : null;
+            var effect = beatmap.Value.BeatmapLoaded ? beatmap.Value.Beatmap?.ControlPointInfo.EffectPointAt(track?.CurrentTime ?? Time.Current) : null;
 
             float[] temporalAmplitudes = track?.CurrentAmplitudes.FrequencyAmplitudes;
 

From cef682aa03b607079417a9eca096890689c9ec5a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 10 Feb 2020 17:01:41 +0900
Subject: [PATCH 0364/1142] Make WorkingBeatmap non-disposable

---
 osu.Game.Tests/WaveformTestBeatmap.cs |  4 +-
 osu.Game/Beatmaps/WorkingBeatmap.cs   | 67 ++++++++++++---------------
 osu.Game/OsuGame.cs                   | 11 ++---
 osu.Game/Tests/Visual/OsuTestScene.cs |  4 +-
 4 files changed, 39 insertions(+), 47 deletions(-)

diff --git a/osu.Game.Tests/WaveformTestBeatmap.cs b/osu.Game.Tests/WaveformTestBeatmap.cs
index df6394ed34..53ce5def32 100644
--- a/osu.Game.Tests/WaveformTestBeatmap.cs
+++ b/osu.Game.Tests/WaveformTestBeatmap.cs
@@ -37,9 +37,9 @@ namespace osu.Game.Tests
             trackStore = audioManager.GetTrackStore(getZipReader());
         }
 
-        protected override void Dispose(bool isDisposing)
+        ~WaveformTestBeatmap()
         {
-            base.Dispose(isDisposing);
+            // Remove the track store from the audio manager
             trackStore?.Dispose();
         }
 
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 1adf502004..6478b33e27 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -17,10 +17,11 @@ using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.UI;
 using osu.Game.Skinning;
 using osu.Framework.Graphics.Video;
+using osu.Framework.Logging;
 
 namespace osu.Game.Beatmaps
 {
-    public abstract class WorkingBeatmap : IWorkingBeatmap, IDisposable
+    public abstract class WorkingBeatmap : IWorkingBeatmap
     {
         public readonly BeatmapInfo BeatmapInfo;
 
@@ -133,11 +134,29 @@ namespace osu.Game.Beatmaps
             return converted;
         }
 
-        public override string ToString() => BeatmapInfo.ToString();
+        private CancellationTokenSource loadCancellation = new CancellationTokenSource();
 
-        public bool BeatmapLoaded => beatmapLoadTask?.IsCompleted ?? false;
+        /// <summary>
+        /// Beings loading the contents of this <see cref="WorkingBeatmap"/> asynchronously.
+        /// </summary>
+        public void BeginAsyncLoad()
+        {
+            loadBeatmapAsync();
+        }
 
-        public Task<IBeatmap> LoadBeatmapAsync() => beatmapLoadTask ??= Task.Factory.StartNew(() =>
+        /// <summary>
+        /// Cancels the asynchronous loading of the contents of this <see cref="WorkingBeatmap"/>.
+        /// </summary>
+        public void CancelAsyncLoad()
+        {
+            loadCancellation?.Cancel();
+            loadCancellation = new CancellationTokenSource();
+
+            if (beatmapLoadTask?.IsCompleted != true)
+                beatmapLoadTask = null;
+        }
+
+        private Task<IBeatmap> loadBeatmapAsync() => beatmapLoadTask ??= Task.Factory.StartNew(() =>
         {
             // Todo: Handle cancellation during beatmap parsing
             var b = GetBeatmap() ?? new Beatmap();
@@ -149,7 +168,11 @@ namespace osu.Game.Beatmaps
             b.BeatmapInfo = BeatmapInfo;
 
             return b;
-        }, beatmapCancellation.Token, TaskCreationOptions.LongRunning, TaskScheduler.Default);
+        }, loadCancellation.Token, TaskCreationOptions.LongRunning, TaskScheduler.Default);
+
+        public override string ToString() => BeatmapInfo.ToString();
+
+        public bool BeatmapLoaded => beatmapLoadTask?.IsCompleted ?? false;
 
         public IBeatmap Beatmap
         {
@@ -157,7 +180,7 @@ namespace osu.Game.Beatmaps
             {
                 try
                 {
-                    return LoadBeatmapAsync().Result;
+                    return loadBeatmapAsync().Result;
                 }
                 catch (AggregateException ae)
                 {
@@ -174,7 +197,6 @@ namespace osu.Game.Beatmaps
             }
         }
 
-        private readonly CancellationTokenSource beatmapCancellation = new CancellationTokenSource();
         protected abstract IBeatmap GetBeatmap();
         private Task<IBeatmap> beatmapLoadTask;
 
@@ -225,40 +247,11 @@ namespace osu.Game.Beatmaps
         /// </summary>
         public virtual void RecycleTrack() => track.Recycle();
 
-        #region Disposal
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        private bool isDisposed;
-
-        protected virtual void Dispose(bool isDisposing)
-        {
-            if (isDisposed)
-                return;
-
-            isDisposed = true;
-
-            // recycling logic is not here for the time being, as components which use
-            // retrieved objects from WorkingBeatmap may not hold a reference to the WorkingBeatmap itself.
-            // this should be fine as each retrieved component do have their own finalizers.
-
-            // cancelling the beatmap load is safe for now since the retrieval is a synchronous
-            // operation. if we add an async retrieval method this may need to be reconsidered.
-            beatmapCancellation?.Cancel();
-            total_count.Value--;
-        }
-
         ~WorkingBeatmap()
         {
-            Dispose(false);
+            total_count.Value--;
         }
 
-        #endregion
-
         public class RecyclableLazy<T>
         {
             private Lazy<T> lazy;
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index ff3dee55af..f848b1a328 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -401,15 +401,14 @@ namespace osu.Game
             if (nextBeatmap?.Track != null)
                 nextBeatmap.Track.Completed += currentTrackCompleted;
 
-            using (var oldBeatmap = beatmap.OldValue)
-            {
-                if (oldBeatmap?.Track != null)
-                    oldBeatmap.Track.Completed -= currentTrackCompleted;
-            }
+            var oldBeatmap = beatmap.OldValue;
+            if (oldBeatmap?.Track != null)
+                oldBeatmap.Track.Completed -= currentTrackCompleted;
 
             updateModDefaults();
 
-            nextBeatmap?.LoadBeatmapAsync();
+            oldBeatmap?.CancelAsyncLoad();
+            nextBeatmap?.BeginAsyncLoad();
         }
 
         private void modsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 41ab7fce99..b203557fab 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -191,9 +191,9 @@ namespace osu.Game.Tests.Visual
                     track = audio?.Tracks.GetVirtual(length);
             }
 
-            protected override void Dispose(bool isDisposing)
+            ~ClockBackedTestWorkingBeatmap()
             {
-                base.Dispose(isDisposing);
+                // Remove the track store from the audio manager
                 store?.Dispose();
             }
 

From 668f36d7f3286f18bcc8a5c1fd26dcfa198cd512 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 10 Feb 2020 17:04:31 +0900
Subject: [PATCH 0365/1142] Clean up logging

---
 osu.Game/Beatmaps/WorkingBeatmap.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 6478b33e27..36479ddbb7 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -189,7 +189,7 @@ namespace osu.Game.Beatmaps
                         if (e is TaskCanceledException)
                             continue;
 
-                        Logger.Log(e.ToString());
+                        Logger.Log(e.Message);
                     }
 
                     return null;

From 8186f7250725472fd54039e91f44df57135a2f8d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 Feb 2020 17:12:45 +0900
Subject: [PATCH 0366/1142] Remove unused using

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 5be4d24b2b..7f36a23a86 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -17,7 +17,6 @@ using osu.Framework.Caching;
 using osu.Framework.Threading;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Input.Events;
-using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;

From 48781e5685bee2e428dd03e44b66979a2a8e7ed9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 10 Feb 2020 08:24:12 +0000
Subject: [PATCH 0367/1142] Bump Microsoft.NET.Test.Sdk from 16.4.0 to 16.5.0

Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.4.0 to 16.5.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.4.0...v16.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 .../osu.Game.Rulesets.Catch.Tests.csproj                        | 2 +-
 .../osu.Game.Rulesets.Mania.Tests.csproj                        | 2 +-
 osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj  | 2 +-
 .../osu.Game.Rulesets.Taiko.Tests.csproj                        | 2 +-
 osu.Game.Tests/osu.Game.Tests.csproj                            | 2 +-
 osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj b/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj
index 9559d13328..8c371db257 100644
--- a/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj
+++ b/osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj
@@ -2,7 +2,7 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
diff --git a/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj b/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj
index dea6e6c0fb..6855b99f28 100644
--- a/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj
+++ b/osu.Game.Rulesets.Mania.Tests/osu.Game.Rulesets.Mania.Tests.csproj
@@ -2,7 +2,7 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
diff --git a/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj b/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
index 9d4e016eae..217707b180 100644
--- a/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
+++ b/osu.Game.Rulesets.Osu.Tests/osu.Game.Rulesets.Osu.Tests.csproj
@@ -2,7 +2,7 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
diff --git a/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj b/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj
index d728d65bfd..f6054a5d6f 100644
--- a/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj
+++ b/osu.Game.Rulesets.Taiko.Tests/osu.Game.Rulesets.Taiko.Tests.csproj
@@ -2,7 +2,7 @@
   <Import Project="..\osu.TestProject.props" />
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 6c799e5e90..35eb3fa161 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -3,7 +3,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="DeepEqual" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
diff --git a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
index 7ecfd6ef70..3b45fc83fd 100644
--- a/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
+++ b/osu.Game.Tournament.Tests/osu.Game.Tournament.Tests.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
   </ItemGroup>

From 0ab3982494e59b4bad192c901073db53f4fd8034 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 10 Feb 2020 17:25:11 +0900
Subject: [PATCH 0368/1142] Unify error handling

---
 .../Beatmaps/BeatmapManager_WorkingBeatmap.cs    | 15 ++++++++++-----
 osu.Game/Beatmaps/WorkingBeatmap.cs              | 16 +++++++++-------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index f9d71a2a6e..55c5175c5d 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -36,8 +36,9 @@ namespace osu.Game.Beatmaps
                     using (var stream = new LineBufferedReader(store.GetStream(getPathForFile(BeatmapInfo.Path))))
                         return Decoder.GetDecoder<Beatmap>(stream).Decode(stream);
                 }
-                catch
+                catch (Exception e)
                 {
+                    Logger.Error(e, "Beatmap failed to load");
                     return null;
                 }
             }
@@ -59,8 +60,9 @@ namespace osu.Game.Beatmaps
                 {
                     return textureStore.Get(getPathForFile(Metadata.BackgroundFile));
                 }
-                catch
+                catch (Exception e)
                 {
+                    Logger.Error(e, "Background failed to load");
                     return null;
                 }
             }
@@ -74,8 +76,9 @@ namespace osu.Game.Beatmaps
                 {
                     return new VideoSprite(textureStore.GetStream(getPathForFile(Metadata.VideoFile)));
                 }
-                catch
+                catch (Exception e)
                 {
+                    Logger.Error(e, "Video failed to load");
                     return null;
                 }
             }
@@ -86,8 +89,9 @@ namespace osu.Game.Beatmaps
                 {
                     return (trackStore ??= AudioManager.GetTrackStore(store)).Get(getPathForFile(Metadata.AudioFile));
                 }
-                catch
+                catch (Exception e)
                 {
+                    Logger.Error(e, "Track failed to load");
                     return null;
                 }
             }
@@ -115,8 +119,9 @@ namespace osu.Game.Beatmaps
                     var trackData = store.GetStream(getPathForFile(Metadata.AudioFile));
                     return trackData == null ? null : new Waveform(trackData);
                 }
-                catch
+                catch (Exception e)
                 {
+                    Logger.Error(e, "Waveform failed to load");
                     return null;
                 }
             }
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 36479ddbb7..1e1ffad81e 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -184,14 +184,16 @@ namespace osu.Game.Beatmaps
                 }
                 catch (AggregateException ae)
                 {
-                    foreach (var e in ae.InnerExceptions)
-                    {
-                        if (e is TaskCanceledException)
-                            continue;
-
-                        Logger.Log(e.Message);
-                    }
+                    // This is the exception that is generally expected here, which occurs via natural cancellation of the asynchronous load
+                    if (ae.InnerExceptions.FirstOrDefault() is TaskCanceledException)
+                        return null;
 
+                    Logger.Error(ae, "Beatmap failed to load");
+                    return null;
+                }
+                catch (Exception e)
+                {
+                    Logger.Error(e, "Beatmap failed to load");
                     return null;
                 }
             }

From 926cde9afc14ecbd3c75b043b22b1383cec4e3f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 10 Feb 2020 18:17:27 +0900
Subject: [PATCH 0369/1142] Fix potential test failures

---
 .../Visual/SongSelect/TestScenePlaySongSelect.cs          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index a5145f420d..bd06089514 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -452,13 +452,13 @@ namespace osu.Game.Tests.Visual.SongSelect
                 Beatmap.Value = manager.GetWorkingBeatmap(target);
             });
 
-            AddUntilStep("correct beatmap selected", () => Beatmap.Value.BeatmapInfo.OnlineBeatmapID == target.OnlineBeatmapID);
-            AddAssert("carousel also correct", () => songSelect.Carousel.SelectedBeatmap.OnlineBeatmapID == target.OnlineBeatmapID);
+            AddUntilStep("carousel has correct", () => songSelect.Carousel.SelectedBeatmap?.OnlineBeatmapID == target.OnlineBeatmapID);
+            AddUntilStep("game has correct", () => Beatmap.Value.BeatmapInfo.OnlineBeatmapID == target.OnlineBeatmapID);
 
             AddStep("reset filter text", () => songSelect.FilterControl.ChildrenOfType<SearchTextBox>().First().Text = string.Empty);
 
-            AddAssert("still selected", () => Beatmap.Value.BeatmapInfo.OnlineBeatmapID == target.OnlineBeatmapID);
-            AddAssert("carousel also correct", () => songSelect.Carousel.SelectedBeatmap.OnlineBeatmapID == target.OnlineBeatmapID);
+            AddAssert("game still correct", () => Beatmap.Value?.BeatmapInfo.OnlineBeatmapID == target.OnlineBeatmapID);
+            AddAssert("carousel still correct", () => songSelect.Carousel.SelectedBeatmap.OnlineBeatmapID == target.OnlineBeatmapID);
         }
 
         [Test]

From 26afe0f31e4df35cfb530fd76d9f9eba83d56e53 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 10 Feb 2020 15:43:11 +0300
Subject: [PATCH 0370/1142] Add ability to load long comment trees in
 CommentsContainer

---
 .../Visual/Online/TestSceneCommentsPage.cs    |  38 +-
 .../API/Requests/GetCommentRepliesRequest.cs  |  45 ++
 .../Online/API/Requests/Responses/Comment.cs  |   6 -
 .../API/Requests/Responses/CommentBundle.cs   |  25 +-
 .../Overlays/Comments/CommentsContainer.cs    |  17 +-
 osu.Game/Overlays/Comments/CommentsPage.cs    |  58 ++-
 osu.Game/Overlays/Comments/DrawableComment.cs | 386 +++++++++++-------
 .../Comments/GetCommentRepliesButton.cs       |  45 ++
 .../Overlays/Comments/ShowChildrenButton.cs   |  13 +-
 9 files changed, 420 insertions(+), 213 deletions(-)
 create mode 100644 osu.Game/Online/API/Requests/GetCommentRepliesRequest.cs
 create mode 100644 osu.Game/Overlays/Comments/GetCommentRepliesButton.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsPage.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsPage.cs
index 1217ce6b42..0ed8864860 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsPage.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsPage.cs
@@ -58,8 +58,8 @@ namespace osu.Game.Tests.Visual.Online
                 }
             });
 
-            AddStep("load comments", () => createPage(comment_bundle));
-            AddStep("load empty comments", () => createPage(empty_comment_bundle));
+            AddStep("load comments", () => createPage(getCommentBundle()));
+            AddStep("load empty comments", () => createPage(getEmptyCommentBundle()));
         }
 
         private void createPage(CommentBundle commentBundle)
@@ -71,13 +71,12 @@ namespace osu.Game.Tests.Visual.Online
             });
         }
 
-        private static readonly CommentBundle empty_comment_bundle = new CommentBundle
+        private CommentBundle getEmptyCommentBundle() => new CommentBundle
         {
             Comments = new List<Comment>(),
-            Total = 0,
         };
 
-        private static readonly CommentBundle comment_bundle = new CommentBundle
+        private CommentBundle getCommentBundle() => new CommentBundle
         {
             Comments = new List<Comment>
             {
@@ -90,6 +89,33 @@ namespace osu.Game.Tests.Visual.Online
                     VotesCount = 5
                 },
                 new Comment
+                {
+                    Id = 100,
+                    Message = "This comment has \"load replies\" button because it has unloaded replies",
+                    LegacyName = "TestUser1100",
+                    CreatedAt = DateTimeOffset.Now,
+                    VotesCount = 5,
+                    RepliesCount = 2,
+                },
+                new Comment
+                {
+                    Id = 111,
+                    Message = "This comment has \"Show More\" button because it has unloaded replies, but some of them are loaded",
+                    LegacyName = "TestUser1111",
+                    CreatedAt = DateTimeOffset.Now,
+                    VotesCount = 100,
+                    RepliesCount = 2,
+                },
+                new Comment
+                {
+                    Id = 112,
+                    ParentId = 111,
+                    Message = "I'm here to make my parent work",
+                    LegacyName = "someone",
+                    CreatedAt = DateTimeOffset.Now,
+                    VotesCount = 2,
+                },
+                new Comment
                 {
                     Id = 2,
                     Message = "This comment has been deleted :( but visible for admins",
@@ -155,8 +181,6 @@ namespace osu.Game.Tests.Visual.Online
                     Username = "Good_Admin"
                 }
             },
-            TopLevelCount = 4,
-            Total = 7
         };
     }
 }
diff --git a/osu.Game/Online/API/Requests/GetCommentRepliesRequest.cs b/osu.Game/Online/API/Requests/GetCommentRepliesRequest.cs
new file mode 100644
index 0000000000..203f5d5635
--- /dev/null
+++ b/osu.Game/Online/API/Requests/GetCommentRepliesRequest.cs
@@ -0,0 +1,45 @@
+// 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 Humanizer;
+using osu.Framework.IO.Network;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays.Comments;
+
+namespace osu.Game.Online.API.Requests
+{
+    public class GetCommentRepliesRequest : APIRequest<CommentBundle>
+    {
+        private readonly long commentId;
+        private readonly CommentableType commentableType;
+        private readonly long commentableId;
+        private readonly int page;
+        private readonly CommentsSortCriteria sort;
+
+        public GetCommentRepliesRequest(long commentId, CommentableType commentableType, long commentableId, CommentsSortCriteria sort, int page)
+        {
+            this.commentId = commentId;
+            this.page = page;
+            this.sort = sort;
+
+            // These parameters are necessary to get deleted comments
+            this.commentableType = commentableType;
+            this.commentableId = commentableId;
+        }
+
+        protected override WebRequest CreateWebRequest()
+        {
+            var req = base.CreateWebRequest();
+
+            req.AddParameter("parent_id", commentId.ToString());
+            req.AddParameter("sort", sort.ToString().ToLowerInvariant());
+            req.AddParameter("commentable_type", commentableType.ToString().Underscore().ToLowerInvariant());
+            req.AddParameter("commentable_id", commentableId.ToString());
+            req.AddParameter("page", page.ToString());
+
+            return req;
+        }
+
+        protected override string Target => "comments";
+    }
+}
diff --git a/osu.Game/Online/API/Requests/Responses/Comment.cs b/osu.Game/Online/API/Requests/Responses/Comment.cs
index 3e38c3067b..05a24cec0e 100644
--- a/osu.Game/Online/API/Requests/Responses/Comment.cs
+++ b/osu.Game/Online/API/Requests/Responses/Comment.cs
@@ -4,8 +4,6 @@
 using Newtonsoft.Json;
 using osu.Game.Users;
 using System;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace osu.Game.Online.API.Requests.Responses
 {
@@ -17,8 +15,6 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty(@"parent_id")]
         public long? ParentId { get; set; }
 
-        public readonly List<Comment> ChildComments = new List<Comment>();
-
         public Comment ParentComment { get; set; }
 
         [JsonProperty(@"user_id")]
@@ -71,7 +67,5 @@ namespace osu.Game.Online.API.Requests.Responses
         public bool HasMessage => !string.IsNullOrEmpty(Message);
 
         public bool IsVoted { get; set; }
-
-        public int DeletedChildrenCount => ChildComments.Count(c => c.IsDeleted);
     }
 }
diff --git a/osu.Game/Online/API/Requests/Responses/CommentBundle.cs b/osu.Game/Online/API/Requests/Responses/CommentBundle.cs
index 9b3ef8b6e5..f4c81bf66f 100644
--- a/osu.Game/Online/API/Requests/Responses/CommentBundle.cs
+++ b/osu.Game/Online/API/Requests/Responses/CommentBundle.cs
@@ -9,31 +9,8 @@ namespace osu.Game.Online.API.Requests.Responses
 {
     public class CommentBundle
     {
-        private List<Comment> comments;
-
         [JsonProperty(@"comments")]
-        public List<Comment> Comments
-        {
-            get => comments;
-            set
-            {
-                comments = value;
-                comments.ForEach(child =>
-                {
-                    if (child.ParentId != null)
-                    {
-                        comments.ForEach(parent =>
-                        {
-                            if (parent.Id == child.ParentId)
-                            {
-                                parent.ChildComments.Add(child);
-                                child.ParentComment = parent;
-                            }
-                        });
-                    }
-                });
-            }
-        }
+        public List<Comment> Comments { get; set; }
 
         [JsonProperty(@"has_more")]
         public bool HasMore { get; set; }
diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index 33a6be0d7a..751fd8a353 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -18,8 +18,8 @@ namespace osu.Game.Overlays.Comments
 {
     public class CommentsContainer : CompositeDrawable
     {
-        private CommentableType type;
-        private long? id;
+        private readonly Bindable<CommentableType> type = new Bindable<CommentableType>();
+        private readonly BindableLong id = new BindableLong();
 
         public readonly Bindable<CommentsSortCriteria> Sort = new Bindable<CommentsSortCriteria>();
         public readonly BindableBool ShowDeleted = new BindableBool();
@@ -127,8 +127,8 @@ namespace osu.Game.Overlays.Comments
         /// <param name="id">The id of the resource to get comments for.</param>
         public void ShowComments(CommentableType type, long id)
         {
-            this.type = type;
-            this.id = id;
+            this.type.Value = type;
+            this.id.Value = id;
 
             if (!IsLoaded)
                 return;
@@ -147,12 +147,12 @@ namespace osu.Game.Overlays.Comments
 
         private void getComments()
         {
-            if (!id.HasValue)
+            if (id.Value == 0)
                 return;
 
             request?.Cancel();
             loadCancellation?.Cancel();
-            request = new GetCommentsRequest(type, id.Value, Sort.Value, currentPage++);
+            request = new GetCommentsRequest(type.Value, id.Value, Sort.Value, currentPage++);
             request.Success += onSuccess;
             api.PerformAsync(request);
         }
@@ -172,7 +172,10 @@ namespace osu.Game.Overlays.Comments
 
             LoadComponentAsync(new CommentsPage(response)
             {
-                ShowDeleted = { BindTarget = ShowDeleted }
+                ShowDeleted = { BindTarget = ShowDeleted },
+                Sort = { BindTarget = Sort },
+                Type = { BindTarget = type },
+                CommentableId = { BindTarget = id }
             }, loaded =>
             {
                 content.Add(loaded);
diff --git a/osu.Game/Overlays/Comments/CommentsPage.cs b/osu.Game/Overlays/Comments/CommentsPage.cs
index 153ce676eb..976af72abb 100644
--- a/osu.Game/Overlays/Comments/CommentsPage.cs
+++ b/osu.Game/Overlays/Comments/CommentsPage.cs
@@ -9,12 +9,22 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics.Sprites;
 using System.Linq;
+using osu.Game.Online.API.Requests;
+using osu.Game.Online.API;
+using System.Collections.Generic;
+using osu.Framework.Extensions.IEnumerableExtensions;
 
 namespace osu.Game.Overlays.Comments
 {
     public class CommentsPage : CompositeDrawable
     {
         public readonly BindableBool ShowDeleted = new BindableBool();
+        public readonly Bindable<CommentsSortCriteria> Sort = new Bindable<CommentsSortCriteria>();
+        public readonly Bindable<CommentableType> Type = new Bindable<CommentableType>();
+        public readonly BindableLong CommentableId = new BindableLong();
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
 
         private readonly CommentBundle commentBundle;
 
@@ -52,18 +62,58 @@ namespace osu.Game.Overlays.Comments
                 return;
             }
 
-            foreach (var c in commentBundle.Comments)
+            foreach (var comment in commentBundle.Comments)
             {
-                if (c.IsTopLevel)
+                var drawableComment = createDrawableComment(comment);
+
+                var children = commentBundle.Comments.Where(c => c.ParentId == comment.Id);
+
+                if (children.Any())
                 {
-                    flow.Add(new DrawableComment(c)
+                    children.ForEach(c =>
                     {
-                        ShowDeleted = { BindTarget = ShowDeleted }
+                        c.ParentComment = comment;
                     });
+                    drawableComment.OnLoadComplete += loaded => ((DrawableComment)loaded).AddReplies(children.Select(c => createDrawableComment(c)));
                 }
+
+                if (comment.IsTopLevel)
+                    flow.Add(drawableComment);
             }
         }
 
+        private void onCommentRepliesRequested(DrawableComment drawableComment, int page)
+        {
+            var request = new GetCommentRepliesRequest(drawableComment.Comment.Id, Type.Value, CommentableId.Value, Sort.Value, page);
+            request.Success += response => onCommentRepliesReceived(response, drawableComment);
+            api.PerformAsync(request);
+        }
+
+        private void onCommentRepliesReceived(CommentBundle response, DrawableComment drawableComment)
+        {
+            var receivedComments = response.Comments;
+
+            var uniqueComments = new List<Comment>();
+
+            // We may receive already loaded comments
+            receivedComments.ForEach(c =>
+            {
+                if (drawableComment.LoadedReplies.All(loadedReply => loadedReply.Id != c.Id))
+                    uniqueComments.Add(c);
+            });
+
+            uniqueComments.ForEach(c => c.ParentComment = drawableComment.Comment);
+
+            drawableComment.AddReplies(uniqueComments.Select(comment => createDrawableComment(comment)));
+        }
+
+        private DrawableComment createDrawableComment(Comment comment) => new DrawableComment(comment)
+        {
+            ShowDeleted = { BindTarget = ShowDeleted },
+            Sort = { BindTarget = Sort },
+            RepliesRequested = onCommentRepliesRequested
+        };
+
         private class NoCommentsPlaceholder : CompositeDrawable
         {
             [BackgroundDependencyLoader]
diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index 70ea478814..e7aac3c44d 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -12,11 +12,14 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Utils;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics.Shapes;
 using System.Linq;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Chat;
 using osu.Framework.Allocation;
+using osuTK.Graphics;
+using System.Collections.Generic;
+using System;
+using osu.Framework.Graphics.Shapes;
 
 namespace osu.Game.Overlays.Comments
 {
@@ -25,24 +28,35 @@ namespace osu.Game.Overlays.Comments
         private const int avatar_size = 40;
         private const int margin = 10;
 
+        public Action<DrawableComment, int> RepliesRequested;
+
+        public readonly Comment Comment;
+
         public readonly BindableBool ShowDeleted = new BindableBool();
+        public readonly Bindable<CommentsSortCriteria> Sort = new Bindable<CommentsSortCriteria>();
+        public readonly List<Comment> LoadedReplies = new List<Comment>();
 
         private readonly BindableBool childrenExpanded = new BindableBool(true);
 
+        private int currentPage;
+
         private FillFlowContainer childCommentsVisibilityContainer;
-        private readonly Comment comment;
+        private FillFlowContainer childCommentsContainer;
+        private LoadMoreCommentsButton loadMoreCommentsButton;
+        private ShowMoreButton showMoreButton;
+        private RepliesButton repliesButton;
+        private ChevronButton chevronButton;
+        private DeletedCommentsCounter deletedCommentsCounter;
 
         public DrawableComment(Comment comment)
         {
-            this.comment = comment;
+            Comment = comment;
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
             LinkFlowContainer username;
-            FillFlowContainer childCommentsContainer;
-            DeletedCommentsCounter deletedCommentsCounter;
             FillFlowContainer info;
             LinkFlowContainer message;
             GridContainer content;
@@ -50,234 +64,267 @@ namespace osu.Game.Overlays.Comments
 
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
-            InternalChild = new FillFlowContainer
+            InternalChildren = new Drawable[]
             {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                Direction = FillDirection.Vertical,
-                Children = new Drawable[]
+                new FillFlowContainer
                 {
-                    new Container
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
                     {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Padding = new MarginPadding(margin) { Left = margin + 5 },
-                        Child = content = new GridContainer
+                        new Container
                         {
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
-                            ColumnDimensions = new[]
+                            Padding = new MarginPadding(margin) { Left = margin + 5 },
+                            Child = content = new GridContainer
                             {
-                                new Dimension(GridSizeMode.AutoSize),
-                                new Dimension(),
-                            },
-                            RowDimensions = new[]
-                            {
-                                new Dimension(GridSizeMode.AutoSize)
-                            },
-                            Content = new[]
-                            {
-                                new Drawable[]
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                                ColumnDimensions = new[]
                                 {
-                                    new FillFlowContainer
+                                    new Dimension(GridSizeMode.AutoSize),
+                                    new Dimension(),
+                                },
+                                RowDimensions = new[]
+                                {
+                                    new Dimension(GridSizeMode.AutoSize)
+                                },
+                                Content = new[]
+                                {
+                                    new Drawable[]
                                     {
-                                        AutoSizeAxes = Axes.Both,
-                                        Margin = new MarginPadding { Horizontal = margin },
-                                        Direction = FillDirection.Horizontal,
-                                        Spacing = new Vector2(5, 0),
-                                        Children = new Drawable[]
+                                        new FillFlowContainer
                                         {
-                                            new Container
+                                            AutoSizeAxes = Axes.Both,
+                                            Margin = new MarginPadding { Horizontal = margin },
+                                            Direction = FillDirection.Horizontal,
+                                            Spacing = new Vector2(5, 0),
+                                            Children = new Drawable[]
                                             {
-                                                Anchor = Anchor.Centre,
-                                                Origin = Anchor.Centre,
-                                                Width = 40,
-                                                AutoSizeAxes = Axes.Y,
-                                                Child = votePill = new VotePill(comment)
+                                                new Container
                                                 {
-                                                    Anchor = Anchor.CentreRight,
-                                                    Origin = Anchor.CentreRight,
-                                                }
-                                            },
-                                            new UpdateableAvatar(comment.User)
-                                            {
-                                                Anchor = Anchor.Centre,
-                                                Origin = Anchor.Centre,
-                                                Size = new Vector2(avatar_size),
-                                                Masking = true,
-                                                CornerRadius = avatar_size / 2f,
-                                                CornerExponent = 2,
-                                            },
-                                        }
-                                    },
-                                    new FillFlowContainer
-                                    {
-                                        RelativeSizeAxes = Axes.X,
-                                        AutoSizeAxes = Axes.Y,
-                                        Spacing = new Vector2(0, 3),
-                                        Children = new Drawable[]
-                                        {
-                                            new FillFlowContainer
-                                            {
-                                                AutoSizeAxes = Axes.Both,
-                                                Direction = FillDirection.Horizontal,
-                                                Spacing = new Vector2(7, 0),
-                                                Children = new Drawable[]
-                                                {
-                                                    username = new LinkFlowContainer(s => s.Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true))
+                                                    Anchor = Anchor.Centre,
+                                                    Origin = Anchor.Centre,
+                                                    Width = 40,
+                                                    AutoSizeAxes = Axes.Y,
+                                                    Child = votePill = new VotePill(Comment)
                                                     {
-                                                        AutoSizeAxes = Axes.Both,
-                                                    },
-                                                    new ParentUsername(comment),
-                                                    new OsuSpriteText
-                                                    {
-                                                        Alpha = comment.IsDeleted ? 1 : 0,
-                                                        Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true),
-                                                        Text = @"deleted",
+                                                        Anchor = Anchor.CentreRight,
+                                                        Origin = Anchor.CentreRight,
                                                     }
-                                                }
-                                            },
-                                            message = new LinkFlowContainer(s => s.Font = OsuFont.GetFont(size: 14))
-                                            {
-                                                RelativeSizeAxes = Axes.X,
-                                                AutoSizeAxes = Axes.Y,
-                                                Padding = new MarginPadding { Right = 40 }
-                                            },
-                                            info = new FillFlowContainer
-                                            {
-                                                AutoSizeAxes = Axes.Both,
-                                                Direction = FillDirection.Horizontal,
-                                                Spacing = new Vector2(10, 0),
-                                                Colour = OsuColour.Gray(0.7f),
-                                                Children = new Drawable[]
+                                                },
+                                                new UpdateableAvatar(Comment.User)
                                                 {
-                                                    new OsuSpriteText
+                                                    Anchor = Anchor.Centre,
+                                                    Origin = Anchor.Centre,
+                                                    Size = new Vector2(avatar_size),
+                                                    Masking = true,
+                                                    CornerRadius = avatar_size / 2f,
+                                                    CornerExponent = 2,
+                                                },
+                                            }
+                                        },
+                                        new FillFlowContainer
+                                        {
+                                            RelativeSizeAxes = Axes.X,
+                                            AutoSizeAxes = Axes.Y,
+                                            Spacing = new Vector2(0, 3),
+                                            Children = new Drawable[]
+                                            {
+                                                new FillFlowContainer
+                                                {
+                                                    AutoSizeAxes = Axes.Both,
+                                                    Direction = FillDirection.Horizontal,
+                                                    Spacing = new Vector2(7, 0),
+                                                    Children = new Drawable[]
                                                     {
-                                                        Anchor = Anchor.CentreLeft,
-                                                        Origin = Anchor.CentreLeft,
-                                                        Font = OsuFont.GetFont(size: 12),
-                                                        Text = HumanizerUtils.Humanize(comment.CreatedAt)
-                                                    },
-                                                    new RepliesButton(comment.RepliesCount)
+                                                        username = new LinkFlowContainer(s => s.Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true))
+                                                        {
+                                                            AutoSizeAxes = Axes.Both,
+                                                        },
+                                                        new ParentUsername(Comment),
+                                                        new OsuSpriteText
+                                                        {
+                                                            Alpha = Comment.IsDeleted ? 1 : 0,
+                                                            Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true),
+                                                            Text = @"deleted",
+                                                        }
+                                                    }
+                                                },
+                                                message = new LinkFlowContainer(s => s.Font = OsuFont.GetFont(size: 14))
+                                                {
+                                                    RelativeSizeAxes = Axes.X,
+                                                    AutoSizeAxes = Axes.Y,
+                                                    Padding = new MarginPadding { Right = 40 }
+                                                },
+                                                info = new FillFlowContainer
+                                                {
+                                                    AutoSizeAxes = Axes.Both,
+                                                    Direction = FillDirection.Horizontal,
+                                                    Spacing = new Vector2(10, 0),
+                                                    Children = new Drawable[]
                                                     {
-                                                        Expanded = { BindTarget = childrenExpanded }
-                                                    },
+                                                        new OsuSpriteText
+                                                        {
+                                                            Anchor = Anchor.CentreLeft,
+                                                            Origin = Anchor.CentreLeft,
+                                                            Font = OsuFont.GetFont(size: 12),
+                                                            Colour = OsuColour.Gray(0.7f),
+                                                            Text = HumanizerUtils.Humanize(Comment.CreatedAt)
+                                                        },
+                                                        repliesButton = new RepliesButton(Comment.RepliesCount)
+                                                        {
+                                                            Expanded = { BindTarget = childrenExpanded }
+                                                        },
+                                                        loadMoreCommentsButton = new LoadMoreCommentsButton
+                                                        {
+                                                            Action = () => RepliesRequested(this, ++currentPage)
+                                                        }
+                                                    }
                                                 }
                                             }
                                         }
                                     }
                                 }
                             }
-                        }
-                    },
-                    childCommentsVisibilityContainer = new FillFlowContainer
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Direction = FillDirection.Vertical,
-                        Children = new Drawable[]
+                        },
+                        childCommentsVisibilityContainer = new FillFlowContainer
                         {
-                            childCommentsContainer = new FillFlowContainer
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Direction = FillDirection.Vertical,
+                            Children = new Drawable[]
                             {
-                                Padding = new MarginPadding { Left = 20 },
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                                Direction = FillDirection.Vertical
-                            },
-                            deletedCommentsCounter = new DeletedCommentsCounter
-                            {
-                                ShowDeleted = { BindTarget = ShowDeleted }
+                                childCommentsContainer = new FillFlowContainer
+                                {
+                                    Padding = new MarginPadding { Left = 20 },
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Direction = FillDirection.Vertical
+                                },
+                                deletedCommentsCounter = new DeletedCommentsCounter
+                                {
+                                    ShowDeleted = { BindTarget = ShowDeleted }
+                                },
+                                showMoreButton = new ShowMoreButton
+                                {
+                                    Action = () => RepliesRequested(this, ++currentPage)
+                                }
                             }
-                        }
+                        },
                     }
+                },
+                chevronButton = new ChevronButton
+                {
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight,
+                    Margin = new MarginPadding { Right = 30, Top = margin },
+                    Expanded = { BindTarget = childrenExpanded },
+                    Alpha = 0
                 }
             };
 
-            deletedCommentsCounter.Count.Value = comment.DeletedChildrenCount;
-
-            if (comment.UserId.HasValue)
-                username.AddUserLink(comment.User);
+            if (Comment.UserId.HasValue)
+                username.AddUserLink(Comment.User);
             else
-                username.AddText(comment.LegacyName);
+                username.AddText(Comment.LegacyName);
 
-            if (comment.EditedAt.HasValue)
+            if (Comment.EditedAt.HasValue)
             {
                 info.Add(new OsuSpriteText
                 {
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
                     Font = OsuFont.GetFont(size: 12),
-                    Text = $@"edited {HumanizerUtils.Humanize(comment.EditedAt.Value)} by {comment.EditedUser.Username}"
+                    Text = $@"edited {HumanizerUtils.Humanize(Comment.EditedAt.Value)} by {Comment.EditedUser.Username}"
                 });
             }
 
-            if (comment.HasMessage)
+            if (Comment.HasMessage)
             {
-                var formattedSource = MessageFormatter.FormatText(comment.Message);
+                var formattedSource = MessageFormatter.FormatText(Comment.Message);
                 message.AddLinks(formattedSource.Text, formattedSource.Links);
             }
 
-            if (comment.IsDeleted)
+            if (Comment.IsDeleted)
             {
                 content.FadeColour(OsuColour.Gray(0.5f));
                 votePill.Hide();
             }
 
-            if (comment.IsTopLevel)
+            if (Comment.IsTopLevel)
             {
-                AddInternal(new Container
+                AddInternal(new Box
                 {
-                    RelativeSizeAxes = Axes.X,
-                    Height = 1.5f,
                     Anchor = Anchor.BottomCentre,
                     Origin = Anchor.BottomCentre,
-                    Child = new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = OsuColour.Gray(0.1f)
-                    }
+                    RelativeSizeAxes = Axes.X,
+                    Height = 1.5f,
+                    Colour = OsuColour.Gray(0.1f)
                 });
-
-                if (comment.ChildComments.Any())
-                {
-                    AddInternal(new ChevronButton(comment)
-                    {
-                        Anchor = Anchor.TopRight,
-                        Origin = Anchor.TopRight,
-                        Margin = new MarginPadding { Right = 30, Top = margin },
-                        Expanded = { BindTarget = childrenExpanded }
-                    });
-                }
             }
-
-            comment.ChildComments.ForEach(c => childCommentsContainer.Add(new DrawableComment(c)
-            {
-                ShowDeleted = { BindTarget = ShowDeleted }
-            }));
         }
 
         protected override void LoadComplete()
         {
             ShowDeleted.BindValueChanged(show =>
             {
-                if (comment.IsDeleted)
+                if (Comment.IsDeleted)
                     this.FadeTo(show.NewValue ? 1 : 0);
             }, true);
             childrenExpanded.BindValueChanged(expanded => childCommentsVisibilityContainer.FadeTo(expanded.NewValue ? 1 : 0), true);
+
+            updateButtonsState();
+
             base.LoadComplete();
         }
 
+        public void AddReplies(IEnumerable<DrawableComment> replies)
+        {
+            LoadComponentAsync(createRepliesPage(replies), page =>
+            {
+                var newReplies = replies.Select(reply => reply.Comment);
+                LoadedReplies.AddRange(newReplies);
+                deletedCommentsCounter.Count.Value += newReplies.Count(reply => reply.IsDeleted);
+                childCommentsContainer.Add(page);                
+                updateButtonsState();
+            });
+        }
+
+        private FillFlowContainer<DrawableComment> createRepliesPage(IEnumerable<DrawableComment> replies) => new FillFlowContainer<DrawableComment>
+        {
+            RelativeSizeAxes = Axes.X,
+            AutoSizeAxes = Axes.Y,
+            Direction = FillDirection.Vertical,
+            Children = replies.ToList()
+        };
+
+        private void updateButtonsState()
+        {
+            var loadedReplesCount = LoadedReplies.Count;
+            var hasUnloadedReplies = loadedReplesCount != Comment.RepliesCount;
+
+            loadMoreCommentsButton.FadeTo(hasUnloadedReplies && loadedReplesCount == 0 ? 1 : 0);
+            showMoreButton.FadeTo(hasUnloadedReplies && loadedReplesCount > 0 ? 1 : 0);
+            repliesButton.FadeTo(loadedReplesCount != 0 ? 1 : 0);
+
+            if (Comment.IsTopLevel)
+                chevronButton.FadeTo(loadedReplesCount != 0 ? 1 : 0);
+
+            showMoreButton.IsLoading = loadMoreCommentsButton.IsLoading = false;
+        }
+
         private class ChevronButton : ShowChildrenButton
         {
             private readonly SpriteIcon icon;
 
-            public ChevronButton(Comment comment)
+            public ChevronButton()
             {
-                Alpha = comment.IsTopLevel && comment.ChildComments.Any() ? 1 : 0;
                 Child = icon = new SpriteIcon
                 {
                     Size = new Vector2(12),
-                    Colour = OsuColour.Gray(0.7f)
                 };
             }
 
@@ -296,7 +343,6 @@ namespace osu.Game.Overlays.Comments
             {
                 this.count = count;
 
-                Alpha = count == 0 ? 0 : 1;
                 Child = text = new OsuSpriteText
                 {
                     Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
@@ -309,6 +355,30 @@ namespace osu.Game.Overlays.Comments
             }
         }
 
+        private class LoadMoreCommentsButton : GetCommentRepliesButton
+        {
+            public LoadMoreCommentsButton()
+            {
+                IdleColour = OsuColour.Gray(0.7f);
+                HoverColour = Color4.White;
+            }
+
+            protected override string GetText() => @"[+] load replies";
+        }
+
+        private class ShowMoreButton : GetCommentRepliesButton
+        {
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                Margin = new MarginPadding { Vertical = 10, Left = 80 };
+                IdleColour = colourProvider.Light2;
+                HoverColour = colourProvider.Light1;
+            }
+
+            protected override string GetText() => @"Show More";
+        }
+
         private class ParentUsername : FillFlowContainer, IHasTooltip
         {
             public string TooltipText => getParentMessage();
diff --git a/osu.Game/Overlays/Comments/GetCommentRepliesButton.cs b/osu.Game/Overlays/Comments/GetCommentRepliesButton.cs
new file mode 100644
index 0000000000..a3817ba416
--- /dev/null
+++ b/osu.Game/Overlays/Comments/GetCommentRepliesButton.cs
@@ -0,0 +1,45 @@
+// 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.Graphics;
+using osu.Game.Graphics.UserInterface;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using System.Collections.Generic;
+using osuTK;
+
+namespace osu.Game.Overlays.Comments
+{
+    public abstract class GetCommentRepliesButton : LoadingButton
+    {
+        private const int duration = 200;
+
+        protected override IEnumerable<Drawable> EffectTargets => new[] { text };
+
+        private OsuSpriteText text;
+
+        protected GetCommentRepliesButton()
+        {
+            AutoSizeAxes = Axes.Both;
+            LoadingAnimationSize = new Vector2(8);
+        }
+
+        protected override Drawable CreateContent() => new Container
+        {
+            AutoSizeAxes = Axes.Both,
+            Child = text = new OsuSpriteText
+            {
+                AlwaysPresent = true,
+                Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
+                Text = GetText()
+            }
+        };
+
+        protected abstract string GetText();
+
+        protected override void OnLoadStarted() => text.FadeOut(duration, Easing.OutQuint);
+
+        protected override void OnLoadFinished() => text.FadeIn(duration, Easing.OutQuint);
+    }
+}
diff --git a/osu.Game/Overlays/Comments/ShowChildrenButton.cs b/osu.Game/Overlays/Comments/ShowChildrenButton.cs
index be04b6e5de..5ec7c1d471 100644
--- a/osu.Game/Overlays/Comments/ShowChildrenButton.cs
+++ b/osu.Game/Overlays/Comments/ShowChildrenButton.cs
@@ -3,8 +3,9 @@
 
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Containers;
-using osu.Framework.Input.Events;
 using osu.Framework.Bindables;
+using osuTK.Graphics;
+using osu.Game.Graphics;
 
 namespace osu.Game.Overlays.Comments
 {
@@ -15,20 +16,18 @@ namespace osu.Game.Overlays.Comments
         protected ShowChildrenButton()
         {
             AutoSizeAxes = Axes.Both;
+            IdleColour = OsuColour.Gray(0.7f);
+            HoverColour = Color4.White;
         }
 
         protected override void LoadComplete()
         {
+            Action = Expanded.Toggle;
+
             Expanded.BindValueChanged(OnExpandedChanged, true);
             base.LoadComplete();
         }
 
         protected abstract void OnExpandedChanged(ValueChangedEvent<bool> expanded);
-
-        protected override bool OnClick(ClickEvent e)
-        {
-            Expanded.Value = !Expanded.Value;
-            return true;
-        }
     }
 }

From 8239f21cad20a4d3ea780a45d8832798c2de53ee Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 10 Feb 2020 15:52:12 +0300
Subject: [PATCH 0371/1142] Remove whitespace

---
 osu.Game/Overlays/Comments/DrawableComment.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index e7aac3c44d..b0062ca1e5 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -288,7 +288,7 @@ namespace osu.Game.Overlays.Comments
                 var newReplies = replies.Select(reply => reply.Comment);
                 LoadedReplies.AddRange(newReplies);
                 deletedCommentsCounter.Count.Value += newReplies.Count(reply => reply.IsDeleted);
-                childCommentsContainer.Add(page);                
+                childCommentsContainer.Add(page);
                 updateButtonsState();
             });
         }

From d20a86087920b06598c4dfe42097784d2f91be9f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 10 Feb 2020 16:08:58 +0300
Subject: [PATCH 0372/1142] CI fix

---
 osu.Game/Overlays/Comments/CommentsPage.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentsPage.cs b/osu.Game/Overlays/Comments/CommentsPage.cs
index 976af72abb..a6651aa325 100644
--- a/osu.Game/Overlays/Comments/CommentsPage.cs
+++ b/osu.Game/Overlays/Comments/CommentsPage.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Overlays.Comments
                     {
                         c.ParentComment = comment;
                     });
-                    drawableComment.OnLoadComplete += loaded => ((DrawableComment)loaded).AddReplies(children.Select(c => createDrawableComment(c)));
+                    drawableComment.OnLoadComplete += loaded => ((DrawableComment)loaded).AddReplies(children.Select(createDrawableComment));
                 }
 
                 if (comment.IsTopLevel)
@@ -104,7 +104,7 @@ namespace osu.Game.Overlays.Comments
 
             uniqueComments.ForEach(c => c.ParentComment = drawableComment.Comment);
 
-            drawableComment.AddReplies(uniqueComments.Select(comment => createDrawableComment(comment)));
+            drawableComment.AddReplies(uniqueComments.Select(createDrawableComment));
         }
 
         private DrawableComment createDrawableComment(Comment comment) => new DrawableComment(comment)

From e2950d7027003db5f9f1327cefae551a9a745117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 10 Feb 2020 20:27:46 +0100
Subject: [PATCH 0373/1142] Extract method to avoid nested ternaries

---
 .../BeatmapSet/Buttons/HeaderDownloadButton.cs         | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs
index 5ed15cecd5..53003b0488 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs
@@ -150,7 +150,7 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
                             },
                             new OsuSpriteText
                             {
-                                Text = BeatmapSet.Value.OnlineInfo.HasVideo ? (noVideo ? "without Video" : "with Video") : string.Empty,
+                                Text = getVideoSuffixText(),
                                 Font = OsuFont.GetFont(size: 11, weight: FontWeight.Bold)
                             },
                         };
@@ -163,5 +163,13 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
         private void userChanged(ValueChangedEvent<User> e) => button.Enabled.Value = !(e.NewValue is GuestUser);
 
         private void enabledChanged(ValueChangedEvent<bool> e) => this.FadeColour(e.NewValue ? Color4.White : Color4.Gray, 200, Easing.OutQuint);
+
+        private string getVideoSuffixText()
+        {
+            if (!BeatmapSet.Value.OnlineInfo.HasVideo)
+                return string.Empty;
+
+            return noVideo ? "without Video" : "with Video";
+        }
     }
 }

From 811553cd60e47cca3d86386dc9b9c5c561255e7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 10 Feb 2020 20:37:34 +0100
Subject: [PATCH 0374/1142] Remove unnecessary coercions

Comparisons to null of nullable numbers are always false.
---
 osu.Game/Overlays/BeatmapSet/Details.cs | 2 +-
 osu.Game/Overlays/BeatmapSet/Info.cs    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Details.cs b/osu.Game/Overlays/BeatmapSet/Details.cs
index bd13b4371e..488e181fa2 100644
--- a/osu.Game/Overlays/BeatmapSet/Details.cs
+++ b/osu.Game/Overlays/BeatmapSet/Details.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Overlays.BeatmapSet
         private void updateDisplay()
         {
             Ratings.Metrics = BeatmapSet?.Metrics;
-            ratingBox.Alpha = (BeatmapSet?.OnlineInfo?.Status ?? 0) > 0 ? 1 : 0;
+            ratingBox.Alpha = BeatmapSet?.OnlineInfo?.Status > 0 ? 1 : 0;
         }
 
         public Details()
diff --git a/osu.Game/Overlays/BeatmapSet/Info.cs b/osu.Game/Overlays/BeatmapSet/Info.cs
index 0a5415124e..85e871baca 100644
--- a/osu.Game/Overlays/BeatmapSet/Info.cs
+++ b/osu.Game/Overlays/BeatmapSet/Info.cs
@@ -132,7 +132,7 @@ namespace osu.Game.Overlays.BeatmapSet
                 tags.Text = b.NewValue?.Metadata.Tags ?? string.Empty;
                 genre.Text = b.NewValue?.OnlineInfo?.Genre?.Name ?? string.Empty;
                 language.Text = b.NewValue?.OnlineInfo?.Language?.Name ?? string.Empty;
-                var setHasLeaderboard = (b.NewValue?.OnlineInfo?.Status ?? 0) > 0;
+                var setHasLeaderboard = b.NewValue?.OnlineInfo?.Status > 0;
                 successRate.Alpha = setHasLeaderboard ? 1 : 0;
                 unrankedPlaceholder.Alpha = setHasLeaderboard ? 0 : 1;
             };

From 35d5237dddf677dee02c7d2fc622e1d78abcacc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 10 Feb 2020 20:40:39 +0100
Subject: [PATCH 0375/1142] Adjust font sizes

---
 osu.Game/Overlays/BeatmapSet/Header.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index ab7b2d82ed..5f4782573d 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Overlays.BeatmapSet
                                                 {
                                                     title = new OsuSpriteText
                                                     {
-                                                        Font = OsuFont.GetFont(size: 37, weight: FontWeight.SemiBold, italics: true)
+                                                        Font = OsuFont.GetFont(size: 37.5f, weight: FontWeight.SemiBold, italics: true)
                                                     },
                                                     externalLink = new ExternalLinkButton
                                                     {
@@ -144,7 +144,7 @@ namespace osu.Game.Overlays.BeatmapSet
                                                     },
                                                 }
                                             },
-                                            artist = new OsuSpriteText { Font = OsuFont.GetFont(size: 25, weight: FontWeight.Medium, italics: true) },
+                                            artist = new OsuSpriteText { Font = OsuFont.GetFont(size: 20, weight: FontWeight.Medium, italics: true) },
                                             new Container
                                             {
                                                 RelativeSizeAxes = Axes.X,

From e072042d4ecfd8e81517b34a845ebff5114e582c Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Mon, 10 Feb 2020 21:11:49 +0100
Subject: [PATCH 0376/1142] Match osu-web font size

---
 osu.Game/Overlays/BeatmapSet/Header.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index 5f4782573d..29f09a1ad8 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Overlays.BeatmapSet
                                                 {
                                                     title = new OsuSpriteText
                                                     {
-                                                        Font = OsuFont.GetFont(size: 37.5f, weight: FontWeight.SemiBold, italics: true)
+                                                        Font = OsuFont.GetFont(size: 30, weight: FontWeight.SemiBold, italics: true)
                                                     },
                                                     externalLink = new ExternalLinkButton
                                                     {

From 15b4e3386f94ba7dc5c5fe9895169dc4bcb1bf04 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 10 Feb 2020 23:57:48 +0300
Subject: [PATCH 0377/1142] Fix incorrect algorithm for comment tree creation

Can cause one comment to be redrawn multiple times
---
 osu.Game/Overlays/Comments/CommentsPage.cs | 28 ++++++++++++----------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentsPage.cs b/osu.Game/Overlays/Comments/CommentsPage.cs
index a6651aa325..eb1044c853 100644
--- a/osu.Game/Overlays/Comments/CommentsPage.cs
+++ b/osu.Game/Overlays/Comments/CommentsPage.cs
@@ -62,24 +62,26 @@ namespace osu.Game.Overlays.Comments
                 return;
             }
 
-            foreach (var comment in commentBundle.Comments)
+            commentBundle.Comments.ForEach(c =>
             {
-                var drawableComment = createDrawableComment(comment);
+                if (c.IsTopLevel)
+                    flow.Add(createCommentWithReplies(c, commentBundle));
+            });
+        }
 
-                var children = commentBundle.Comments.Where(c => c.ParentId == comment.Id);
+        private DrawableComment createCommentWithReplies(Comment comment, CommentBundle commentBundle)
+        {
+            var drawableComment = createDrawableComment(comment);
 
-                if (children.Any())
-                {
-                    children.ForEach(c =>
-                    {
-                        c.ParentComment = comment;
-                    });
-                    drawableComment.OnLoadComplete += loaded => ((DrawableComment)loaded).AddReplies(children.Select(createDrawableComment));
-                }
+            var replies = commentBundle.Comments.Where(c => c.ParentId == comment.Id);
 
-                if (comment.IsTopLevel)
-                    flow.Add(drawableComment);
+            if (replies.Any())
+            {
+                replies.ForEach(c => c.ParentComment = comment);
+                drawableComment.OnLoadComplete += _ => drawableComment.AddReplies(replies.Select(reply => createCommentWithReplies(reply, commentBundle)));
             }
+
+            return drawableComment;
         }
 
         private void onCommentRepliesRequested(DrawableComment drawableComment, int page)

From b04a4b5c8ac28f3eb70150efee23f6085395854d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 Feb 2020 01:44:56 +0300
Subject: [PATCH 0378/1142] Implement SpotlightsLayout

---
 .../TestSceneRankingsSpotlightSelector.cs     |   6 -
 .../Online/TestSceneSpotlightsLayout.cs       |  55 ++++++
 .../Rankings/RankingsOverlayHeader.cs         |   6 +-
 .../Overlays/Rankings/SpotlightSelector.cs    |  86 ++++------
 .../Overlays/Rankings/SpotlightsLayout.cs     | 158 ++++++++++++++++++
 5 files changed, 249 insertions(+), 62 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneSpotlightsLayout.cs
 create mode 100644 osu.Game/Overlays/Rankings/SpotlightsLayout.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
index f27ab1e775..e46c8a4a71 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
@@ -35,12 +35,6 @@ namespace osu.Game.Tests.Visual.Online
             Add(selector = new SpotlightSelector());
         }
 
-        [Test]
-        public void TestVisibility()
-        {
-            AddStep("Toggle Visibility", selector.ToggleVisibility);
-        }
-
         [Test]
         public void TestLocalSpotlights()
         {
diff --git a/osu.Game.Tests/Visual/Online/TestSceneSpotlightsLayout.cs b/osu.Game.Tests/Visual/Online/TestSceneSpotlightsLayout.cs
new file mode 100644
index 0000000000..d025a8d7c2
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneSpotlightsLayout.cs
@@ -0,0 +1,55 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Rankings;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Catch;
+using osu.Game.Rulesets.Mania;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Taiko;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneSpotlightsLayout : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(SpotlightsLayout),
+            typeof(SpotlightSelector),
+        };
+
+        protected override bool UseOnlineAPI => true;
+
+        [Cached]
+        private readonly OverlayColourProvider overlayColour = new OverlayColourProvider(OverlayColourScheme.Green);
+
+        public TestSceneSpotlightsLayout()
+        {
+            var ruleset = new Bindable<RulesetInfo>(new OsuRuleset().RulesetInfo);
+
+            Add(new BasicScrollContainer
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.Both,
+                Width = 0.8f,
+                Child = new SpotlightsLayout
+                {
+                    Ruleset = { BindTarget = ruleset }
+                }
+            });
+
+            AddStep("Osu ruleset", () => ruleset.Value = new OsuRuleset().RulesetInfo);
+            AddStep("Mania ruleset", () => ruleset.Value = new ManiaRuleset().RulesetInfo);
+            AddStep("Taiko ruleset", () => ruleset.Value = new TaikoRuleset().RulesetInfo);
+            AddStep("Catch ruleset", () => ruleset.Value = new CatchRuleset().RulesetInfo);
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
index 538ae112b5..5b3744cf7f 100644
--- a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
+++ b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
@@ -60,8 +60,10 @@ namespace osu.Game.Overlays.Rankings
             base.LoadComplete();
         }
 
-        private void onCurrentChanged(ValueChangedEvent<RankingsScope> scope) =>
-            SpotlightSelector.State.Value = scope.NewValue == RankingsScope.Spotlights ? Visibility.Visible : Visibility.Hidden;
+        private void onCurrentChanged(ValueChangedEvent<RankingsScope> scope)
+        {
+
+        }
 
         private class RankingsTitle : ScreenTitle
         {
diff --git a/osu.Game/Overlays/Rankings/SpotlightSelector.cs b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
index 8bf75b2357..bc2d731772 100644
--- a/osu.Game/Overlays/Rankings/SpotlightSelector.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
@@ -18,11 +18,8 @@ using osu.Game.Online.API.Requests;
 
 namespace osu.Game.Overlays.Rankings
 {
-    public class SpotlightSelector : VisibilityContainer, IHasCurrentValue<APISpotlight>
+    public class SpotlightSelector : CompositeDrawable, IHasCurrentValue<APISpotlight>
     {
-        private const int height = 100;
-        private const int duration = 200;
-
         private readonly Box background;
         private readonly SpotlightsDropdown dropdown;
 
@@ -40,59 +37,52 @@ namespace osu.Game.Overlays.Rankings
             set => dropdown.Items = value;
         }
 
-        protected override bool StartHidden => true;
-
         private readonly InfoColumn startDateColumn;
         private readonly InfoColumn endDateColumn;
         private readonly InfoColumn mapCountColumn;
         private readonly InfoColumn participantsColumn;
-        private readonly Container content;
 
         public SpotlightSelector()
         {
             RelativeSizeAxes = Axes.X;
-            Add(content = new Container
+            Height = 100;
+            AddRangeInternal(new Drawable[]
             {
-                Height = height,
-                RelativeSizeAxes = Axes.X,
-                Children = new Drawable[]
+                background = new Box
                 {
-                    background = new Box
+                    RelativeSizeAxes = Axes.Both,
+                },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding { Horizontal = UserProfileOverlay.CONTENT_X_MARGIN, Vertical = 10 },
+                    Children = new Drawable[]
                     {
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                    new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Padding = new MarginPadding { Horizontal = UserProfileOverlay.CONTENT_X_MARGIN, Vertical = 10 },
-                        Children = new Drawable[]
+                        dropdown = new SpotlightsDropdown
                         {
-                            dropdown = new SpotlightsDropdown
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            RelativeSizeAxes = Axes.X,
+                            Current = Current,
+                            Depth = -float.MaxValue
+                        },
+                        new FillFlowContainer
+                        {
+                            Anchor = Anchor.BottomRight,
+                            Origin = Anchor.BottomRight,
+                            AutoSizeAxes = Axes.Both,
+                            Direction = FillDirection.Horizontal,
+                            Spacing = new Vector2(15, 0),
+                            Children = new Drawable[]
                             {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
-                                RelativeSizeAxes = Axes.X,
-                                Current = Current,
-                                Depth = -float.MaxValue
-                            },
-                            new FillFlowContainer
-                            {
-                                Anchor = Anchor.BottomRight,
-                                Origin = Anchor.BottomRight,
-                                AutoSizeAxes = Axes.Both,
-                                Direction = FillDirection.Horizontal,
-                                Spacing = new Vector2(15, 0),
-                                Children = new Drawable[]
-                                {
-                                    startDateColumn = new InfoColumn(@"Start Date"),
-                                    endDateColumn = new InfoColumn(@"End Date"),
-                                    mapCountColumn = new InfoColumn(@"Map Count"),
-                                    participantsColumn = new InfoColumn(@"Participants")
-                                }
+                                startDateColumn = new InfoColumn(@"Start Date"),
+                                endDateColumn = new InfoColumn(@"End Date"),
+                                mapCountColumn = new InfoColumn(@"Map Count"),
+                                participantsColumn = new InfoColumn(@"Participants")
                             }
                         }
-                    },
-                }
+                    }
+                },
             });
         }
 
@@ -110,18 +100,6 @@ namespace osu.Game.Overlays.Rankings
             participantsColumn.Value = response.Spotlight.Participants?.ToString("N0");
         }
 
-        protected override void PopIn()
-        {
-            this.ResizeHeightTo(height, duration, Easing.OutQuint);
-            content.FadeIn(duration, Easing.OutQuint);
-        }
-
-        protected override void PopOut()
-        {
-            this.ResizeHeightTo(0, duration, Easing.OutQuint);
-            content.FadeOut(duration, Easing.OutQuint);
-        }
-
         private string dateToString(DateTimeOffset date) => date.ToString("yyyy-MM-dd");
 
         private class InfoColumn : FillFlowContainer
diff --git a/osu.Game/Overlays/Rankings/SpotlightsLayout.cs b/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
new file mode 100644
index 0000000000..fd1b73c4cd
--- /dev/null
+++ b/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
@@ -0,0 +1,158 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Framework.Bindables;
+using osu.Game.Rulesets;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Online.API.Requests.Responses;
+using osuTK;
+using osu.Framework.Allocation;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Overlays.Rankings.Tables;
+using System.Linq;
+using osu.Game.Overlays.Direct;
+using System.Threading;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Overlays.Rankings
+{
+    public class SpotlightsLayout : CompositeDrawable
+    {
+        public readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
+
+        private readonly Bindable<APISpotlight> selectedSpotlight = new Bindable<APISpotlight>();
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
+        private CancellationTokenSource cancellationToken;
+        private GetSpotlightRankingsRequest getRankingsRequest;
+        private GetSpotlightsRequest spotlightsRequest;
+
+        private readonly SpotlightSelector selector;
+        private readonly Container content;
+        private readonly DimmedLoadingLayer loading;
+
+        public SpotlightsLayout()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            InternalChild = new ReverseChildIDFillFlowContainer<Drawable>
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 20),
+                Children = new Drawable[]
+                {
+                    selector = new SpotlightSelector
+                    {
+                        Current = selectedSpotlight,
+                    },
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Children = new Drawable[]
+                        {
+                            content = new Container
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                            },
+                            loading = new DimmedLoadingLayer(),
+                        }
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            selectedSpotlight.BindValueChanged(onSpotlightChanged);
+            Ruleset.BindValueChanged(onRulesetChanged);
+
+            getSpotlights();
+        }
+
+        private void getSpotlights()
+        {
+            spotlightsRequest = new GetSpotlightsRequest();
+            spotlightsRequest.Success += response => selector.Spotlights = response.Spotlights;
+            api.Queue(spotlightsRequest);
+        }
+
+        private void onRulesetChanged(ValueChangedEvent<RulesetInfo> ruleset)
+        {
+            if (!selector.Spotlights.Any())
+                return;
+
+            selectedSpotlight.TriggerChange();
+        }
+
+        private void onSpotlightChanged(ValueChangedEvent<APISpotlight> spotlight)
+        {
+            loading.Show();
+
+            cancellationToken?.Cancel();
+            getRankingsRequest?.Cancel();
+
+            getRankingsRequest = new GetSpotlightRankingsRequest(Ruleset.Value, spotlight.NewValue.Id);
+            getRankingsRequest.Success += onSuccess;
+            api.Queue(getRankingsRequest);
+        }
+
+        private void onSuccess(GetSpotlightRankingsResponse response)
+        {
+            LoadComponentAsync(createContent(response), loaded =>
+            {
+                selector.ShowInfo(response);
+
+                content.Clear();
+                content.Add(loaded);
+
+                loading.Hide();
+            }, (cancellationToken = new CancellationTokenSource()).Token);
+        }
+
+        private Drawable createContent(GetSpotlightRankingsResponse response) => new FillFlowContainer
+        {
+            AutoSizeAxes = Axes.Y,
+            RelativeSizeAxes = Axes.X,
+            Direction = FillDirection.Vertical,
+            Spacing = new Vector2(0, 20),
+            Children = new Drawable[]
+            {
+                new ScoresTable(1, response.Users),
+                new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Y,
+                    RelativeSizeAxes = Axes.X,
+                    Spacing = new Vector2(10),
+                    Children = response.BeatmapSets.Select(b => new DirectGridPanel(b.ToBeatmapSet(rulesets))
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                    }).ToList()
+                }
+            }
+        };
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            spotlightsRequest?.Cancel();
+            getRankingsRequest?.Cancel();
+            cancellationToken?.Cancel();
+        }
+    }
+}

From 0b6558dc40e9813712c0e6c0bfc28e354d62da42 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 Feb 2020 02:35:23 +0300
Subject: [PATCH 0379/1142] Add SpotlightsLayout to RankingsOverlay

---
 .../Visual/Online/TestSceneRankingsHeader.cs  | 21 +---
 .../TestSceneRankingsSpotlightSelector.cs     |  6 ++
 .../Rankings/RankingsOverlayHeader.cs         | 40 +-------
 .../Overlays/Rankings/SpotlightSelector.cs    | 73 ++++++++------
 .../Overlays/Rankings/SpotlightsLayout.cs     | 15 +--
 osu.Game/Overlays/RankingsOverlay.cs          | 97 +++++--------------
 6 files changed, 85 insertions(+), 167 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs
index bc0ae3d264..1e711b3cd7 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Rankings;
 using osu.Game.Rulesets;
@@ -35,25 +34,7 @@ namespace osu.Game.Tests.Visual.Online
             {
                 Current = { BindTarget = scope },
                 Country = { BindTarget = countryBindable },
-                Ruleset = { BindTarget = ruleset },
-                Spotlights = new[]
-                {
-                    new APISpotlight
-                    {
-                        Id = 1,
-                        Name = "Spotlight 1"
-                    },
-                    new APISpotlight
-                    {
-                        Id = 2,
-                        Name = "Spotlight 2"
-                    },
-                    new APISpotlight
-                    {
-                        Id = 3,
-                        Name = "Spotlight 3"
-                    }
-                }
+                Ruleset = { BindTarget = ruleset }
             });
 
             var country = new Country
diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
index e46c8a4a71..f27ab1e775 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsSpotlightSelector.cs
@@ -35,6 +35,12 @@ namespace osu.Game.Tests.Visual.Online
             Add(selector = new SpotlightSelector());
         }
 
+        [Test]
+        public void TestVisibility()
+        {
+            AddStep("Toggle Visibility", selector.ToggleVisibility);
+        }
+
         [Test]
         public void TestLocalSpotlights()
         {
diff --git a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
index 5b3744cf7f..2674b3a81e 100644
--- a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
+++ b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
@@ -6,24 +6,14 @@ using osu.Framework.Bindables;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 using osu.Game.Users;
-using System.Collections.Generic;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Overlays.Rankings
 {
     public class RankingsOverlayHeader : TabControlOverlayHeader<RankingsScope>
     {
         public readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
-        public readonly Bindable<APISpotlight> Spotlight = new Bindable<APISpotlight>();
         public readonly Bindable<Country> Country = new Bindable<Country>();
 
-        public IEnumerable<APISpotlight> Spotlights
-        {
-            get => SpotlightSelector.Spotlights;
-            set => SpotlightSelector.Spotlights = value;
-        }
-
         protected override ScreenTitle CreateTitle() => new RankingsTitle
         {
             Scope = { BindTarget = Current }
@@ -34,37 +24,11 @@ namespace osu.Game.Overlays.Rankings
             Current = Ruleset
         };
 
-        public SpotlightSelector SpotlightSelector;
-
-        protected override Drawable CreateContent() => new FillFlowContainer
+        protected override Drawable CreateContent() => new CountryFilter
         {
-            RelativeSizeAxes = Axes.X,
-            AutoSizeAxes = Axes.Y,
-            Direction = FillDirection.Vertical,
-            Children = new Drawable[]
-            {
-                new CountryFilter
-                {
-                    Current = Country
-                },
-                SpotlightSelector = new SpotlightSelector
-                {
-                    Current = { BindTarget = Spotlight }
-                }
-            }
+            Current = Country
         };
 
-        protected override void LoadComplete()
-        {
-            Current.BindValueChanged(onCurrentChanged, true);
-            base.LoadComplete();
-        }
-
-        private void onCurrentChanged(ValueChangedEvent<RankingsScope> scope)
-        {
-
-        }
-
         private class RankingsTitle : ScreenTitle
         {
             public readonly Bindable<RankingsScope> Scope = new Bindable<RankingsScope>();
diff --git a/osu.Game/Overlays/Rankings/SpotlightSelector.cs b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
index bc2d731772..f019b50ae8 100644
--- a/osu.Game/Overlays/Rankings/SpotlightSelector.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightSelector.cs
@@ -18,8 +18,10 @@ using osu.Game.Online.API.Requests;
 
 namespace osu.Game.Overlays.Rankings
 {
-    public class SpotlightSelector : CompositeDrawable, IHasCurrentValue<APISpotlight>
+    public class SpotlightSelector : VisibilityContainer, IHasCurrentValue<APISpotlight>
     {
+        private const int duration = 300;
+
         private readonly Box background;
         private readonly SpotlightsDropdown dropdown;
 
@@ -37,52 +39,59 @@ namespace osu.Game.Overlays.Rankings
             set => dropdown.Items = value;
         }
 
+        protected override bool StartHidden => true;
+
         private readonly InfoColumn startDateColumn;
         private readonly InfoColumn endDateColumn;
         private readonly InfoColumn mapCountColumn;
         private readonly InfoColumn participantsColumn;
+        private readonly Container content;
 
         public SpotlightSelector()
         {
             RelativeSizeAxes = Axes.X;
             Height = 100;
-            AddRangeInternal(new Drawable[]
+            Add(content = new Container
             {
-                background = new Box
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
                 {
-                    RelativeSizeAxes = Axes.Both,
-                },
-                new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Horizontal = UserProfileOverlay.CONTENT_X_MARGIN, Vertical = 10 },
-                    Children = new Drawable[]
+                    background = new Box
                     {
-                        dropdown = new SpotlightsDropdown
+                        RelativeSizeAxes = Axes.Both,
+                    },
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Padding = new MarginPadding { Horizontal = UserProfileOverlay.CONTENT_X_MARGIN, Vertical = 10 },
+                        Children = new Drawable[]
                         {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                            RelativeSizeAxes = Axes.X,
-                            Current = Current,
-                            Depth = -float.MaxValue
-                        },
-                        new FillFlowContainer
-                        {
-                            Anchor = Anchor.BottomRight,
-                            Origin = Anchor.BottomRight,
-                            AutoSizeAxes = Axes.Both,
-                            Direction = FillDirection.Horizontal,
-                            Spacing = new Vector2(15, 0),
-                            Children = new Drawable[]
+                            dropdown = new SpotlightsDropdown
                             {
-                                startDateColumn = new InfoColumn(@"Start Date"),
-                                endDateColumn = new InfoColumn(@"End Date"),
-                                mapCountColumn = new InfoColumn(@"Map Count"),
-                                participantsColumn = new InfoColumn(@"Participants")
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.TopCentre,
+                                RelativeSizeAxes = Axes.X,
+                                Current = Current,
+                                Depth = -float.MaxValue
+                            },
+                            new FillFlowContainer
+                            {
+                                Anchor = Anchor.BottomRight,
+                                Origin = Anchor.BottomRight,
+                                AutoSizeAxes = Axes.Both,
+                                Direction = FillDirection.Horizontal,
+                                Spacing = new Vector2(15, 0),
+                                Children = new Drawable[]
+                                {
+                                    startDateColumn = new InfoColumn(@"Start Date"),
+                                    endDateColumn = new InfoColumn(@"End Date"),
+                                    mapCountColumn = new InfoColumn(@"Map Count"),
+                                    participantsColumn = new InfoColumn(@"Participants")
+                                }
                             }
                         }
                     }
-                },
+                }
             });
         }
 
@@ -100,6 +109,10 @@ namespace osu.Game.Overlays.Rankings
             participantsColumn.Value = response.Spotlight.Participants?.ToString("N0");
         }
 
+        protected override void PopIn() => content.FadeIn(duration, Easing.OutQuint);
+
+        protected override void PopOut() => content.FadeOut(duration, Easing.OutQuint);
+
         private string dateToString(DateTimeOffset date) => date.ToString("yyyy-MM-dd");
 
         private class InfoColumn : FillFlowContainer
diff --git a/osu.Game/Overlays/Rankings/SpotlightsLayout.cs b/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
index fd1b73c4cd..33811cc982 100644
--- a/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
@@ -35,11 +35,12 @@ namespace osu.Game.Overlays.Rankings
         private GetSpotlightRankingsRequest getRankingsRequest;
         private GetSpotlightsRequest spotlightsRequest;
 
-        private readonly SpotlightSelector selector;
-        private readonly Container content;
-        private readonly DimmedLoadingLayer loading;
+        private SpotlightSelector selector;
+        private Container content;
+        private DimmedLoadingLayer loading;
 
-        public SpotlightsLayout()
+        [BackgroundDependencyLoader]
+        private void load()
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
@@ -48,7 +49,6 @@ namespace osu.Game.Overlays.Rankings
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
                 Direction = FillDirection.Vertical,
-                Spacing = new Vector2(0, 20),
                 Children = new Drawable[]
                 {
                     selector = new SpotlightSelector
@@ -65,8 +65,9 @@ namespace osu.Game.Overlays.Rankings
                             {
                                 RelativeSizeAxes = Axes.X,
                                 AutoSizeAxes = Axes.Y,
+                                Margin = new MarginPadding { Vertical = 10 }
                             },
-                            loading = new DimmedLoadingLayer(),
+                            loading = new DimmedLoadingLayer()
                         }
                     }
                 }
@@ -77,6 +78,8 @@ namespace osu.Game.Overlays.Rankings
         {
             base.LoadComplete();
 
+            selector.Show();
+
             selectedSpotlight.BindValueChanged(onSpotlightChanged);
             Ruleset.BindValueChanged(onRulesetChanged);
 
diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index a0aeff082e..f3215d07fa 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -14,10 +14,6 @@ using osu.Game.Online.API;
 using System.Threading;
 using osu.Game.Online.API.Requests;
 using osu.Game.Overlays.Rankings.Tables;
-using osu.Game.Online.API.Requests.Responses;
-using System.Linq;
-using osuTK;
-using osu.Game.Overlays.Direct;
 
 namespace osu.Game.Overlays
 {
@@ -26,13 +22,11 @@ namespace osu.Game.Overlays
         protected readonly Bindable<Country> Country = new Bindable<Country>();
         protected readonly Bindable<RankingsScope> Scope = new Bindable<RankingsScope>();
         private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
-        private readonly Bindable<APISpotlight> spotlight = new Bindable<APISpotlight>();
 
         private readonly BasicScrollContainer scrollFlow;
         private readonly Container contentContainer;
         private readonly DimmedLoadingLayer loading;
         private readonly Box background;
-        private readonly RankingsOverlayHeader header;
 
         private APIRequest lastRequest;
         private CancellationTokenSource cancellationToken;
@@ -40,9 +34,6 @@ namespace osu.Game.Overlays
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        [Resolved]
-        private RulesetStore rulesets { get; set; }
-
         public RankingsOverlay()
             : base(OverlayColourScheme.Green)
         {
@@ -63,15 +54,14 @@ namespace osu.Game.Overlays
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            header = new RankingsOverlayHeader
+                            new RankingsOverlayHeader
                             {
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
                                 Depth = -float.MaxValue,
                                 Country = { BindTarget = Country },
                                 Current = { BindTarget = Scope },
-                                Ruleset = { BindTarget = ruleset },
-                                Spotlight = { BindTarget = spotlight }
+                                Ruleset = { BindTarget = ruleset }
                             },
                             new Container
                             {
@@ -85,7 +75,7 @@ namespace osu.Game.Overlays
                                         Origin = Anchor.TopCentre,
                                         AutoSizeAxes = Axes.Y,
                                         RelativeSizeAxes = Axes.X,
-                                        Margin = new MarginPadding { Vertical = 10 }
+                                        Margin = new MarginPadding { Bottom = 10 }
                                     },
                                     loading = new DimmedLoadingLayer(),
                                 }
@@ -110,30 +100,25 @@ namespace osu.Game.Overlays
                 if (Country.Value != null)
                     Scope.Value = RankingsScope.Performance;
 
-                if (Scope.Value != RankingsScope.Spotlights)
-                    Scheduler.AddOnce(loadNewContent);
+                Scheduler.AddOnce(loadNewContent);
             }, true);
 
             Scope.BindValueChanged(_ =>
             {
-                spotlightsRequest?.Cancel();
-
                 // country filtering is only valid for performance scope.
                 if (Scope.Value != RankingsScope.Performance)
                     Country.Value = null;
 
-                if (Scope.Value == RankingsScope.Spotlights && !header.Spotlights.Any())
-                {
-                    getSpotlights();
-                    return;
-                }
-
                 Scheduler.AddOnce(loadNewContent);
             }, true);
 
-            ruleset.BindValueChanged(_ => Scheduler.AddOnce(loadNewContent), true);
+            ruleset.BindValueChanged(_ =>
+            {
+                if (Scope.Value == RankingsScope.Spotlights)
+                    return;
 
-            spotlight.BindValueChanged(_ => Scheduler.AddOnce(loadNewContent), true);
+                Scheduler.AddOnce(loadNewContent);
+            }, true);
 
             base.LoadComplete();
         }
@@ -148,16 +133,6 @@ namespace osu.Game.Overlays
             Country.Value = requested;
         }
 
-        private GetSpotlightsRequest spotlightsRequest;
-
-        private void getSpotlights()
-        {
-            loading.Show();
-            spotlightsRequest = new GetSpotlightsRequest();
-            spotlightsRequest.Success += response => header.Spotlights = response.Spotlights;
-            api.Queue(spotlightsRequest);
-        }
-
         private void loadNewContent()
         {
             loading.Show();
@@ -165,6 +140,15 @@ namespace osu.Game.Overlays
             cancellationToken?.Cancel();
             lastRequest?.Cancel();
 
+            if (Scope.Value == RankingsScope.Spotlights)
+            {
+                loadContent(new SpotlightsLayout
+                {
+                    Ruleset = { BindTarget = ruleset }
+                });
+                return;
+            }
+
             var request = createScopedRequest();
             lastRequest = request;
 
@@ -174,8 +158,9 @@ namespace osu.Game.Overlays
                 return;
             }
 
-            request.Success += () => loadContent(createContentFromResponse(request));
+            request.Success += () => loadContent(createTableFromResponse(request));
             request.Failure += _ => loadContent(null);
+
             api.Queue(request);
         }
 
@@ -191,15 +176,12 @@ namespace osu.Game.Overlays
 
                 case RankingsScope.Score:
                     return new GetUserRankingsRequest(ruleset.Value, UserRankingsType.Score);
-
-                case RankingsScope.Spotlights:
-                    return new GetSpotlightRankingsRequest(ruleset.Value, header.Spotlight.Value.Id);
             }
 
             return null;
         }
 
-        private Drawable createContentFromResponse(APIRequest request)
+        private Drawable createTableFromResponse(APIRequest request)
         {
             switch (request)
             {
@@ -217,42 +199,11 @@ namespace osu.Game.Overlays
 
                 case GetCountryRankingsRequest countryRequest:
                     return new CountriesTable(1, countryRequest.Result.Countries);
-
-                case GetSpotlightRankingsRequest spotlightRequest:
-                    return getSpotlightContent(spotlightRequest.Result);
             }
 
             return null;
         }
 
-        private Drawable getSpotlightContent(GetSpotlightRankingsResponse response)
-        {
-            header.SpotlightSelector.ShowInfo(response);
-
-            return new FillFlowContainer
-            {
-                AutoSizeAxes = Axes.Y,
-                RelativeSizeAxes = Axes.X,
-                Direction = FillDirection.Vertical,
-                Spacing = new Vector2(0, 20),
-                Children = new Drawable[]
-                {
-                    new ScoresTable(1, response.Users),
-                    new FillFlowContainer
-                    {
-                        AutoSizeAxes = Axes.Y,
-                        RelativeSizeAxes = Axes.X,
-                        Spacing = new Vector2(10),
-                        Children = response.BeatmapSets.Select(b => new DirectGridPanel(b.ToBeatmapSet(rulesets))
-                        {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                        }).ToList()
-                    }
-                }
-            };
-        }
-
         private void loadContent(Drawable content)
         {
             scrollFlow.ScrollToStart();
@@ -264,10 +215,10 @@ namespace osu.Game.Overlays
                 return;
             }
 
-            LoadComponentAsync(content, t =>
+            LoadComponentAsync(content, loaded =>
             {
                 loading.Hide();
-                contentContainer.Child = content;
+                contentContainer.Child = loaded;
             }, (cancellationToken = new CancellationTokenSource()).Token);
         }
     }

From ca237fd987cc677f7bbda1923a421836763f884d Mon Sep 17 00:00:00 2001
From: voidedWarranties <wz68.scratch@gmail.com>
Date: Mon, 10 Feb 2020 16:21:49 -0800
Subject: [PATCH 0380/1142] Simplify ordering by using only numbers, add xmldoc

---
 .../Mods/CatchModDifficultyAdjust.cs          |  5 ++--
 .../Mods/OsuModDifficultyAdjust.cs            |  5 ++--
 .../Configuration/SettingSourceAttribute.cs   | 25 ++++++-------------
 osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs |  5 ++--
 4 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
index 17a2847fd1..de7adaa261 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
@@ -5,13 +5,12 @@ using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
-using static osu.Game.Configuration.SettingSourceAttribute;
 
 namespace osu.Game.Rulesets.Catch.Mods
 {
     public class CatchModDifficultyAdjust : ModDifficultyAdjust
     {
-        [SettingSource("Circle Size", "Override a beatmap's set CS.", OrderMode.FIRST)]
+        [SettingSource("Circle Size", "Override a beatmap's set CS.", 0)]
         public BindableNumber<float> CircleSize { get; } = new BindableFloat
         {
             Precision = 0.1f,
@@ -21,7 +20,7 @@ namespace osu.Game.Rulesets.Catch.Mods
             Value = 5,
         };
 
-        [SettingSource("Approach Rate", "Override a beatmap's set AR.", OrderMode.LAST)]
+        [SettingSource("Approach Rate", "Override a beatmap's set AR.", 3)]
         public BindableNumber<float> ApproachRate { get; } = new BindableFloat
         {
             Precision = 0.1f,
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index 2b56042ead..2c6eb19f3d 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
@@ -5,13 +5,12 @@ using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Mods;
-using static osu.Game.Configuration.SettingSourceAttribute;
 
 namespace osu.Game.Rulesets.Osu.Mods
 {
     public class OsuModDifficultyAdjust : ModDifficultyAdjust
     {
-        [SettingSource("Circle Size", "Override a beatmap's set CS.", OrderMode.FIRST)]
+        [SettingSource("Circle Size", "Override a beatmap's set CS.", 0)]
         public BindableNumber<float> CircleSize { get; } = new BindableFloat
         {
             Precision = 0.1f,
@@ -21,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             Value = 5,
         };
 
-        [SettingSource("Approach Rate", "Override a beatmap's set AR.", OrderMode.LAST)]
+        [SettingSource("Approach Rate", "Override a beatmap's set AR.", 3)]
         public BindableNumber<float> ApproachRate { get; } = new BindableFloat
         {
             Precision = 0.1f,
diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index 06e01bb042..4dcd2c6122 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -17,31 +17,24 @@ namespace osu.Game.Configuration
     /// An attribute to mark a bindable as being exposed to the user via settings controls.
     /// Can be used in conjunction with <see cref="SettingSourceExtensions.CreateSettingsControls"/> to automatically create UI controls.
     /// </summary>
+    /// <remarks>
+    /// All controls with OrderPosition set to an int greater than 0 will be placed first in ascending order.
+    /// All controls with no OrderPosition will come afterward in default order.
+    /// </remarks>
     [MeansImplicitUse]
     [AttributeUsage(AttributeTargets.Property)]
     public class SettingSourceAttribute : Attribute
     {
-        public enum OrderMode
-        {
-            FIRST,
-            ORDERED_RELATIVE,
-            UNORDERED,
-            LAST
-        }
-
         public string Label { get; }
 
         public string Description { get; }
 
-        public OrderMode OrderingMode { get; }
-
         public int OrderPosition { get; }
 
-        public SettingSourceAttribute(string label, string description = null, OrderMode order = OrderMode.UNORDERED, int orderPosition = 0)
+        public SettingSourceAttribute(string label, string description = null, int orderPosition = -1)
         {
             Label = label ?? string.Empty;
             Description = description ?? string.Empty;
-            OrderingMode = order;
             OrderPosition = orderPosition;
         }
     }
@@ -136,12 +129,10 @@ namespace osu.Game.Configuration
         {
             var original = obj.GetSettingsSourceProperties();
 
-            var first = original.Where(attr => attr.Item1.OrderingMode == SettingSourceAttribute.OrderMode.FIRST);
-            var orderedRelative = original.Where(attr => attr.Item1.OrderingMode == SettingSourceAttribute.OrderMode.ORDERED_RELATIVE).OrderBy(attr => attr.Item1.OrderPosition);
-            var unordered = original.Where(attr => attr.Item1.OrderingMode == SettingSourceAttribute.OrderMode.UNORDERED);
-            var last = original.Where(attr => attr.Item1.OrderingMode == SettingSourceAttribute.OrderMode.LAST);
+            var orderedRelative = original.Where(attr => attr.Item1.OrderPosition > -1).OrderBy(attr => attr.Item1.OrderPosition);
+            var unordered = original.Except(orderedRelative);
 
-            return first.Concat(orderedRelative).Concat(unordered).Concat(last);
+            return orderedRelative.Concat(unordered);
         }
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index 958a0353ea..6ba54ff8fb 100644
--- a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
@@ -7,7 +7,6 @@ using osu.Framework.Graphics.Sprites;
 using System;
 using System.Collections.Generic;
 using osu.Game.Configuration;
-using static osu.Game.Configuration.SettingSourceAttribute;
 
 namespace osu.Game.Rulesets.Mods
 {
@@ -29,7 +28,7 @@ namespace osu.Game.Rulesets.Mods
 
         public override Type[] IncompatibleMods => new[] { typeof(ModEasy), typeof(ModHardRock) };
 
-        [SettingSource("HP Drain", "Override a beatmap's set HP.", OrderMode.ORDERED_RELATIVE, 1)]
+        [SettingSource("HP Drain", "Override a beatmap's set HP.", 1)]
         public BindableNumber<float> DrainRate { get; } = new BindableFloat
         {
             Precision = 0.1f,
@@ -39,7 +38,7 @@ namespace osu.Game.Rulesets.Mods
             Value = 5,
         };
 
-        [SettingSource("Accuracy", "Override a beatmap's set OD.", OrderMode.ORDERED_RELATIVE, 1)]
+        [SettingSource("Accuracy", "Override a beatmap's set OD.", 2)]
         public BindableNumber<float> OverallDifficulty { get; } = new BindableFloat
         {
             Precision = 0.1f,

From 333f976580cc8e159b09e268bef438f09200e3d9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 Feb 2020 17:41:48 +0900
Subject: [PATCH 0381/1142] Fix test finding deleted beatmaps under dotnet-test

---
 osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index bd06089514..9474c08c5a 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -442,16 +442,20 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddUntilStep("dummy selected", () => Beatmap.Value is DummyWorkingBeatmap);
 
+            AddUntilStep("has no selection", () => songSelect.Carousel.SelectedBeatmap == null);
+
             BeatmapInfo target = null;
 
             AddStep("select beatmap externally", () =>
             {
-                target = manager.QueryBeatmapSets(b => b.Beatmaps.Any(bi => bi.RulesetID == (differentRuleset ? 1 : 0)))
+                target = manager.GetAllUsableBeatmapSets().Where(b => b.Beatmaps.Any(bi => bi.RulesetID == (differentRuleset ? 1 : 0)))
                                 .ElementAt(5).Beatmaps.First();
 
                 Beatmap.Value = manager.GetWorkingBeatmap(target);
             });
 
+            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmap != null);
+
             AddUntilStep("carousel has correct", () => songSelect.Carousel.SelectedBeatmap?.OnlineBeatmapID == target.OnlineBeatmapID);
             AddUntilStep("game has correct", () => Beatmap.Value.BeatmapInfo.OnlineBeatmapID == target.OnlineBeatmapID);
 

From 17791259ed16767dfced844a094fe9116d9a5db4 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Tue, 11 Feb 2020 16:21:31 +0700
Subject: [PATCH 0382/1142] Fix InfoColumn minWidth implementation

---
 .../Scores/TopScoreStatisticsSection.cs       | 42 +++++++++++++------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index 6c9f0b0321..c441cb3101 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -118,26 +118,42 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             {
                 AutoSizeAxes = Axes.Both;
 
-                InternalChild = new FillFlowContainer
+                InternalChild = new GridContainer
                 {
                     AutoSizeAxes = Axes.Both,
-                    Direction = FillDirection.Vertical,
-                    Spacing = new Vector2(0, 1),
-                    Children = new[]
+                    ColumnDimensions = new[]
                     {
-                        text = new OsuSpriteText
+                        new Dimension(GridSizeMode.AutoSize, minSize: minWidth ?? 0)
+                    },
+                    RowDimensions = new[]
+                    {
+                        new Dimension(GridSizeMode.AutoSize),
+                        new Dimension(GridSizeMode.Absolute, 4),
+                        new Dimension(GridSizeMode.AutoSize)
+                    },
+                    Content = new[]
+                    {
+                        new[]
                         {
-                            Font = OsuFont.GetFont(size: 10, weight: FontWeight.Bold),
-                            Text = title.ToUpper()
+                            text = new OsuSpriteText
+                            {
+                                Font = OsuFont.GetFont(size: 10, weight: FontWeight.Bold),
+                                Text = title.ToUpper()
+                            }
                         },
-                        separator = new Box
+                        new[]
                         {
-                            RelativeSizeAxes = minWidth == null ? Axes.X : Axes.None,
-                            Width = minWidth ?? 1f,
-                            Height = 2,
-                            Margin = new MarginPadding { Top = 2 }
+                            separator = new Box
+                            {
+                                Anchor = Anchor.CentreLeft,
+                                RelativeSizeAxes = Axes.X,
+                                Height = 2
+                            }
                         },
-                        content
+                        new[]
+                        {
+                            content
+                        }
                     }
                 };
             }

From 28a39fd8faa1ff463ea606de60048cdb10488ce3 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Tue, 11 Feb 2020 17:12:32 +0700
Subject: [PATCH 0383/1142] Use explicit typing

---
 .../Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index c441cb3101..8a6927e048 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -131,9 +131,9 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                         new Dimension(GridSizeMode.Absolute, 4),
                         new Dimension(GridSizeMode.AutoSize)
                     },
-                    Content = new[]
+                    Content = new Drawable[][]
                     {
-                        new[]
+                        new []
                         {
                             text = new OsuSpriteText
                             {

From 44568ac9e6343a115fc9ed70db6a3194baf7b007 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Tue, 11 Feb 2020 17:36:10 +0700
Subject: [PATCH 0384/1142] Avoid covariant array conversion

---
 .../BeatmapSet/Scores/TopScoreStatisticsSection.cs        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index 8a6927e048..be6151278c 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -131,9 +131,9 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                         new Dimension(GridSizeMode.Absolute, 4),
                         new Dimension(GridSizeMode.AutoSize)
                     },
-                    Content = new Drawable[][]
+                    Content = new[]
                     {
-                        new []
+                        new Drawable[]
                         {
                             text = new OsuSpriteText
                             {
@@ -141,7 +141,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                                 Text = title.ToUpper()
                             }
                         },
-                        new[]
+                        new Drawable[]
                         {
                             separator = new Box
                             {
@@ -150,7 +150,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                                 Height = 2
                             }
                         },
-                        new[]
+                        new Drawable[]
                         {
                             content
                         }

From 2be7d1a873b3de01080f00b850d00174a9d645d3 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Tue, 11 Feb 2020 18:19:08 +0700
Subject: [PATCH 0385/1142] Remove redundant type specification

---
 .../Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index be6151278c..a7066c4827 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -150,7 +150,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                                 Height = 2
                             }
                         },
-                        new Drawable[]
+                        new[]
                         {
                             content
                         }

From 627833844839dec52e21f1ad7bc00cd796933a9c Mon Sep 17 00:00:00 2001
From: Maximilian Junges <Maxi.Junges@gmx.de>
Date: Tue, 11 Feb 2020 14:21:12 +0100
Subject: [PATCH 0386/1142] implement custom tooltip for DrawableDate

---
 osu.Game/Graphics/DrawableDate.cs | 75 ++++++++++++++++++++++++++++++-
 1 file changed, 73 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/DrawableDate.cs b/osu.Game/Graphics/DrawableDate.cs
index 0224c77ee8..dcbea96071 100644
--- a/osu.Game/Graphics/DrawableDate.cs
+++ b/osu.Game/Graphics/DrawableDate.cs
@@ -4,13 +4,16 @@
 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
 {
-    public class DrawableDate : OsuSpriteText, IHasTooltip
+    public class DrawableDate : OsuSpriteText, IHasCustomTooltip
     {
         private DateTimeOffset date;
 
@@ -75,6 +78,74 @@ namespace osu.Game.Graphics
 
         private void updateTime() => Text = Format();
 
-        public virtual string TooltipText => string.Format($"{Date:MMMM d, yyyy h:mm tt \"UTC\"z}");
+        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)
+            {
+                // Temporary colour since it's currently impossible to change it without bugs (see https://github.com/ppy/osu-framework/issues/3231)
+                // If above is fixed, this should use OverlayColourProvider
+                background.Colour = colours.Gray1;
+                timeText.Colour = colours.GreyCyanLighter;
+            }
+
+            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 = string.Format($"{date:d MMMM yyyy}") + " ";
+                timeText.Text = string.Format($"{date:hh:mm:ss \"UTC\"z}");
+                return true;
+            }
+
+            public void Move(Vector2 pos) => Position = pos;
+        }
     }
 }

From 2a67246b218f323710572f3a1b53c56722171d55 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 11 Feb 2020 22:37:38 +0900
Subject: [PATCH 0387/1142] Ensure game is at main menu before performing exit
 on screen

---
 osu.Game/OsuGame.cs               | 2 +-
 osu.Game/Screens/Menu/MainMenu.cs | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index ff3dee55af..79616ef97c 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -446,7 +446,7 @@ namespace osu.Game
         /// </summary>
         /// <param name="action">The action to perform once we are in the correct state.</param>
         /// <param name="validScreens">An optional collection of valid screen types. If any of these screens are already current we can perform the action immediately, else the first valid parent will be made current before performing the action. <see cref="MainMenu"/> is used if not specified.</param>
-        protected void PerformFromScreen(Action<IScreen> action, IEnumerable<Type> validScreens = null)
+        public void PerformFromScreen(Action<IScreen> action, IEnumerable<Type> validScreens = null)
         {
             performFromMainMenuTask?.Cancel();
 
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index cb5ceefb0f..c70fbb67a4 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -141,12 +141,15 @@ namespace osu.Game.Screens.Menu
             preloadSongSelect();
         }
 
+        [Resolved]
+        private OsuGame game { get; set; }
+
         private void confirmAndExit()
         {
             if (exitConfirmed) return;
 
             exitConfirmed = true;
-            this.Exit();
+            game.PerformFromScreen(menu => menu.Exit());
         }
 
         private void preloadSongSelect()

From 482f622c94202a483092f8e6df306fbcc234af6a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 Feb 2020 18:46:49 +0300
Subject: [PATCH 0388/1142] CommentEditor basic implementation

---
 .../UserInterface/TestSceneCommentEditor.cs   | 43 ++++++++++++++
 osu.Game/Overlays/Comments/CommentEditor.cs   | 59 +++++++++++++++++++
 2 files changed, 102 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
 create mode 100644 osu.Game/Overlays/Comments/CommentEditor.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
new file mode 100644
index 0000000000..f349c81b38
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
@@ -0,0 +1,43 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Comments;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneCommentEditor : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(CommentEditor),
+        };
+
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+
+        public TestSceneCommentEditor()
+        {
+            Add(new Container
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                AutoSizeAxes = Axes.Y,
+                Width = 800,
+                Child = new TestCommentEditor()
+            });
+        }
+
+        private class TestCommentEditor : CommentEditor
+        {
+            protected override string EmptyTextboxText() => @"This textbox is empty";
+
+            protected override string FooterText() => @"Footer text. And it is pretty long. Cool.";
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Comments/CommentEditor.cs b/osu.Game/Overlays/Comments/CommentEditor.cs
new file mode 100644
index 0000000000..a1995530bb
--- /dev/null
+++ b/osu.Game/Overlays/Comments/CommentEditor.cs
@@ -0,0 +1,59 @@
+// 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.Containers;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Overlays.Comments
+{
+    public abstract class CommentEditor : CompositeDrawable
+    {
+        private const int footer_height = 40;
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            RelativeSizeAxes = Axes.X;
+            Height = footer_height * 2;
+            Masking = true;
+            CornerRadius = 6;
+
+            AddRangeInternal(new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colourProvider.Background3
+                },
+                new Container
+                {
+                    Name = "Footer",
+                    Anchor = Anchor.BottomCentre,
+                    Origin = Anchor.BottomCentre,
+                    RelativeSizeAxes = Axes.X,
+                    Height = footer_height,
+                    Padding = new MarginPadding { Horizontal = 8 },
+                    Children = new Drawable[]
+                    {
+                        new OsuSpriteText
+                        {
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            Font = OsuFont.GetFont(size: 12),
+                            Shadow = false,
+                            Text = FooterText()
+                        }
+                    }
+                }
+            });
+        }
+
+        protected abstract string FooterText();
+
+        protected abstract string EmptyTextboxText();
+    }
+}

From 829152c8e89444f3146f582509d8b9879a1b6ba3 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 Feb 2020 20:08:24 +0300
Subject: [PATCH 0389/1142] Implement EditorTextbox

---
 .../UserInterface/TestSceneCommentEditor.cs   |  6 +-
 osu.Game/Overlays/Comments/CommentEditor.cs   | 81 +++++++++++++++----
 2 files changed, 70 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
index f349c81b38..a1f1999090 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
@@ -35,9 +35,11 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private class TestCommentEditor : CommentEditor
         {
-            protected override string EmptyTextboxText() => @"This textbox is empty";
+            protected override string FooterText => @"Footer text. And it is pretty long. Cool.";
 
-            protected override string FooterText() => @"Footer text. And it is pretty long. Cool.";
+            protected override string CommitButtonText => @"Commit";
+
+            protected override string TextboxPlaceholderText => @"This textbox is empty";
         }
     }
 }
diff --git a/osu.Game/Overlays/Comments/CommentEditor.cs b/osu.Game/Overlays/Comments/CommentEditor.cs
index a1995530bb..9252194377 100644
--- a/osu.Game/Overlays/Comments/CommentEditor.cs
+++ b/osu.Game/Overlays/Comments/CommentEditor.cs
@@ -7,20 +7,32 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Graphics.Sprites;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Comments
 {
     public abstract class CommentEditor : CompositeDrawable
     {
         private const int footer_height = 40;
+        private const int side_padding = 8;
+
+        protected abstract string FooterText { get; }
+
+        protected abstract string CommitButtonText { get; }
+
+        protected abstract string TextboxPlaceholderText { get; }
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
         {
             RelativeSizeAxes = Axes.X;
-            Height = footer_height * 2;
+            AutoSizeAxes = Axes.Y;
             Masking = true;
             CornerRadius = 6;
+            BorderThickness = 3;
+            BorderColour = colourProvider.Background3;
 
             AddRangeInternal(new Drawable[]
             {
@@ -29,31 +41,70 @@ namespace osu.Game.Overlays.Comments
                     RelativeSizeAxes = Axes.Both,
                     Colour = colourProvider.Background3
                 },
-                new Container
+                new FillFlowContainer
                 {
-                    Name = "Footer",
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.BottomCentre,
+                    AutoSizeAxes = Axes.Y,
                     RelativeSizeAxes = Axes.X,
-                    Height = footer_height,
-                    Padding = new MarginPadding { Horizontal = 8 },
+                    Direction = FillDirection.Vertical,
                     Children = new Drawable[]
                     {
-                        new OsuSpriteText
+                        new EditorTextbox
                         {
-                            Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.CentreLeft,
-                            Font = OsuFont.GetFont(size: 12),
-                            Shadow = false,
-                            Text = FooterText()
+                            Height = footer_height,
+                            RelativeSizeAxes = Axes.X,
+                            PlaceholderText = TextboxPlaceholderText
+                        },
+                        new Container
+                        {
+                            Name = "Footer",
+                            RelativeSizeAxes = Axes.X,
+                            Height = footer_height,
+                            Padding = new MarginPadding { Horizontal = side_padding },
+                            Children = new Drawable[]
+                            {
+                                new OsuSpriteText
+                                {
+                                    Anchor = Anchor.CentreLeft,
+                                    Origin = Anchor.CentreLeft,
+                                    Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
+                                    Text = FooterText
+                                }
+                            }
                         }
                     }
                 }
             });
         }
 
-        protected abstract string FooterText();
+        private class EditorTextbox : BasicTextBox
+        {
+            protected override float LeftRightPadding => side_padding;
 
-        protected abstract string EmptyTextboxText();
+            protected override Color4 SelectionColour => Color4.LightSkyBlue;
+
+            private OsuSpriteText placeholder;
+
+            public EditorTextbox()
+            {
+                Masking = false;
+                TextContainer.Height = 0.4f;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                BackgroundUnfocused = BackgroundFocused = colourProvider.Background5;
+                placeholder.Colour = colourProvider.Background3;
+                BackgroundCommit = Color4.LightSkyBlue;
+            }
+
+
+            protected override SpriteText CreatePlaceholder() => placeholder = new OsuSpriteText
+            {
+                Font = OsuFont.GetFont(weight: FontWeight.Regular),
+            };
+
+            protected override Drawable GetDrawableCharacter(char c) => new OsuSpriteText { Text = c.ToString(), Font = OsuFont.GetFont(size: CalculatedTextSize) };
+        }
     }
 }

From b9e10cb49872c4eb0253a6498050e5cca49a96e0 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 11 Feb 2020 18:10:46 +0100
Subject: [PATCH 0390/1142] Privatize ViewTarget

---
 .../Online/TestSceneOnlineViewContainer.cs     | 18 ++++++++++++------
 osu.Game/Online/OnlineViewContainer.cs         | 16 ++++++++--------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
index 5427db5af3..2b9609f6e0 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
@@ -32,6 +32,8 @@ namespace osu.Game.Tests.Visual.Online
         {
             public new LoadingAnimation LoadingAnimation => base.LoadingAnimation;
 
+            public CompositeDrawable ViewTarget => base.Content.Parent;
+
             public TestOnlineViewContainer()
                 : base(@"Please sign in to view dummy test content")
             {
@@ -53,9 +55,9 @@ namespace osu.Game.Tests.Visual.Online
                 };
             }
 
-            protected override void FadeContentOut(Drawable content) => content.Hide();
+            protected override void PopContentOut(Drawable content) => content.Hide();
 
-            protected override void FadeContentIn(Drawable content) => content.Show();
+            protected override void PopContentIn(Drawable content) => content.Show();
         }
 
         [Test]
@@ -63,7 +65,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddStep("set status to online", () => ((DummyAPIAccess)API).State = APIState.Online);
 
-            AddAssert("children are visible", () => onlineView.TransformationTarget.IsPresent);
+            AddAssert("children are visible", () => onlineView.ViewTarget.IsPresent);
             AddAssert("loading animation is not visible", () => !onlineView.LoadingAnimation.IsPresent);
         }
 
@@ -72,7 +74,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddStep("set status to offline", () => ((DummyAPIAccess)API).State = APIState.Offline);
 
-            AddAssert("children are hidden", () => !onlineView.TransformationTarget.IsPresent);
+            AddAssert("children are hidden", () => !onlineView.ViewTarget.IsPresent);
             AddAssert("loading animation is not visible", () => !onlineView.LoadingAnimation.IsPresent);
         }
 
@@ -81,12 +83,16 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddStep("set status to connecting", () => ((DummyAPIAccess)API).State = APIState.Connecting);
 
-            AddAssert("children are hidden", () => !onlineView.TransformationTarget.IsPresent);
+            AddAssert("children are hidden", () => !onlineView.ViewTarget.IsPresent);
             AddAssert("loading animation is visible", () => onlineView.LoadingAnimation.IsPresent);
+        }
 
+        [Test]
+        public void TestFailingStateVisibility()
+        {
             AddStep("set status to failing", () => ((DummyAPIAccess)API).State = APIState.Failing);
 
-            AddAssert("children are hidden", () => !onlineView.TransformationTarget.IsPresent);
+            AddAssert("children are hidden", () => !onlineView.ViewTarget.IsPresent);
             AddAssert("loading animation is visible", () => onlineView.LoadingAnimation.IsPresent);
         }
     }
diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
index ac5a7941ea..c512ca531a 100644
--- a/osu.Game/Online/OnlineViewContainer.cs
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -11,7 +11,7 @@ using osu.Game.Online.Placeholders;
 namespace osu.Game.Online
 {
     /// <summary>
-    /// A <see cref="Container"/> for dislaying online content which require a local user to be logged in.
+    /// A <see cref="Container"/> for displaying online content which require a local user to be logged in.
     /// Shows its children only when the local user is logged in and supports displaying a placeholder if not.
     /// </summary>
     public abstract class OnlineViewContainer : Container, IOnlineComponent
@@ -21,7 +21,7 @@ namespace osu.Game.Online
 
         protected const double TRANSFORM_TIME = 300.0;
 
-        internal readonly Container TransformationTarget;
+        private readonly Container viewTarget;
         protected override Container<Drawable> Content { get; }
 
         [Resolved]
@@ -31,7 +31,7 @@ namespace osu.Game.Online
         {
             InternalChildren = new Drawable[]
             {
-                TransformationTarget = new Container
+                viewTarget = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
                     Child = Content = new Container
@@ -52,30 +52,30 @@ namespace osu.Game.Online
             switch (state)
             {
                 case APIState.Offline:
-                    FadeContentOut(TransformationTarget);
+                    PopContentOut(viewTarget);
                     placeholder.ScaleTo(0.8f).Then().ScaleTo(1, 3 * TRANSFORM_TIME, Easing.OutQuint);
                     placeholder.FadeInFromZero(2 * TRANSFORM_TIME, Easing.OutQuint);
                     LoadingAnimation.Hide();
                     break;
 
                 case APIState.Online:
-                    FadeContentIn(TransformationTarget);
+                    PopContentIn(viewTarget);
                     placeholder.FadeOut(TRANSFORM_TIME / 2, Easing.OutQuint);
                     LoadingAnimation.Hide();
                     break;
 
                 case APIState.Failing:
                 case APIState.Connecting:
-                    FadeContentOut(TransformationTarget);
+                    PopContentOut(viewTarget);
                     LoadingAnimation.Show();
                     placeholder.FadeOut(TRANSFORM_TIME / 2, Easing.OutQuint);
                     break;
             }
         }
 
-        protected abstract void FadeContentOut(Drawable content);
+        protected abstract void PopContentOut(Drawable content);
 
-        protected abstract void FadeContentIn(Drawable content);
+        protected abstract void PopContentIn(Drawable content);
 
         protected override void LoadComplete()
         {

From 730c115f49fbb29b5f72f37ad0446e9f4174d939 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 Feb 2020 20:11:22 +0300
Subject: [PATCH 0391/1142] Fix some size values

---
 osu.Game/Overlays/Comments/CommentEditor.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentEditor.cs b/osu.Game/Overlays/Comments/CommentEditor.cs
index 9252194377..4ad59ff754 100644
--- a/osu.Game/Overlays/Comments/CommentEditor.cs
+++ b/osu.Game/Overlays/Comments/CommentEditor.cs
@@ -15,7 +15,6 @@ namespace osu.Game.Overlays.Comments
 {
     public abstract class CommentEditor : CompositeDrawable
     {
-        private const int footer_height = 40;
         private const int side_padding = 8;
 
         protected abstract string FooterText { get; }
@@ -50,7 +49,7 @@ namespace osu.Game.Overlays.Comments
                     {
                         new EditorTextbox
                         {
-                            Height = footer_height,
+                            Height = 40,
                             RelativeSizeAxes = Axes.X,
                             PlaceholderText = TextboxPlaceholderText
                         },
@@ -58,7 +57,7 @@ namespace osu.Game.Overlays.Comments
                         {
                             Name = "Footer",
                             RelativeSizeAxes = Axes.X,
-                            Height = footer_height,
+                            Height = 35,
                             Padding = new MarginPadding { Horizontal = side_padding },
                             Children = new Drawable[]
                             {

From c022cf72b58a8bd13861c8cde85eca6cc3484672 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 11 Feb 2020 20:47:51 +0300
Subject: [PATCH 0392/1142] Implement CancellableCommentEditor

---
 .../UserInterface/TestSceneCommentEditor.cs   | 21 +++++-
 .../Comments/CancellableCommentEditor.cs      | 71 +++++++++++++++++++
 osu.Game/Overlays/Comments/CommentEditor.cs   | 10 +++
 osu.Game/Overlays/OverlayColourProvider.cs    | 42 +++++------
 4 files changed, 121 insertions(+), 23 deletions(-)
 create mode 100644 osu.Game/Overlays/Comments/CancellableCommentEditor.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
index a1f1999090..86179886e5 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Comments;
+using osuTK;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
@@ -16,6 +17,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(CommentEditor),
+            typeof(CancellableCommentEditor),
         };
 
         [Cached]
@@ -23,13 +25,19 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         public TestSceneCommentEditor()
         {
-            Add(new Container
+            Add(new FillFlowContainer
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 AutoSizeAxes = Axes.Y,
                 Width = 800,
-                Child = new TestCommentEditor()
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 20),
+                Children = new Drawable[]
+                {
+                    new TestCommentEditor(),
+                    new TestCancellableCommentEditor()
+                }
             });
         }
 
@@ -41,5 +49,14 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             protected override string TextboxPlaceholderText => @"This textbox is empty";
         }
+
+        private class TestCancellableCommentEditor : CancellableCommentEditor
+        {
+            protected override string FooterText => @"Wow, another one. Sicc";
+
+            protected override string CommitButtonText => @"Save";
+
+            protected override string TextboxPlaceholderText => @"Miltiline textboxes soon";
+        }
     }
 }
diff --git a/osu.Game/Overlays/Comments/CancellableCommentEditor.cs b/osu.Game/Overlays/Comments/CancellableCommentEditor.cs
new file mode 100644
index 0000000000..ad5686910a
--- /dev/null
+++ b/osu.Game/Overlays/Comments/CancellableCommentEditor.cs
@@ -0,0 +1,71 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Overlays.Comments
+{
+    public abstract class CancellableCommentEditor : CommentEditor
+    {
+        public Action OnCancel;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            ButtonsContainer.Add(new CancelButton
+            {
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft,
+                Action = () => OnCancel?.Invoke()
+            });
+        }
+
+        private class CancelButton : OsuHoverContainer
+        {
+            protected override IEnumerable<Drawable> EffectTargets => new[] { background };
+
+            private readonly Box background;
+
+            public CancelButton()
+            {
+                AutoSizeAxes = Axes.Both;
+                Child = new CircularContainer
+                {
+                    Masking = true,
+                    Height = 25,
+                    AutoSizeAxes = Axes.X,
+                    Children = new Drawable[]
+                    {
+                        background = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both
+                        },
+                        new OsuSpriteText
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
+                            Margin = new MarginPadding { Horizontal = 20 },
+                            Text = @"Cancel"
+                        }
+                    }
+                };
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                IdleColour = colourProvider.GetColour(0.5f, 0.45f);
+                HoverColour = colourProvider.GetColour(0.5f, 0.6f);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Comments/CommentEditor.cs b/osu.Game/Overlays/Comments/CommentEditor.cs
index 4ad59ff754..bb8ae7f114 100644
--- a/osu.Game/Overlays/Comments/CommentEditor.cs
+++ b/osu.Game/Overlays/Comments/CommentEditor.cs
@@ -23,6 +23,8 @@ namespace osu.Game.Overlays.Comments
 
         protected abstract string TextboxPlaceholderText { get; }
 
+        protected FillFlowContainer ButtonsContainer;
+
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
         {
@@ -67,6 +69,14 @@ namespace osu.Game.Overlays.Comments
                                     Origin = Anchor.CentreLeft,
                                     Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
                                     Text = FooterText
+                                },
+                                ButtonsContainer = new FillFlowContainer
+                                {
+                                    Name = "Buttons",
+                                    Anchor = Anchor.CentreRight,
+                                    Origin = Anchor.CentreRight,
+                                    AutoSizeAxes = Axes.Both,
+                                    Direction = FillDirection.Horizontal,
                                 }
                             }
                         }
diff --git a/osu.Game/Overlays/OverlayColourProvider.cs b/osu.Game/Overlays/OverlayColourProvider.cs
index 9816f313ad..c0984073e6 100644
--- a/osu.Game/Overlays/OverlayColourProvider.cs
+++ b/osu.Game/Overlays/OverlayColourProvider.cs
@@ -16,28 +16,28 @@ namespace osu.Game.Overlays
             this.colourScheme = colourScheme;
         }
 
-        public Color4 Highlight1 => getColour(1, 0.7f);
-        public Color4 Content1 => getColour(0.4f, 1);
-        public Color4 Content2 => getColour(0.4f, 0.9f);
-        public Color4 Light1 => getColour(0.4f, 0.8f);
-        public Color4 Light2 => getColour(0.4f, 0.75f);
-        public Color4 Light3 => getColour(0.4f, 0.7f);
-        public Color4 Light4 => getColour(0.4f, 0.5f);
-        public Color4 Dark1 => getColour(0.2f, 0.35f);
-        public Color4 Dark2 => getColour(0.2f, 0.3f);
-        public Color4 Dark3 => getColour(0.2f, 0.25f);
-        public Color4 Dark4 => getColour(0.2f, 0.2f);
-        public Color4 Dark5 => getColour(0.2f, 0.15f);
-        public Color4 Dark6 => getColour(0.2f, 0.1f);
-        public Color4 Foreground1 => getColour(0.1f, 0.6f);
-        public Color4 Background1 => getColour(0.1f, 0.4f);
-        public Color4 Background2 => getColour(0.1f, 0.3f);
-        public Color4 Background3 => getColour(0.1f, 0.25f);
-        public Color4 Background4 => getColour(0.1f, 0.2f);
-        public Color4 Background5 => getColour(0.1f, 0.15f);
-        public Color4 Background6 => getColour(0.1f, 0.1f);
+        public Color4 Highlight1 => GetColour(1, 0.7f);
+        public Color4 Content1 => GetColour(0.4f, 1);
+        public Color4 Content2 => GetColour(0.4f, 0.9f);
+        public Color4 Light1 => GetColour(0.4f, 0.8f);
+        public Color4 Light2 => GetColour(0.4f, 0.75f);
+        public Color4 Light3 => GetColour(0.4f, 0.7f);
+        public Color4 Light4 => GetColour(0.4f, 0.5f);
+        public Color4 Dark1 => GetColour(0.2f, 0.35f);
+        public Color4 Dark2 => GetColour(0.2f, 0.3f);
+        public Color4 Dark3 => GetColour(0.2f, 0.25f);
+        public Color4 Dark4 => GetColour(0.2f, 0.2f);
+        public Color4 Dark5 => GetColour(0.2f, 0.15f);
+        public Color4 Dark6 => GetColour(0.2f, 0.1f);
+        public Color4 Foreground1 => GetColour(0.1f, 0.6f);
+        public Color4 Background1 => GetColour(0.1f, 0.4f);
+        public Color4 Background2 => GetColour(0.1f, 0.3f);
+        public Color4 Background3 => GetColour(0.1f, 0.25f);
+        public Color4 Background4 => GetColour(0.1f, 0.2f);
+        public Color4 Background5 => GetColour(0.1f, 0.15f);
+        public Color4 Background6 => GetColour(0.1f, 0.1f);
 
-        private Color4 getColour(float saturation, float lightness) => Color4.FromHsl(new Vector4(getBaseHue(colourScheme), saturation, lightness, 1));
+        public Color4 GetColour(float saturation, float lightness) => Color4.FromHsl(new Vector4(getBaseHue(colourScheme), saturation, lightness, 1));
 
         // See https://github.com/ppy/osu-web/blob/4218c288292d7c810b619075471eaea8bbb8f9d8/app/helpers.php#L1463
         private static float getBaseHue(OverlayColourScheme colourScheme)

From 5a3daf1bd71939f6f1c4b34d1911d74b6789a6f1 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 12 Feb 2020 00:57:06 +0300
Subject: [PATCH 0393/1142] Implement CommitButton

---
 .../Comments/CancellableCommentEditor.cs      |  4 +-
 osu.Game/Overlays/Comments/CommentEditor.cs   | 72 ++++++++++++++++++-
 2 files changed, 72 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CancellableCommentEditor.cs b/osu.Game/Overlays/Comments/CancellableCommentEditor.cs
index ad5686910a..f58627efb3 100644
--- a/osu.Game/Overlays/Comments/CancellableCommentEditor.cs
+++ b/osu.Game/Overlays/Comments/CancellableCommentEditor.cs
@@ -22,8 +22,8 @@ namespace osu.Game.Overlays.Comments
         {
             ButtonsContainer.Add(new CancelButton
             {
-                Anchor = Anchor.CentreLeft,
-                Origin = Anchor.CentreLeft,
+                Anchor = Anchor.CentreRight,
+                Origin = Anchor.CentreRight,
                 Action = () => OnCancel?.Invoke()
             });
         }
diff --git a/osu.Game/Overlays/Comments/CommentEditor.cs b/osu.Game/Overlays/Comments/CommentEditor.cs
index bb8ae7f114..624e15a047 100644
--- a/osu.Game/Overlays/Comments/CommentEditor.cs
+++ b/osu.Game/Overlays/Comments/CommentEditor.cs
@@ -10,6 +10,10 @@ using osu.Game.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Graphics.Sprites;
 using osuTK.Graphics;
+using osu.Game.Graphics.UserInterface;
+using System.Collections.Generic;
+using System;
+using osuTK;
 
 namespace osu.Game.Overlays.Comments
 {
@@ -17,6 +21,8 @@ namespace osu.Game.Overlays.Comments
     {
         private const int side_padding = 8;
 
+        public Action<string> OnCommit;
+
         protected abstract string FooterText { get; }
 
         protected abstract string CommitButtonText { get; }
@@ -28,6 +34,9 @@ namespace osu.Game.Overlays.Comments
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
         {
+            EditorTextbox textbox;
+            CommitButton commitButton;
+
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
             Masking = true;
@@ -49,7 +58,7 @@ namespace osu.Game.Overlays.Comments
                     Direction = FillDirection.Vertical,
                     Children = new Drawable[]
                     {
-                        new EditorTextbox
+                        textbox = new EditorTextbox
                         {
                             Height = 40,
                             RelativeSizeAxes = Axes.X,
@@ -77,12 +86,21 @@ namespace osu.Game.Overlays.Comments
                                     Origin = Anchor.CentreRight,
                                     AutoSizeAxes = Axes.Both,
                                     Direction = FillDirection.Horizontal,
+                                    Spacing = new Vector2(5, 0),
+                                    Child = commitButton = new CommitButton(CommitButtonText)
+                                    {
+                                        Anchor = Anchor.CentreRight,
+                                        Origin = Anchor.CentreRight,
+                                        Action = () => OnCommit?.Invoke(textbox.Text)
+                                    }
                                 }
                             }
                         }
                     }
                 }
             });
+
+            textbox.OnCommit += (u, v) => commitButton.Click();
         }
 
         private class EditorTextbox : BasicTextBox
@@ -107,7 +125,6 @@ namespace osu.Game.Overlays.Comments
                 BackgroundCommit = Color4.LightSkyBlue;
             }
 
-
             protected override SpriteText CreatePlaceholder() => placeholder = new OsuSpriteText
             {
                 Font = OsuFont.GetFont(weight: FontWeight.Regular),
@@ -115,5 +132,56 @@ namespace osu.Game.Overlays.Comments
 
             protected override Drawable GetDrawableCharacter(char c) => new OsuSpriteText { Text = c.ToString(), Font = OsuFont.GetFont(size: CalculatedTextSize) };
         }
+
+        private class CommitButton : LoadingButton
+        {
+            private const int duration = 200;
+
+            protected override IEnumerable<Drawable> EffectTargets => new[] { background };
+
+            private OsuSpriteText drawableText;
+            private Box background;
+
+            public CommitButton(string text)
+            {
+                AutoSizeAxes = Axes.Both;
+                LoadingAnimationSize = new Vector2(10);
+
+                drawableText.Text = text;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                IdleColour = colourProvider.GetColour(0.5f, 0.45f);
+                HoverColour = colourProvider.GetColour(0.5f, 0.6f);
+            }
+
+            protected override Drawable CreateContent() => new CircularContainer
+            {
+                Masking = true,
+                Height = 25,
+                AutoSizeAxes = Axes.X,
+                Children = new Drawable[]
+                {
+                    background = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both
+                    },
+                    drawableText = new OsuSpriteText
+                    {
+                        AlwaysPresent = true,
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
+                        Margin = new MarginPadding { Horizontal = 20 }
+                    }
+                }
+            };
+
+            protected override void OnLoadStarted() => drawableText.FadeOut(duration, Easing.OutQuint);
+
+            protected override void OnLoadFinished() => drawableText.FadeIn(duration, Easing.OutQuint);
+        }
     }
 }

From 53a2b65dbdffda9ee3f053108dd8080b9ed85a5f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 12 Feb 2020 01:35:08 +0300
Subject: [PATCH 0394/1142] Create dependency between textbox and commit button

---
 osu.Game/Overlays/Comments/CommentEditor.cs | 56 ++++++++++++++++++---
 1 file changed, 49 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentEditor.cs b/osu.Game/Overlays/Comments/CommentEditor.cs
index 624e15a047..7adb33663c 100644
--- a/osu.Game/Overlays/Comments/CommentEditor.cs
+++ b/osu.Game/Overlays/Comments/CommentEditor.cs
@@ -14,6 +14,7 @@ using osu.Game.Graphics.UserInterface;
 using System.Collections.Generic;
 using System;
 using osuTK;
+using osu.Framework.Bindables;
 
 namespace osu.Game.Overlays.Comments
 {
@@ -31,11 +32,14 @@ namespace osu.Game.Overlays.Comments
 
         protected FillFlowContainer ButtonsContainer;
 
+        private readonly Bindable<string> current = new Bindable<string>();
+
+        private CommitButton commitButton;
+
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
         {
             EditorTextbox textbox;
-            CommitButton commitButton;
 
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
@@ -62,7 +66,8 @@ namespace osu.Game.Overlays.Comments
                         {
                             Height = 40,
                             RelativeSizeAxes = Axes.X,
-                            PlaceholderText = TextboxPlaceholderText
+                            PlaceholderText = TextboxPlaceholderText,
+                            Current = current
                         },
                         new Container
                         {
@@ -91,7 +96,7 @@ namespace osu.Game.Overlays.Comments
                                     {
                                         Anchor = Anchor.CentreRight,
                                         Origin = Anchor.CentreRight,
-                                        Action = () => OnCommit?.Invoke(textbox.Text)
+                                        Action = () => OnCommit?.Invoke(current.Value)
                                     }
                                 }
                             }
@@ -100,14 +105,28 @@ namespace osu.Game.Overlays.Comments
                 }
             });
 
-            textbox.OnCommit += (u, v) => commitButton.Click();
+            textbox.OnCommit += (u, v) =>
+            {
+                if (!commitButton.IsReady.Value)
+                    return;
+
+                commitButton.Click();
+                current.Value = string.Empty;
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            current.BindValueChanged(text => commitButton.IsReady.Value = !string.IsNullOrEmpty(text.NewValue), true);
         }
 
         private class EditorTextbox : BasicTextBox
         {
             protected override float LeftRightPadding => side_padding;
 
-            protected override Color4 SelectionColour => Color4.LightSkyBlue;
+            protected override Color4 SelectionColour => Color4.Gray;
 
             private OsuSpriteText placeholder;
 
@@ -122,7 +141,7 @@ namespace osu.Game.Overlays.Comments
             {
                 BackgroundUnfocused = BackgroundFocused = colourProvider.Background5;
                 placeholder.Colour = colourProvider.Background3;
-                BackgroundCommit = Color4.LightSkyBlue;
+                BackgroundCommit = colourProvider.Background3;
             }
 
             protected override SpriteText CreatePlaceholder() => placeholder = new OsuSpriteText
@@ -137,8 +156,15 @@ namespace osu.Game.Overlays.Comments
         {
             private const int duration = 200;
 
+            public readonly BindableBool IsReady = new BindableBool();
+
+            public override bool PropagatePositionalInputSubTree => IsReady.Value && base.PropagatePositionalInputSubTree;
+
             protected override IEnumerable<Drawable> EffectTargets => new[] { background };
 
+            [Resolved]
+            private OverlayColourProvider colourProvider { get; set; }
+
             private OsuSpriteText drawableText;
             private Box background;
 
@@ -151,12 +177,28 @@ namespace osu.Game.Overlays.Comments
             }
 
             [BackgroundDependencyLoader]
-            private void load(OverlayColourProvider colourProvider)
+            private void load()
             {
                 IdleColour = colourProvider.GetColour(0.5f, 0.45f);
                 HoverColour = colourProvider.GetColour(0.5f, 0.6f);
             }
 
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                IsReady.BindValueChanged(onReadyStateChanged, true);
+            }
+
+            private void onReadyStateChanged(ValueChangedEvent<bool> isReady)
+            {
+                drawableText.FadeColour(isReady.NewValue ? Color4.White : colourProvider.Foreground1, duration, Easing.OutQuint);
+
+                if (isReady.NewValue)
+                    background.FadeColour(IsHovered ? HoverColour : IdleColour, duration, Easing.OutQuint);
+                else
+                    background.FadeColour(colourProvider.Background5, duration, Easing.OutQuint);
+            }
+
             protected override Drawable CreateContent() => new CircularContainer
             {
                 Masking = true,

From 9ac6c271ac3331e390b8d00d168fee539e97c556 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 12 Feb 2020 02:05:45 +0300
Subject: [PATCH 0395/1142] Naming adjustments

---
 .../UserInterface/TestSceneCommentEditor.cs   | 36 +++++++++++++++++--
 osu.Game/Overlays/Comments/CommentEditor.cs   | 26 ++++++++------
 2 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
index 86179886e5..e32bf05197 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
@@ -6,6 +6,8 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Comments;
 using osuTK;
@@ -23,8 +25,21 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
+        private readonly OsuSpriteText text;
+        private readonly TestCommentEditor commentEditor;
+        private readonly TestCancellableCommentEditor cancellableCommentEditor;
+
         public TestSceneCommentEditor()
         {
+            Add(new Container
+            {
+                AutoSizeAxes = Axes.Both,
+                Child = text = new OsuSpriteText
+                {
+                    Font = OsuFont.GetFont()
+                }
+            });
+
             Add(new FillFlowContainer
             {
                 Anchor = Anchor.Centre,
@@ -35,12 +50,29 @@ namespace osu.Game.Tests.Visual.UserInterface
                 Spacing = new Vector2(0, 20),
                 Children = new Drawable[]
                 {
-                    new TestCommentEditor(),
-                    new TestCancellableCommentEditor()
+                    commentEditor = new TestCommentEditor
+                    {
+                        OnCommit = onCommit
+                    },
+                    cancellableCommentEditor = new TestCancellableCommentEditor
+                    {
+                        OnCommit = onCommit
+                    }
                 }
             });
         }
 
+        private void onCommit(string value)
+        {
+            text.Text = $@"Invoked text: {value}";
+
+            Scheduler.AddDelayed(() =>
+            {
+                commentEditor.IsLoading = false;
+                cancellableCommentEditor.IsLoading = false;
+            }, 500);
+        }
+
         private class TestCommentEditor : CommentEditor
         {
             protected override string FooterText => @"Footer text. And it is pretty long. Cool.";
diff --git a/osu.Game/Overlays/Comments/CommentEditor.cs b/osu.Game/Overlays/Comments/CommentEditor.cs
index 7adb33663c..34aa036938 100644
--- a/osu.Game/Overlays/Comments/CommentEditor.cs
+++ b/osu.Game/Overlays/Comments/CommentEditor.cs
@@ -24,6 +24,12 @@ namespace osu.Game.Overlays.Comments
 
         public Action<string> OnCommit;
 
+        public bool IsLoading
+        {
+            get => commitButton.IsLoading;
+            set => commitButton.IsLoading = value;
+        }
+
         protected abstract string FooterText { get; }
 
         protected abstract string CommitButtonText { get; }
@@ -107,7 +113,7 @@ namespace osu.Game.Overlays.Comments
 
             textbox.OnCommit += (u, v) =>
             {
-                if (!commitButton.IsReady.Value)
+                if (commitButton.IsBlocked.Value)
                     return;
 
                 commitButton.Click();
@@ -119,7 +125,7 @@ namespace osu.Game.Overlays.Comments
         {
             base.LoadComplete();
 
-            current.BindValueChanged(text => commitButton.IsReady.Value = !string.IsNullOrEmpty(text.NewValue), true);
+            current.BindValueChanged(text => commitButton.IsBlocked.Value = string.IsNullOrEmpty(text.NewValue), true);
         }
 
         private class EditorTextbox : BasicTextBox
@@ -156,9 +162,9 @@ namespace osu.Game.Overlays.Comments
         {
             private const int duration = 200;
 
-            public readonly BindableBool IsReady = new BindableBool();
+            public readonly BindableBool IsBlocked = new BindableBool();
 
-            public override bool PropagatePositionalInputSubTree => IsReady.Value && base.PropagatePositionalInputSubTree;
+            public override bool PropagatePositionalInputSubTree => !IsBlocked.Value && base.PropagatePositionalInputSubTree;
 
             protected override IEnumerable<Drawable> EffectTargets => new[] { background };
 
@@ -186,17 +192,17 @@ namespace osu.Game.Overlays.Comments
             protected override void LoadComplete()
             {
                 base.LoadComplete();
-                IsReady.BindValueChanged(onReadyStateChanged, true);
+                IsBlocked.BindValueChanged(onBlockedStateChanged, true);
             }
 
-            private void onReadyStateChanged(ValueChangedEvent<bool> isReady)
+            private void onBlockedStateChanged(ValueChangedEvent<bool> isBlocked)
             {
-                drawableText.FadeColour(isReady.NewValue ? Color4.White : colourProvider.Foreground1, duration, Easing.OutQuint);
+                drawableText.FadeColour(isBlocked.NewValue ? colourProvider.Foreground1 : Color4.White, duration, Easing.OutQuint);
 
-                if (isReady.NewValue)
-                    background.FadeColour(IsHovered ? HoverColour : IdleColour, duration, Easing.OutQuint);
-                else
+                if (isBlocked.NewValue)
                     background.FadeColour(colourProvider.Background5, duration, Easing.OutQuint);
+                else
+                    background.FadeColour(IsHovered ? HoverColour : IdleColour, duration, Easing.OutQuint);
             }
 
             protected override Drawable CreateContent() => new CircularContainer

From 2901ec9f261d8d9963f964ef114f5c3b06063267 Mon Sep 17 00:00:00 2001
From: voidedWarranties <wz68.scratch@gmail.com>
Date: Tue, 11 Feb 2020 20:05:26 -0800
Subject: [PATCH 0396/1142] Select specific difficulties using their icons

---
 osu.Game/Screens/Select/BeatmapCarousel.cs    |  7 ++++-
 .../Select/Carousel/CarouselBeatmapSet.cs     |  5 +++-
 .../Carousel/DrawableCarouselBeatmapSet.cs    | 28 +++++++++++++++++--
 osu.Game/Screens/Select/SongSelect.cs         |  1 +
 4 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 592e26adc2..1777527ced 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -53,6 +53,11 @@ namespace osu.Game.Screens.Select
         /// </summary>
         public Action<BeatmapInfo> SelectionChanged;
 
+        /// <summary>
+        /// Raised when user finalises beatmap selection using <see cref="DrawableCarouselBeatmapSet.FilterableDifficultyIcon"/>
+        /// </summary>
+        public Action<BeatmapInfo> SelectionFinalised;
+
         public override bool HandleNonPositionalInput => AllowSelection;
         public override bool HandlePositionalInput => AllowSelection;
 
@@ -577,7 +582,7 @@ namespace osu.Game.Screens.Select
                     b.Metadata = beatmapSet.Metadata;
             }
 
-            var set = new CarouselBeatmapSet(beatmapSet);
+            var set = new CarouselBeatmapSet(beatmapSet, this);
 
             foreach (var c in set.Beatmaps)
             {
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
index 301d0d4dae..66ee4d2aee 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
@@ -15,8 +15,9 @@ namespace osu.Game.Screens.Select.Carousel
         public IEnumerable<CarouselBeatmap> Beatmaps => InternalChildren.OfType<CarouselBeatmap>();
 
         public BeatmapSetInfo BeatmapSet;
+        public BeatmapCarousel Carousel;
 
-        public CarouselBeatmapSet(BeatmapSetInfo beatmapSet)
+        public CarouselBeatmapSet(BeatmapSetInfo beatmapSet, BeatmapCarousel carousel)
         {
             BeatmapSet = beatmapSet ?? throw new ArgumentNullException(nameof(beatmapSet));
 
@@ -24,6 +25,8 @@ namespace osu.Game.Screens.Select.Carousel
                       .Where(b => !b.Hidden)
                       .Select(b => new CarouselBeatmap(b))
                       .ForEach(AddChild);
+
+            Carousel = carousel;
         }
 
         protected override DrawableCarouselItem CreateDrawableRepresentation() => new DrawableCarouselBeatmapSet(this);
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 699e01bca7..536fca9e6f 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
@@ -33,10 +34,13 @@ namespace osu.Game.Screens.Select.Carousel
         private DialogOverlay dialogOverlay;
         private readonly BeatmapSetInfo beatmapSet;
 
+        private BeatmapCarousel carousel;
+
         public DrawableCarouselBeatmapSet(CarouselBeatmapSet set)
             : base(set)
         {
             beatmapSet = set.BeatmapSet;
+            carousel = set.Carousel;
         }
 
         [BackgroundDependencyLoader(true)]
@@ -117,7 +121,7 @@ namespace osu.Game.Screens.Select.Carousel
 
             return beatmaps.Count > maximum_difficulty_icons
                 ? (IEnumerable<DifficultyIcon>)beatmaps.GroupBy(b => b.Beatmap.Ruleset).Select(group => new FilterableGroupedDifficultyIcon(group.ToList(), group.Key))
-                : beatmaps.Select(b => new FilterableDifficultyIcon(b));
+                : beatmaps.Select(b => new FilterableDifficultyIcon(b, carousel));
         }
 
         public MenuItem[] ContextMenuItems
@@ -210,12 +214,32 @@ namespace osu.Game.Screens.Select.Carousel
         {
             private readonly BindableBool filtered = new BindableBool();
 
-            public FilterableDifficultyIcon(CarouselBeatmap item)
+            private BeatmapCarousel carousel;
+            private BeatmapInfo info;
+
+            public FilterableDifficultyIcon(CarouselBeatmap item, BeatmapCarousel carousel)
                 : base(item.Beatmap)
             {
                 filtered.BindTo(item.Filtered);
                 filtered.ValueChanged += isFiltered => Schedule(() => this.FadeTo(isFiltered.NewValue ? 0.1f : 1, 100));
                 filtered.TriggerChange();
+
+                this.carousel = carousel;
+                info = item.Beatmap;
+            }
+
+            protected override bool OnClick(ClickEvent e)
+            {
+                if(e.AltPressed || carousel.SelectedBeatmap == info)
+                {
+                    Schedule(() => carousel.SelectionFinalised?.Invoke(info));
+                }
+                else
+                {
+                    carousel.SelectBeatmap(info);
+                }
+
+                return true;
             }
         }
 
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 5037081b5e..bfa693cf3d 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -155,6 +155,7 @@ namespace osu.Game.Screens.Select
                                             Origin = Anchor.CentreRight,
                                             RelativeSizeAxes = Axes.Both,
                                             SelectionChanged = updateSelectedBeatmap,
+                                            SelectionFinalised = beatmapInfo => { FinaliseSelection(beatmapInfo); },
                                             BeatmapSetsChanged = carouselBeatmapsLoaded,
                                         },
                                     }

From e9b51371476ca3adb6a00e9aca26ff5b600dae51 Mon Sep 17 00:00:00 2001
From: voidedWarranties <wz68.scratch@gmail.com>
Date: Tue, 11 Feb 2020 21:52:22 -0800
Subject: [PATCH 0397/1142] Remove >-1 limitation by using a separate
 constructor

---
 osu.Game/Configuration/SettingSourceAttribute.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index 4dcd2c6122..013621d7b7 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -29,12 +29,17 @@ namespace osu.Game.Configuration
 
         public string Description { get; }
 
-        public int OrderPosition { get; }
+        public int? OrderPosition { get; }
 
-        public SettingSourceAttribute(string label, string description = null, int orderPosition = -1)
+        public SettingSourceAttribute(string label, string description = null)
         {
             Label = label ?? string.Empty;
             Description = description ?? string.Empty;
+        }
+
+        public SettingSourceAttribute(string label, string description, int orderPosition)
+            : this(label, description)
+        {
             OrderPosition = orderPosition;
         }
     }
@@ -129,7 +134,7 @@ namespace osu.Game.Configuration
         {
             var original = obj.GetSettingsSourceProperties();
 
-            var orderedRelative = original.Where(attr => attr.Item1.OrderPosition > -1).OrderBy(attr => attr.Item1.OrderPosition);
+            var orderedRelative = original.Where(attr => attr.Item1.OrderPosition != null).OrderBy(attr => attr.Item1.OrderPosition);
             var unordered = original.Except(orderedRelative);
 
             return orderedRelative.Concat(unordered);

From c386589cc09682ccf21db710775aa4bc6420e64e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 Feb 2020 19:02:25 +0900
Subject: [PATCH 0398/1142] Reapply current state, not idle

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index e391157b5b..f4ce71b803 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -116,7 +116,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             HitObject.DefaultsApplied += onDefaultsApplied;
 
             startTimeBindable = HitObject.StartTimeBindable.GetBoundCopy();
-            startTimeBindable.BindValueChanged(_ => updateState(ArmedState.Idle, true));
+            startTimeBindable.BindValueChanged(_ => updateState(State.Value, true));
 
             if (HitObject is IHasComboInformation combo)
             {

From f7ee675102c4dc76f6b69711046f4678515988b2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 Feb 2020 19:02:54 +0900
Subject: [PATCH 0399/1142] Clear and revert to negative infinity, avoiding
 transforms getting left behind on StartTime change

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index f4ce71b803..d3a0b3450f 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -250,8 +250,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
                 double transformTime = HitObject.StartTime - InitialLifetimeOffset;
 
-                base.ApplyTransformsAt(transformTime, true);
-                base.ClearTransformsAfter(transformTime, true);
+                base.ApplyTransformsAt(double.MinValue, true);
+                base.ClearTransformsAfter(double.MinValue, true);
 
                 using (BeginAbsoluteSequence(transformTime, true))
                 {

From 85a443783755a52cc2d46581644180a264339a2d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 12 Feb 2020 19:03:22 +0900
Subject: [PATCH 0400/1142] Fix editor custom FadeOut causing overlapping
 issues by removing existing FadeOut

---
 osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
index 22b4c3e82e..a8719e0aa8 100644
--- a/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
+++ b/osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
@@ -40,6 +40,8 @@ namespace osu.Game.Rulesets.Osu.Edit
                     if (existing == null)
                         return;
 
+                    hitObject.RemoveTransform(existing);
+
                     using (hitObject.BeginAbsoluteSequence(existing.StartTime))
                         hitObject.FadeOut(editor_hit_object_fade_out_extension).Expire();
                     break;

From ab7adb3a9798dd0c68cfd4dab5939c36918faf5a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 12 Feb 2020 13:28:49 +0300
Subject: [PATCH 0401/1142] Adjust button colours

---
 .../Comments/CancellableCommentEditor.cs      |  4 +-
 osu.Game/Overlays/Comments/CommentEditor.cs   |  4 +-
 osu.Game/Overlays/OverlayColourProvider.cs    | 42 +++++++++----------
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CancellableCommentEditor.cs b/osu.Game/Overlays/Comments/CancellableCommentEditor.cs
index f58627efb3..c226b7f07f 100644
--- a/osu.Game/Overlays/Comments/CancellableCommentEditor.cs
+++ b/osu.Game/Overlays/Comments/CancellableCommentEditor.cs
@@ -63,8 +63,8 @@ namespace osu.Game.Overlays.Comments
             [BackgroundDependencyLoader]
             private void load(OverlayColourProvider colourProvider)
             {
-                IdleColour = colourProvider.GetColour(0.5f, 0.45f);
-                HoverColour = colourProvider.GetColour(0.5f, 0.6f);
+                IdleColour = colourProvider.Light4;
+                HoverColour = colourProvider.Light3;
             }
         }
     }
diff --git a/osu.Game/Overlays/Comments/CommentEditor.cs b/osu.Game/Overlays/Comments/CommentEditor.cs
index 34aa036938..ac355e9c98 100644
--- a/osu.Game/Overlays/Comments/CommentEditor.cs
+++ b/osu.Game/Overlays/Comments/CommentEditor.cs
@@ -185,8 +185,8 @@ namespace osu.Game.Overlays.Comments
             [BackgroundDependencyLoader]
             private void load()
             {
-                IdleColour = colourProvider.GetColour(0.5f, 0.45f);
-                HoverColour = colourProvider.GetColour(0.5f, 0.6f);
+                IdleColour = colourProvider.Light4;
+                HoverColour = colourProvider.Light3;
             }
 
             protected override void LoadComplete()
diff --git a/osu.Game/Overlays/OverlayColourProvider.cs b/osu.Game/Overlays/OverlayColourProvider.cs
index c0984073e6..9816f313ad 100644
--- a/osu.Game/Overlays/OverlayColourProvider.cs
+++ b/osu.Game/Overlays/OverlayColourProvider.cs
@@ -16,28 +16,28 @@ namespace osu.Game.Overlays
             this.colourScheme = colourScheme;
         }
 
-        public Color4 Highlight1 => GetColour(1, 0.7f);
-        public Color4 Content1 => GetColour(0.4f, 1);
-        public Color4 Content2 => GetColour(0.4f, 0.9f);
-        public Color4 Light1 => GetColour(0.4f, 0.8f);
-        public Color4 Light2 => GetColour(0.4f, 0.75f);
-        public Color4 Light3 => GetColour(0.4f, 0.7f);
-        public Color4 Light4 => GetColour(0.4f, 0.5f);
-        public Color4 Dark1 => GetColour(0.2f, 0.35f);
-        public Color4 Dark2 => GetColour(0.2f, 0.3f);
-        public Color4 Dark3 => GetColour(0.2f, 0.25f);
-        public Color4 Dark4 => GetColour(0.2f, 0.2f);
-        public Color4 Dark5 => GetColour(0.2f, 0.15f);
-        public Color4 Dark6 => GetColour(0.2f, 0.1f);
-        public Color4 Foreground1 => GetColour(0.1f, 0.6f);
-        public Color4 Background1 => GetColour(0.1f, 0.4f);
-        public Color4 Background2 => GetColour(0.1f, 0.3f);
-        public Color4 Background3 => GetColour(0.1f, 0.25f);
-        public Color4 Background4 => GetColour(0.1f, 0.2f);
-        public Color4 Background5 => GetColour(0.1f, 0.15f);
-        public Color4 Background6 => GetColour(0.1f, 0.1f);
+        public Color4 Highlight1 => getColour(1, 0.7f);
+        public Color4 Content1 => getColour(0.4f, 1);
+        public Color4 Content2 => getColour(0.4f, 0.9f);
+        public Color4 Light1 => getColour(0.4f, 0.8f);
+        public Color4 Light2 => getColour(0.4f, 0.75f);
+        public Color4 Light3 => getColour(0.4f, 0.7f);
+        public Color4 Light4 => getColour(0.4f, 0.5f);
+        public Color4 Dark1 => getColour(0.2f, 0.35f);
+        public Color4 Dark2 => getColour(0.2f, 0.3f);
+        public Color4 Dark3 => getColour(0.2f, 0.25f);
+        public Color4 Dark4 => getColour(0.2f, 0.2f);
+        public Color4 Dark5 => getColour(0.2f, 0.15f);
+        public Color4 Dark6 => getColour(0.2f, 0.1f);
+        public Color4 Foreground1 => getColour(0.1f, 0.6f);
+        public Color4 Background1 => getColour(0.1f, 0.4f);
+        public Color4 Background2 => getColour(0.1f, 0.3f);
+        public Color4 Background3 => getColour(0.1f, 0.25f);
+        public Color4 Background4 => getColour(0.1f, 0.2f);
+        public Color4 Background5 => getColour(0.1f, 0.15f);
+        public Color4 Background6 => getColour(0.1f, 0.1f);
 
-        public Color4 GetColour(float saturation, float lightness) => Color4.FromHsl(new Vector4(getBaseHue(colourScheme), saturation, lightness, 1));
+        private Color4 getColour(float saturation, float lightness) => Color4.FromHsl(new Vector4(getBaseHue(colourScheme), saturation, lightness, 1));
 
         // See https://github.com/ppy/osu-web/blob/4218c288292d7c810b619075471eaea8bbb8f9d8/app/helpers.php#L1463
         private static float getBaseHue(OverlayColourScheme colourScheme)

From 62051c036b1f90bd16f7972ca6b4d9dd13e8d6ce Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 12 Feb 2020 13:43:56 +0300
Subject: [PATCH 0402/1142] Small CommitButton improvements

---
 osu.Game/Overlays/Comments/CommentEditor.cs | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentEditor.cs b/osu.Game/Overlays/Comments/CommentEditor.cs
index ac355e9c98..edd09cc95f 100644
--- a/osu.Game/Overlays/Comments/CommentEditor.cs
+++ b/osu.Game/Overlays/Comments/CommentEditor.cs
@@ -102,7 +102,11 @@ namespace osu.Game.Overlays.Comments
                                     {
                                         Anchor = Anchor.CentreRight,
                                         Origin = Anchor.CentreRight,
-                                        Action = () => OnCommit?.Invoke(current.Value)
+                                        Action = () =>
+                                        {
+                                            OnCommit?.Invoke(current.Value);
+                                            current.Value = string.Empty;
+                                        }
                                     }
                                 }
                             }
@@ -117,7 +121,6 @@ namespace osu.Game.Overlays.Comments
                     return;
 
                 commitButton.Click();
-                current.Value = string.Empty;
             };
         }
 
@@ -173,6 +176,7 @@ namespace osu.Game.Overlays.Comments
 
             private OsuSpriteText drawableText;
             private Box background;
+            private Box blockedBackground;
 
             public CommitButton(string text)
             {
@@ -187,6 +191,7 @@ namespace osu.Game.Overlays.Comments
             {
                 IdleColour = colourProvider.Light4;
                 HoverColour = colourProvider.Light3;
+                blockedBackground.Colour = colourProvider.Background5;
             }
 
             protected override void LoadComplete()
@@ -198,11 +203,7 @@ namespace osu.Game.Overlays.Comments
             private void onBlockedStateChanged(ValueChangedEvent<bool> isBlocked)
             {
                 drawableText.FadeColour(isBlocked.NewValue ? colourProvider.Foreground1 : Color4.White, duration, Easing.OutQuint);
-
-                if (isBlocked.NewValue)
-                    background.FadeColour(colourProvider.Background5, duration, Easing.OutQuint);
-                else
-                    background.FadeColour(IsHovered ? HoverColour : IdleColour, duration, Easing.OutQuint);
+                background.FadeTo(isBlocked.NewValue ? 0 : 1, duration, Easing.OutQuint);
             }
 
             protected override Drawable CreateContent() => new CircularContainer
@@ -212,6 +213,10 @@ namespace osu.Game.Overlays.Comments
                 AutoSizeAxes = Axes.X,
                 Children = new Drawable[]
                 {
+                    blockedBackground = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both
+                    },
                     background = new Box
                     {
                         RelativeSizeAxes = Axes.Both

From e2b3494352b950ad9c0687fcc1b74cd1639ef465 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 13 Feb 2020 00:19:21 +0300
Subject: [PATCH 0403/1142] Remove dependency on load state for
 DrawableComment.AddReplies

---
 osu.Game/Overlays/Comments/CommentsPage.cs    |  2 +-
 osu.Game/Overlays/Comments/DrawableComment.cs | 36 +++++++++++++++----
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentsPage.cs b/osu.Game/Overlays/Comments/CommentsPage.cs
index eb1044c853..f93cf90e88 100644
--- a/osu.Game/Overlays/Comments/CommentsPage.cs
+++ b/osu.Game/Overlays/Comments/CommentsPage.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Overlays.Comments
             if (replies.Any())
             {
                 replies.ForEach(c => c.ParentComment = comment);
-                drawableComment.OnLoadComplete += _ => drawableComment.AddReplies(replies.Select(reply => createCommentWithReplies(reply, commentBundle)));
+                drawableComment.InitialReplies.AddRange(replies.Select(reply => createCommentWithReplies(reply, commentBundle)));
             }
 
             return drawableComment;
diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index b0062ca1e5..7b7f4726f7 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -36,6 +36,11 @@ namespace osu.Game.Overlays.Comments
         public readonly Bindable<CommentsSortCriteria> Sort = new Bindable<CommentsSortCriteria>();
         public readonly List<Comment> LoadedReplies = new List<Comment>();
 
+        /// <summary>
+        /// <see cref="DrawableComment"/>s which will be added to this <see cref="DrawableComment"/> as replies when it will be loaded.
+        /// </summary>
+        public readonly List<DrawableComment> InitialReplies = new List<DrawableComment>();
+
         private readonly BindableBool childrenExpanded = new BindableBool(true);
 
         private int currentPage;
@@ -265,6 +270,9 @@ namespace osu.Game.Overlays.Comments
                     Colour = OsuColour.Gray(0.1f)
                 });
             }
+
+            if (InitialReplies.Any())
+                AddReplies(InitialReplies);
         }
 
         protected override void LoadComplete()
@@ -283,14 +291,28 @@ namespace osu.Game.Overlays.Comments
 
         public void AddReplies(IEnumerable<DrawableComment> replies)
         {
-            LoadComponentAsync(createRepliesPage(replies), page =>
+            if (LoadState == LoadState.NotLoaded)
+                throw new NotSupportedException($@"Can't use {nameof(AddReplies)} when not loaded.");
+
+            var page = createRepliesPage(replies);
+
+            if (LoadState == LoadState.Loading)
             {
-                var newReplies = replies.Select(reply => reply.Comment);
-                LoadedReplies.AddRange(newReplies);
-                deletedCommentsCounter.Count.Value += newReplies.Count(reply => reply.IsDeleted);
-                childCommentsContainer.Add(page);
-                updateButtonsState();
-            });
+                addRepliesPage(page, replies);
+                return;
+            }
+
+            LoadComponentAsync(page, loaded => addRepliesPage(loaded, replies));
+        }
+
+        private void addRepliesPage(FillFlowContainer<DrawableComment> page, IEnumerable<DrawableComment> replies)
+        {
+            childCommentsContainer.Add(page);
+
+            var newReplies = replies.Select(reply => reply.Comment);
+            LoadedReplies.AddRange(newReplies);
+            deletedCommentsCounter.Count.Value += newReplies.Count(reply => reply.IsDeleted);
+            updateButtonsState();
         }
 
         private FillFlowContainer<DrawableComment> createRepliesPage(IEnumerable<DrawableComment> replies) => new FillFlowContainer<DrawableComment>

From 5201c1c87bc5f3df3bb7679d52435b4e283979c6 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 13 Feb 2020 02:21:13 +0300
Subject: [PATCH 0404/1142] Use new algorithm for comments tree creation

---
 .../Online/API/Requests/Responses/Comment.cs  |  3 +
 osu.Game/Overlays/Comments/CommentsPage.cs    | 63 ++++++++++++++-----
 osu.Game/Overlays/Comments/DrawableComment.cs |  7 ++-
 3 files changed, 55 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Online/API/Requests/Responses/Comment.cs b/osu.Game/Online/API/Requests/Responses/Comment.cs
index 05a24cec0e..03ed8916e2 100644
--- a/osu.Game/Online/API/Requests/Responses/Comment.cs
+++ b/osu.Game/Online/API/Requests/Responses/Comment.cs
@@ -4,6 +4,7 @@
 using Newtonsoft.Json;
 using osu.Game.Users;
 using System;
+using System.Collections.Generic;
 
 namespace osu.Game.Online.API.Requests.Responses
 {
@@ -15,6 +16,8 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty(@"parent_id")]
         public long? ParentId { get; set; }
 
+        public readonly List<Comment> ChildComments = new List<Comment>();
+
         public Comment ParentComment { get; set; }
 
         [JsonProperty(@"user_id")]
diff --git a/osu.Game/Overlays/Comments/CommentsPage.cs b/osu.Game/Overlays/Comments/CommentsPage.cs
index f93cf90e88..3f63481458 100644
--- a/osu.Game/Overlays/Comments/CommentsPage.cs
+++ b/osu.Game/Overlays/Comments/CommentsPage.cs
@@ -12,7 +12,6 @@ using System.Linq;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API;
 using System.Collections.Generic;
-using osu.Framework.Extensions.IEnumerableExtensions;
 
 namespace osu.Game.Overlays.Comments
 {
@@ -27,6 +26,7 @@ namespace osu.Game.Overlays.Comments
         private IAPIProvider api { get; set; }
 
         private readonly CommentBundle commentBundle;
+        private FillFlowContainer flow;
 
         public CommentsPage(CommentBundle commentBundle)
         {
@@ -36,8 +36,6 @@ namespace osu.Game.Overlays.Comments
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
         {
-            FillFlowContainer flow;
-
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
@@ -62,24 +60,59 @@ namespace osu.Game.Overlays.Comments
                 return;
             }
 
-            commentBundle.Comments.ForEach(c =>
-            {
-                if (c.IsTopLevel)
-                    flow.Add(createCommentWithReplies(c, commentBundle));
-            });
+            createBaseTree(commentBundle.Comments);
         }
 
-        private DrawableComment createCommentWithReplies(Comment comment, CommentBundle commentBundle)
+        private void createBaseTree(List<Comment> comments)
+        {
+            var nodeDictionary = new Dictionary<long, Comment>();
+            var topLevelNodes = new List<Comment>();
+            var orphanedNodes = new List<Comment>();
+
+            foreach (var comment in comments)
+            {
+                nodeDictionary.Add(comment.Id, comment);
+
+                if (comment.IsTopLevel)
+                    topLevelNodes.Add(comment);
+
+                var orphanedNodesCopy = new List<Comment>(orphanedNodes);
+
+                foreach (var orphan in orphanedNodesCopy)
+                {
+                    if (orphan.ParentId == comment.Id)
+                    {
+                        orphan.ParentComment = comment;
+                        comment.ChildComments.Add(orphan);
+                        orphanedNodes.Remove(orphan);
+                    }
+                }
+
+                // No need to find parent for top-level comment
+                if (comment.IsTopLevel)
+                    continue;
+
+                if (nodeDictionary.ContainsKey(comment.ParentId.Value))
+                {
+                    comment.ParentComment = nodeDictionary[comment.ParentId.Value];
+                    nodeDictionary[comment.ParentId.Value].ChildComments.Add(comment);
+                }
+                else
+                    orphanedNodes.Add(comment);
+            }
+
+            foreach (var comment in topLevelNodes)
+                flow.Add(createCommentWithReplies(comment));
+        }
+
+        private DrawableComment createCommentWithReplies(Comment comment)
         {
             var drawableComment = createDrawableComment(comment);
 
-            var replies = commentBundle.Comments.Where(c => c.ParentId == comment.Id);
+            var replies = comment.ChildComments;
 
             if (replies.Any())
-            {
-                replies.ForEach(c => c.ParentComment = comment);
-                drawableComment.InitialReplies.AddRange(replies.Select(reply => createCommentWithReplies(reply, commentBundle)));
-            }
+                drawableComment.InitialReplies.AddRange(replies.Select(createCommentWithReplies));
 
             return drawableComment;
         }
@@ -100,7 +133,7 @@ namespace osu.Game.Overlays.Comments
             // We may receive already loaded comments
             receivedComments.ForEach(c =>
             {
-                if (drawableComment.LoadedReplies.All(loadedReply => loadedReply.Id != c.Id))
+                if (!drawableComment.LoadedReplies.ContainsKey(c.Id))
                     uniqueComments.Add(c);
             });
 
diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index 7b7f4726f7..7334c89eb5 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -20,6 +20,7 @@ using osuTK.Graphics;
 using System.Collections.Generic;
 using System;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Extensions.IEnumerableExtensions;
 
 namespace osu.Game.Overlays.Comments
 {
@@ -34,10 +35,10 @@ namespace osu.Game.Overlays.Comments
 
         public readonly BindableBool ShowDeleted = new BindableBool();
         public readonly Bindable<CommentsSortCriteria> Sort = new Bindable<CommentsSortCriteria>();
-        public readonly List<Comment> LoadedReplies = new List<Comment>();
+        public readonly Dictionary<long, Comment> LoadedReplies = new Dictionary<long, Comment>();
 
         /// <summary>
-        /// <see cref="DrawableComment"/>s which will be added to this <see cref="DrawableComment"/> as replies when it will be loaded.
+        /// <see cref="DrawableComment"/>s which will be added to this <see cref="DrawableComment"/> as replies on initial load.
         /// </summary>
         public readonly List<DrawableComment> InitialReplies = new List<DrawableComment>();
 
@@ -310,7 +311,7 @@ namespace osu.Game.Overlays.Comments
             childCommentsContainer.Add(page);
 
             var newReplies = replies.Select(reply => reply.Comment);
-            LoadedReplies.AddRange(newReplies);
+            newReplies.ForEach(reply => LoadedReplies.Add(reply.Id, reply));
             deletedCommentsCounter.Count.Value += newReplies.Count(reply => reply.IsDeleted);
             updateButtonsState();
         }

From c6f8e157fd0e5b459ef8b57d3ea8d4d9d95c8581 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 13 Feb 2020 02:37:41 +0300
Subject: [PATCH 0405/1142] Make loadedReplies dictionary private

---
 osu.Game/Overlays/Comments/CommentsPage.cs    | 2 +-
 osu.Game/Overlays/Comments/DrawableComment.cs | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentsPage.cs b/osu.Game/Overlays/Comments/CommentsPage.cs
index 3f63481458..ebce2177cf 100644
--- a/osu.Game/Overlays/Comments/CommentsPage.cs
+++ b/osu.Game/Overlays/Comments/CommentsPage.cs
@@ -133,7 +133,7 @@ namespace osu.Game.Overlays.Comments
             // We may receive already loaded comments
             receivedComments.ForEach(c =>
             {
-                if (!drawableComment.LoadedReplies.ContainsKey(c.Id))
+                if (!drawableComment.ContainsReply(c.Id))
                     uniqueComments.Add(c);
             });
 
diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index 7334c89eb5..8bc989761e 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Overlays.Comments
 
         public readonly BindableBool ShowDeleted = new BindableBool();
         public readonly Bindable<CommentsSortCriteria> Sort = new Bindable<CommentsSortCriteria>();
-        public readonly Dictionary<long, Comment> LoadedReplies = new Dictionary<long, Comment>();
+        private readonly Dictionary<long, Comment> loadedReplies = new Dictionary<long, Comment>();
 
         /// <summary>
         /// <see cref="DrawableComment"/>s which will be added to this <see cref="DrawableComment"/> as replies on initial load.
@@ -290,6 +290,8 @@ namespace osu.Game.Overlays.Comments
             base.LoadComplete();
         }
 
+        public bool ContainsReply(long replyId) => loadedReplies.ContainsKey(replyId);
+
         public void AddReplies(IEnumerable<DrawableComment> replies)
         {
             if (LoadState == LoadState.NotLoaded)
@@ -311,7 +313,7 @@ namespace osu.Game.Overlays.Comments
             childCommentsContainer.Add(page);
 
             var newReplies = replies.Select(reply => reply.Comment);
-            newReplies.ForEach(reply => LoadedReplies.Add(reply.Id, reply));
+            newReplies.ForEach(reply => loadedReplies.Add(reply.Id, reply));
             deletedCommentsCounter.Count.Value += newReplies.Count(reply => reply.IsDeleted);
             updateButtonsState();
         }
@@ -326,7 +328,7 @@ namespace osu.Game.Overlays.Comments
 
         private void updateButtonsState()
         {
-            var loadedReplesCount = LoadedReplies.Count;
+            var loadedReplesCount = loadedReplies.Count;
             var hasUnloadedReplies = loadedReplesCount != Comment.RepliesCount;
 
             loadMoreCommentsButton.FadeTo(hasUnloadedReplies && loadedReplesCount == 0 ? 1 : 0);

From b0db1555650b4c9298e2dab6a78039c5e7e2ca18 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 13 Feb 2020 02:47:13 +0300
Subject: [PATCH 0406/1142] Make replies addition more consistent

---
 osu.Game/Overlays/Comments/CommentsPage.cs    |  6 +++---
 osu.Game/Overlays/Comments/DrawableComment.cs | 16 ++++++----------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentsPage.cs b/osu.Game/Overlays/Comments/CommentsPage.cs
index ebce2177cf..cab3e49f62 100644
--- a/osu.Game/Overlays/Comments/CommentsPage.cs
+++ b/osu.Game/Overlays/Comments/CommentsPage.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Overlays.Comments
                 }
 
                 // No need to find parent for top-level comment
-                if (comment.IsTopLevel)
+                if (!comment.ParentId.HasValue)
                     continue;
 
                 if (nodeDictionary.ContainsKey(comment.ParentId.Value))
@@ -112,7 +112,7 @@ namespace osu.Game.Overlays.Comments
             var replies = comment.ChildComments;
 
             if (replies.Any())
-                drawableComment.InitialReplies.AddRange(replies.Select(createCommentWithReplies));
+                drawableComment.Replies.AddRange(replies.Select(createCommentWithReplies));
 
             return drawableComment;
         }
@@ -139,7 +139,7 @@ namespace osu.Game.Overlays.Comments
 
             uniqueComments.ForEach(c => c.ParentComment = drawableComment.Comment);
 
-            drawableComment.AddReplies(uniqueComments.Select(createDrawableComment));
+            drawableComment.Replies.AddRange(uniqueComments.Select(createDrawableComment));
         }
 
         private DrawableComment createDrawableComment(Comment comment) => new DrawableComment(comment)
diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index 8bc989761e..7774921f00 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -37,10 +37,7 @@ namespace osu.Game.Overlays.Comments
         public readonly Bindable<CommentsSortCriteria> Sort = new Bindable<CommentsSortCriteria>();
         private readonly Dictionary<long, Comment> loadedReplies = new Dictionary<long, Comment>();
 
-        /// <summary>
-        /// <see cref="DrawableComment"/>s which will be added to this <see cref="DrawableComment"/> as replies on initial load.
-        /// </summary>
-        public readonly List<DrawableComment> InitialReplies = new List<DrawableComment>();
+        public readonly BindableList<DrawableComment> Replies = new BindableList<DrawableComment>();
 
         private readonly BindableBool childrenExpanded = new BindableBool(true);
 
@@ -272,8 +269,10 @@ namespace osu.Game.Overlays.Comments
                 });
             }
 
-            if (InitialReplies.Any())
-                AddReplies(InitialReplies);
+            Replies.ItemsAdded += onRepliesAdded;
+
+            if (Replies.Any())
+                onRepliesAdded(Replies);
         }
 
         protected override void LoadComplete()
@@ -292,11 +291,8 @@ namespace osu.Game.Overlays.Comments
 
         public bool ContainsReply(long replyId) => loadedReplies.ContainsKey(replyId);
 
-        public void AddReplies(IEnumerable<DrawableComment> replies)
+        private void onRepliesAdded(IEnumerable<DrawableComment> replies)
         {
-            if (LoadState == LoadState.NotLoaded)
-                throw new NotSupportedException($@"Can't use {nameof(AddReplies)} when not loaded.");
-
             var page = createRepliesPage(replies);
 
             if (LoadState == LoadState.Loading)

From a8eb9ba45c71fe67fce625c74776919dea430d82 Mon Sep 17 00:00:00 2001
From: voidedWarranties <wz68.scratch@gmail.com>
Date: Wed, 12 Feb 2020 15:55:16 -0800
Subject: [PATCH 0407/1142] Update xmldoc

---
 osu.Game/Configuration/SettingSourceAttribute.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index 013621d7b7..4bdbb5fc24 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -18,8 +18,8 @@ namespace osu.Game.Configuration
     /// Can be used in conjunction with <see cref="SettingSourceExtensions.CreateSettingsControls"/> to automatically create UI controls.
     /// </summary>
     /// <remarks>
-    /// All controls with OrderPosition set to an int greater than 0 will be placed first in ascending order.
-    /// All controls with no OrderPosition will come afterward in default order.
+    /// All controls with <see cref="OrderPosition"/> set will be placed first in ascending order.
+    /// All controls with no <see cref="OrderPosition"/> will come afterward in default order.
     /// </remarks>
     [MeansImplicitUse]
     [AttributeUsage(AttributeTargets.Property)]

From 0fe41fd50a04c6b481eb8df4ad4b4622afda7f32 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Feb 2020 09:03:48 +0900
Subject: [PATCH 0408/1142] Fix blueprint showing even when mouse outside of
 container

---
 .../Edit/Blueprints/HoldNotePlacementBlueprint.cs  |  2 +-
 .../Edit/Blueprints/ManiaPlacementBlueprint.cs     |  2 +-
 .../Blueprints/Sliders/SliderPlacementBlueprint.cs |  2 +-
 .../Spinners/SpinnerPlacementBlueprint.cs          |  2 +-
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs       | 14 ++++++++------
 .../Components/ComposeBlueprintContainer.cs        |  2 +-
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
index bcbc1ee527..7bbde400ea 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/HoldNotePlacementBlueprint.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
         {
             base.UpdatePosition(screenSpacePosition);
 
-            if (PlacementBegun)
+            if (PlacementActive)
             {
                 var endTime = TimeAt(screenSpacePosition);
 
diff --git a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
index 362d6d40a8..a3657d3bb9 100644
--- a/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaPlacementBlueprint.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Rulesets.Mania.Edit.Blueprints
 
         public override void UpdatePosition(Vector2 screenSpacePosition)
         {
-            if (!PlacementBegun)
+            if (!PlacementActive)
                 Column = ColumnAt(screenSpacePosition);
 
             if (Column == null) return;
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
index 75d05b9b6c..a780653796 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/SliderPlacementBlueprint.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Sliders
 
         private void beginCurve()
         {
-            BeginPlacement();
+            BeginPlacement(commitStart: true);
             setState(PlacementState.Body);
         }
 
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs
index 2c125aa7c3..74b563d922 100644
--- a/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerPlacementBlueprint.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners
                 if (e.Button != MouseButton.Left)
                     return false;
 
-                BeginPlacement();
+                BeginPlacement(commitStart: true);
                 piece.FadeTo(1f, 150, Easing.OutQuint);
 
                 isPlacingEnd = true;
diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index 24fa96e1c5..8a4ed61d00 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -28,9 +28,9 @@ namespace osu.Game.Rulesets.Edit
         public event Action<PlacementState> StateChanged;
 
         /// <summary>
-        /// Whether the <see cref="HitObject"/> is currently being placed, but has not necessarily finished being placed.
+        /// Whether the <see cref="HitObject"/> is currently mid-placement, but has not necessarily finished being placed.
         /// </summary>
-        public bool PlacementBegun { get; private set; }
+        public bool PlacementActive { get; private set; }
 
         /// <summary>
         /// The <see cref="HitObject"/> that is being placed.
@@ -92,23 +92,25 @@ namespace osu.Game.Rulesets.Edit
         /// Signals that the placement of <see cref="HitObject"/> has started.
         /// </summary>
         /// <param name="startTime">The start time of <see cref="HitObject"/> at the placement point. If null, the current clock time is used.</param>
-        protected void BeginPlacement(double? startTime = null)
+        /// <param name="commitStart">Whether this call is committing a value for HitObject.StartTime and continuing with further adjustments.</param>
+        protected void BeginPlacement(double? startTime = null, bool commitStart = false)
         {
             HitObject.StartTime = startTime ?? EditorClock.CurrentTime;
             placementHandler.BeginPlacement(HitObject);
-            PlacementBegun = true;
+            PlacementActive |= commitStart;
         }
 
         /// <summary>
         /// Signals that the placement of <see cref="HitObject"/> has finished.
-        /// This will destroy this <see cref="PlacementBlueprint"/>, and add the <see cref="HitObject"/> to the <see cref="Beatmap"/>.
+        /// This will destroy this <see cref="PlacementBlueprint"/>, and add the HitObject.StartTime to the <see cref="Beatmap"/>.
         /// </summary>
         /// <param name="commit">Whether the object should be committed.</param>
         public void EndPlacement(bool commit)
         {
-            if (!PlacementBegun)
+            if (!PlacementActive)
                 BeginPlacement();
             placementHandler.EndPlacement(HitObject, commit);
+            PlacementActive = false;
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index b257688568..9ebfaef563 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
             {
                 if (composer.CursorInPlacementArea)
                     currentPlacement.State = PlacementState.Shown;
-                else if (currentPlacement?.PlacementBegun == false)
+                else if (currentPlacement?.PlacementActive == false)
                     currentPlacement.State = PlacementState.Hidden;
             }
         }

From 483bbac6fd0a8b27b24a7a6eaad3a2b86b07d01e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 13 Feb 2020 03:13:56 +0300
Subject: [PATCH 0409/1142] Simplify CommentsPage.onCommentRepliesReceived

---
 osu.Game/Overlays/Comments/CommentsPage.cs | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentsPage.cs b/osu.Game/Overlays/Comments/CommentsPage.cs
index cab3e49f62..5d64313e4f 100644
--- a/osu.Game/Overlays/Comments/CommentsPage.cs
+++ b/osu.Game/Overlays/Comments/CommentsPage.cs
@@ -126,16 +126,8 @@ namespace osu.Game.Overlays.Comments
 
         private void onCommentRepliesReceived(CommentBundle response, DrawableComment drawableComment)
         {
-            var receivedComments = response.Comments;
-
-            var uniqueComments = new List<Comment>();
-
             // We may receive already loaded comments
-            receivedComments.ForEach(c =>
-            {
-                if (!drawableComment.ContainsReply(c.Id))
-                    uniqueComments.Add(c);
-            });
+            var uniqueComments = response.Comments.Where(c => !drawableComment.ContainsReply(c.Id)).ToList();
 
             uniqueComments.ForEach(c => c.ParentComment = drawableComment.Comment);
 

From b65e839bd26c00507d2038cfca6cc85e2ef218be Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Feb 2020 10:00:09 +0900
Subject: [PATCH 0410/1142] Simplify blueprints by removing visible state

---
 osu.Game/Rulesets/Edit/PlacementBlueprint.cs  | 38 +------------------
 .../Components/ComposeBlueprintContainer.cs   | 22 ++++++-----
 2 files changed, 14 insertions(+), 46 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
index 8a4ed61d00..ea77a6091a 100644
--- a/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
+++ b/osu.Game/Rulesets/Edit/PlacementBlueprint.cs
@@ -1,8 +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;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -20,13 +18,8 @@ namespace osu.Game.Rulesets.Edit
     /// <summary>
     /// A blueprint which governs the creation of a new <see cref="HitObject"/> to actualisation.
     /// </summary>
-    public abstract class PlacementBlueprint : CompositeDrawable, IStateful<PlacementState>
+    public abstract class PlacementBlueprint : CompositeDrawable
     {
-        /// <summary>
-        /// Invoked when <see cref="State"/> has changed.
-        /// </summary>
-        public event Action<PlacementState> StateChanged;
-
         /// <summary>
         /// Whether the <see cref="HitObject"/> is currently mid-placement, but has not necessarily finished being placed.
         /// </summary>
@@ -53,8 +46,6 @@ namespace osu.Game.Rulesets.Edit
             // This is required to allow the blueprint's position to be updated via OnMouseMove/Handle
             // on the same frame it is made visible via a PlacementState change.
             AlwaysPresent = true;
-
-            Alpha = 0;
         }
 
         [BackgroundDependencyLoader]
@@ -67,27 +58,6 @@ namespace osu.Game.Rulesets.Edit
             ApplyDefaultsToHitObject();
         }
 
-        private PlacementState state;
-
-        public PlacementState State
-        {
-            get => state;
-            set
-            {
-                if (state == value)
-                    return;
-
-                state = value;
-
-                if (state == PlacementState.Shown)
-                    Show();
-                else
-                    Hide();
-
-                StateChanged?.Invoke(value);
-            }
-        }
-
         /// <summary>
         /// Signals that the placement of <see cref="HitObject"/> has started.
         /// </summary>
@@ -144,10 +114,4 @@ namespace osu.Game.Rulesets.Edit
             }
         }
     }
-
-    public enum PlacementState
-    {
-        Hidden,
-        Shown,
-    }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 9ebfaef563..48c570b8d0 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -64,8 +64,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             placementBlueprintContainer.Clear();
 
-            currentPlacement?.EndPlacement(false);
-            currentPlacement = null;
+            removePlacement();
 
             var blueprint = CurrentTool?.CreatePlacementBlueprint();
 
@@ -103,18 +102,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             base.Update();
 
-            if (currentPlacement != null)
-            {
-                if (composer.CursorInPlacementArea)
-                    currentPlacement.State = PlacementState.Shown;
-                else if (currentPlacement?.PlacementActive == false)
-                    currentPlacement.State = PlacementState.Hidden;
-            }
+            if (currentPlacement?.PlacementActive == false && !composer.CursorInPlacementArea)
+                removePlacement();
         }
 
         protected sealed override SelectionBlueprint CreateBlueprintFor(HitObject hitObject)
         {
             var drawable = drawableHitObjects.FirstOrDefault(d => d.HitObject == hitObject);
+
             if (drawable == null)
                 return null;
 
@@ -129,6 +124,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
             base.AddBlueprintFor(hitObject);
         }
 
+        private void removePlacement()
+        {
+            if (currentPlacement == null) return;
+
+            currentPlacement.EndPlacement(false);
+            currentPlacement = null;
+        }
+
         private HitObjectCompositionTool currentTool;
 
         /// <summary>
@@ -137,6 +140,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         public HitObjectCompositionTool CurrentTool
         {
             get => currentTool;
+
             set
             {
                 if (currentTool == value)

From c391a464a5ecffb8fda5ba27cabcc9aa733503fd Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 13 Feb 2020 04:06:34 +0300
Subject: [PATCH 0411/1142] Add tests

---
 .../UserInterface/TestSceneCommentEditor.cs   | 106 +++++++++++++++---
 osu.Game/Overlays/Comments/CommentEditor.cs   |  13 ++-
 2 files changed, 96 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
index e32bf05197..a7888bb0b4 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
@@ -3,18 +3,19 @@
 
 using System;
 using System.Collections.Generic;
+using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Comments;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
-    public class TestSceneCommentEditor : OsuTestScene
+    public class TestSceneCommentEditor : ManualInputManagerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -25,20 +26,76 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
-        private readonly OsuSpriteText text;
-        private readonly TestCommentEditor commentEditor;
-        private readonly TestCancellableCommentEditor cancellableCommentEditor;
+        private TestCommentEditor commentEditor;
+        private TestCancellableCommentEditor cancellableCommentEditor;
+        private string commitText;
+        private bool cancelActionFired;
 
-        public TestSceneCommentEditor()
+        [Test]
+        public void TestCommitViaKeyboard()
         {
-            Add(new Container
+            AddStep("Create", createEditors);
+            AddStep("Click on textbox", () =>
             {
-                AutoSizeAxes = Axes.Both,
-                Child = text = new OsuSpriteText
-                {
-                    Font = OsuFont.GetFont()
-                }
+                InputManager.MoveMouseTo(commentEditor);
+                InputManager.Click(MouseButton.Left);
             });
+            AddStep("Write something", () => commentEditor.Current.Value = "text");
+            AddStep("Click Enter", () => press(Key.Enter));
+            AddAssert("Text has been invoked", () => !string.IsNullOrEmpty(commitText));
+            AddAssert("Button is loading", () => commentEditor.IsLoading);
+        }
+
+        [Test]
+        public void TestCommitViaKeyboardWhenEmpty()
+        {
+            AddStep("Create", createEditors);
+            AddStep("Click on textbox", () =>
+            {
+                InputManager.MoveMouseTo(commentEditor);
+                InputManager.Click(MouseButton.Left);
+            });
+            AddStep("Click Enter", () => press(Key.Enter));
+            AddAssert("Text not invoked", () => string.IsNullOrEmpty(commitText));
+            AddAssert("Button is not loading", () => !commentEditor.IsLoading);
+        }
+
+        [Test]
+        public void TestCommitViaButton()
+        {
+            AddStep("Create", createEditors);
+            AddStep("Click on textbox", () =>
+            {
+                InputManager.MoveMouseTo(commentEditor);
+                InputManager.Click(MouseButton.Left);
+            });
+            AddStep("Write something", () => commentEditor.Current.Value = "text");
+            AddStep("Click on button", () =>
+            {
+                InputManager.MoveMouseTo(commentEditor.ButtonsContainer);
+                InputManager.Click(MouseButton.Left);
+            });
+            AddAssert("Text has been invoked", () => !string.IsNullOrEmpty(commitText));
+            AddAssert("Button is loading", () => commentEditor.IsLoading);
+        }
+
+        [Test]
+        public void TestCancelAction()
+        {
+            AddStep("Create", createEditors);
+            AddStep("Click on cancel button", () =>
+            {
+                InputManager.MoveMouseTo(cancellableCommentEditor.ButtonsContainer);
+                InputManager.Click(MouseButton.Left);
+            });
+            AddAssert("Cancel action is fired", () => cancelActionFired);
+        }
+
+        private void createEditors()
+        {
+            Clear();
+            commitText = string.Empty;
+            cancelActionFired = false;
 
             Add(new FillFlowContainer
             {
@@ -52,11 +109,12 @@ namespace osu.Game.Tests.Visual.UserInterface
                 {
                     commentEditor = new TestCommentEditor
                     {
-                        OnCommit = onCommit
+                        OnCommit = onCommit,
                     },
                     cancellableCommentEditor = new TestCancellableCommentEditor
                     {
-                        OnCommit = onCommit
+                        OnCommit = onCommit,
+                        OnCancel = onCancel
                     }
                 }
             });
@@ -64,17 +122,29 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private void onCommit(string value)
         {
-            text.Text = $@"Invoked text: {value}";
+            commitText = value;
 
             Scheduler.AddDelayed(() =>
             {
                 commentEditor.IsLoading = false;
                 cancellableCommentEditor.IsLoading = false;
-            }, 500);
+            }, 1000);
+        }
+
+        private void onCancel() => cancelActionFired = true;
+
+        private void press(Key key)
+        {
+            InputManager.PressKey(key);
+            InputManager.ReleaseKey(key);
         }
 
         private class TestCommentEditor : CommentEditor
         {
+            public new Bindable<string> Current => base.Current;
+
+            public new FillFlowContainer ButtonsContainer => base.ButtonsContainer;
+
             protected override string FooterText => @"Footer text. And it is pretty long. Cool.";
 
             protected override string CommitButtonText => @"Commit";
@@ -84,6 +154,8 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private class TestCancellableCommentEditor : CancellableCommentEditor
         {
+            public new FillFlowContainer ButtonsContainer => base.ButtonsContainer;
+
             protected override string FooterText => @"Wow, another one. Sicc";
 
             protected override string CommitButtonText => @"Save";
diff --git a/osu.Game/Overlays/Comments/CommentEditor.cs b/osu.Game/Overlays/Comments/CommentEditor.cs
index edd09cc95f..765e5e228c 100644
--- a/osu.Game/Overlays/Comments/CommentEditor.cs
+++ b/osu.Game/Overlays/Comments/CommentEditor.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Overlays.Comments
 
         protected FillFlowContainer ButtonsContainer;
 
-        private readonly Bindable<string> current = new Bindable<string>();
+        protected readonly Bindable<string> Current = new Bindable<string>();
 
         private CommitButton commitButton;
 
@@ -73,7 +73,7 @@ namespace osu.Game.Overlays.Comments
                             Height = 40,
                             RelativeSizeAxes = Axes.X,
                             PlaceholderText = TextboxPlaceholderText,
-                            Current = current
+                            Current = Current
                         },
                         new Container
                         {
@@ -104,8 +104,8 @@ namespace osu.Game.Overlays.Comments
                                         Origin = Anchor.CentreRight,
                                         Action = () =>
                                         {
-                                            OnCommit?.Invoke(current.Value);
-                                            current.Value = string.Empty;
+                                            OnCommit?.Invoke(Current.Value);
+                                            Current.Value = string.Empty;
                                         }
                                     }
                                 }
@@ -128,7 +128,7 @@ namespace osu.Game.Overlays.Comments
         {
             base.LoadComplete();
 
-            current.BindValueChanged(text => commitButton.IsBlocked.Value = string.IsNullOrEmpty(text.NewValue), true);
+            Current.BindValueChanged(text => commitButton.IsBlocked.Value = string.IsNullOrEmpty(text.NewValue), true);
         }
 
         private class EditorTextbox : BasicTextBox
@@ -219,7 +219,8 @@ namespace osu.Game.Overlays.Comments
                     },
                     background = new Box
                     {
-                        RelativeSizeAxes = Axes.Both
+                        RelativeSizeAxes = Axes.Both,
+                        Alpha = 0
                     },
                     drawableText = new OsuSpriteText
                     {

From 2b6f99d4043adef41cd9740a72bd84db1d37b17f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Feb 2020 10:05:50 +0900
Subject: [PATCH 0412/1142] Standardise placement blueprint creation and
 destruction

---
 .../Components/ComposeBlueprintContainer.cs   | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 48c570b8d0..8b47ea2c6c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -62,19 +62,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
         /// </summary>
         private void refreshTool()
         {
-            placementBlueprintContainer.Clear();
-
             removePlacement();
-
-            var blueprint = CurrentTool?.CreatePlacementBlueprint();
-
-            if (blueprint != null)
-            {
-                placementBlueprintContainer.Child = currentPlacement = blueprint;
-
-                // Fixes a 1-frame position discrepancy due to the first mouse move event happening in the next frame
-                updatePlacementPosition(inputManager.CurrentState.Mouse.Position);
-            }
+            createPlacement();
         }
 
         private void updatePlacementPosition(Vector2 screenSpacePosition)
@@ -102,7 +91,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
         {
             base.Update();
 
-            if (currentPlacement?.PlacementActive == false && !composer.CursorInPlacementArea)
+            if (composer.CursorInPlacementArea)
+                createPlacement();
+            else if (currentPlacement?.PlacementActive == false)
                 removePlacement();
         }
 
@@ -124,11 +115,27 @@ namespace osu.Game.Screens.Edit.Compose.Components
             base.AddBlueprintFor(hitObject);
         }
 
+        private void createPlacement()
+        {
+            if (currentPlacement != null) return;
+
+            var blueprint = CurrentTool?.CreatePlacementBlueprint();
+
+            if (blueprint != null)
+            {
+                placementBlueprintContainer.Child = currentPlacement = blueprint;
+
+                // Fixes a 1-frame position discrepancy due to the first mouse move event happening in the next frame
+                updatePlacementPosition(inputManager.CurrentState.Mouse.Position);
+            }
+        }
+
         private void removePlacement()
         {
             if (currentPlacement == null) return;
 
             currentPlacement.EndPlacement(false);
+            currentPlacement.Expire();
             currentPlacement = null;
         }
 

From e34a24a063dc7e67a48dc16abe1463012e4133ae Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Feb 2020 10:45:16 +0900
Subject: [PATCH 0413/1142] Update placement blueprint more often for better
 display

---
 .../Components/ComposeBlueprintContainer.cs        | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 8b47ea2c6c..7087eac6b6 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -76,17 +76,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
 
         #endregion
 
-        protected override bool OnMouseMove(MouseMoveEvent e)
-        {
-            if (currentPlacement != null)
-            {
-                updatePlacementPosition(e.ScreenSpaceMousePosition);
-                return true;
-            }
-
-            return base.OnMouseMove(e);
-        }
-
         protected override void Update()
         {
             base.Update();
@@ -95,6 +84,9 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 createPlacement();
             else if (currentPlacement?.PlacementActive == false)
                 removePlacement();
+
+            if (currentPlacement != null)
+                updatePlacementPosition(inputManager.CurrentState.Mouse.Position);
         }
 
         protected sealed override SelectionBlueprint CreateBlueprintFor(HitObject hitObject)

From b1b2e4a0419ef5cb5f45b7ad5ccb0b3b97507b1d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 13 Feb 2020 04:50:04 +0300
Subject: [PATCH 0414/1142] Simplify parent comment assignment

---
 osu.Game/Overlays/Comments/CommentsPage.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentsPage.cs b/osu.Game/Overlays/Comments/CommentsPage.cs
index 5d64313e4f..43a223be8b 100644
--- a/osu.Game/Overlays/Comments/CommentsPage.cs
+++ b/osu.Game/Overlays/Comments/CommentsPage.cs
@@ -63,9 +63,10 @@ namespace osu.Game.Overlays.Comments
             createBaseTree(commentBundle.Comments);
         }
 
+        private readonly Dictionary<long, Comment> nodeDictionary = new Dictionary<long, Comment>();
+
         private void createBaseTree(List<Comment> comments)
         {
-            var nodeDictionary = new Dictionary<long, Comment>();
             var topLevelNodes = new List<Comment>();
             var orphanedNodes = new List<Comment>();
 
@@ -82,7 +83,6 @@ namespace osu.Game.Overlays.Comments
                 {
                     if (orphan.ParentId == comment.Id)
                     {
-                        orphan.ParentComment = comment;
                         comment.ChildComments.Add(orphan);
                         orphanedNodes.Remove(orphan);
                     }
@@ -93,10 +93,7 @@ namespace osu.Game.Overlays.Comments
                     continue;
 
                 if (nodeDictionary.ContainsKey(comment.ParentId.Value))
-                {
-                    comment.ParentComment = nodeDictionary[comment.ParentId.Value];
                     nodeDictionary[comment.ParentId.Value].ChildComments.Add(comment);
-                }
                 else
                     orphanedNodes.Add(comment);
             }
@@ -107,6 +104,9 @@ namespace osu.Game.Overlays.Comments
 
         private DrawableComment createCommentWithReplies(Comment comment)
         {
+            if (comment.ParentId.HasValue)
+                comment.ParentComment = nodeDictionary[comment.ParentId.Value];
+
             var drawableComment = createDrawableComment(comment);
 
             var replies = comment.ChildComments;

From 487dd47c9e9496969921ed90986297c1f4318422 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Feb 2020 11:14:09 +0900
Subject: [PATCH 0415/1142] Add mouse down repeat support to timeline zoom
 buttons

---
 .../Components/Timeline/TimelineButton.cs     | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineButton.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineButton.cs
index 8865bf31ea..5550c6a748 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineButton.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineButton.cs
@@ -6,10 +6,13 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Events;
+using osu.Framework.Threading;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osuTK;
 using osuTK.Graphics;
+using osuTK.Input;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
@@ -52,6 +55,45 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 HoverColour = OsuColour.Gray(0.25f);
                 FlashColour = OsuColour.Gray(0.5f);
             }
+
+            private ScheduledDelegate repeatSchedule;
+
+            /// <summary>
+            /// The initial delay before mouse down repeat begins.
+            /// </summary>
+            private const int repeat_initial_delay = 250;
+
+            /// <summary>
+            /// The delay between mouse down repeats after the initial repeat.
+            /// </summary>
+            private const int repeat_tick_rate = 70;
+
+            protected override bool OnClick(ClickEvent e)
+            {
+                // don't actuate a click since we are manually handling repeats.
+                return true;
+            }
+
+            protected override bool OnMouseDown(MouseDownEvent e)
+            {
+                if (e.Button == MouseButton.Left)
+                {
+                    Action clickAction = () => base.OnClick(new ClickEvent(e.CurrentState, e.Button));
+
+                    // run once for initial down
+                    clickAction();
+
+                    Scheduler.Add(repeatSchedule = new ScheduledDelegate(clickAction, Clock.CurrentTime + repeat_initial_delay, repeat_tick_rate));
+                }
+
+                return base.OnMouseDown(e);
+            }
+
+            protected override void OnMouseUp(MouseUpEvent e)
+            {
+                repeatSchedule?.Cancel();
+                base.OnMouseUp(e);
+            }
         }
     }
 }

From 03bf10f9a24a7a5b259e13435a9979c4e32adfea Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Feb 2020 11:15:00 +0900
Subject: [PATCH 0416/1142] Remove unused using statement

---
 .../Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
index 7087eac6b6..0eb77a8561 100644
--- a/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/ComposeBlueprintContainer.cs
@@ -7,7 +7,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
-using osu.Framework.Input.Events;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Objects;

From 118f862342dd5903cfdea4661c15302ca6b361f1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Feb 2020 12:02:10 +0900
Subject: [PATCH 0417/1142] Fix not being able to seek using scroll wheel in
 timeline while playing track

---
 .../Components/Timeline/ZoomableScrollContainer.cs   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
index 7ce8a751e0..baaad63e57 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
@@ -2,10 +2,12 @@
 // 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.Transforms;
 using osu.Framework.Input.Events;
+using osu.Framework.Timing;
 using osu.Framework.Utils;
 using osu.Game.Graphics.Containers;
 using osuTK;
@@ -30,6 +32,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private float currentZoom = 1;
 
+        [Resolved]
+        private IFrameBasedClock editorClock { get; set; }
+
         public ZoomableScrollContainer()
             : base(Direction.Horizontal)
         {
@@ -104,8 +109,15 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         protected override bool OnScroll(ScrollEvent e)
         {
             if (e.IsPrecise)
+            {
+                // can't handle scroll correctly while playing.
+                // the editor will handle this case for us.
+                if (editorClock.IsRunning)
+                    return false;
+
                 // for now, we don't support zoom when using a precision scroll device. this needs gesture support.
                 return base.OnScroll(e);
+            }
 
             setZoomTarget(zoomTarget + e.ScrollDelta.Y, zoomedContent.ToLocalSpace(e.ScreenSpaceMousePosition).X);
             return true;

From b126c002924788acd7dd62cc410821db081da0fa Mon Sep 17 00:00:00 2001
From: voidedWarranties <wz68.scratch@gmail.com>
Date: Wed, 12 Feb 2020 19:05:08 -0800
Subject: [PATCH 0418/1142] Use dependency loader to get SongSelect instance

---
 osu.Game/Screens/Select/BeatmapCarousel.cs    |  7 +----
 .../Select/Carousel/CarouselBeatmapSet.cs     |  5 +---
 .../Carousel/DrawableCarouselBeatmapSet.cs    | 27 ++++++++++---------
 osu.Game/Screens/Select/SongSelect.cs         |  3 +--
 4 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 1777527ced..592e26adc2 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -53,11 +53,6 @@ namespace osu.Game.Screens.Select
         /// </summary>
         public Action<BeatmapInfo> SelectionChanged;
 
-        /// <summary>
-        /// Raised when user finalises beatmap selection using <see cref="DrawableCarouselBeatmapSet.FilterableDifficultyIcon"/>
-        /// </summary>
-        public Action<BeatmapInfo> SelectionFinalised;
-
         public override bool HandleNonPositionalInput => AllowSelection;
         public override bool HandlePositionalInput => AllowSelection;
 
@@ -582,7 +577,7 @@ namespace osu.Game.Screens.Select
                     b.Metadata = beatmapSet.Metadata;
             }
 
-            var set = new CarouselBeatmapSet(beatmapSet, this);
+            var set = new CarouselBeatmapSet(beatmapSet);
 
             foreach (var c in set.Beatmaps)
             {
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
index 66ee4d2aee..301d0d4dae 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
@@ -15,9 +15,8 @@ namespace osu.Game.Screens.Select.Carousel
         public IEnumerable<CarouselBeatmap> Beatmaps => InternalChildren.OfType<CarouselBeatmap>();
 
         public BeatmapSetInfo BeatmapSet;
-        public BeatmapCarousel Carousel;
 
-        public CarouselBeatmapSet(BeatmapSetInfo beatmapSet, BeatmapCarousel carousel)
+        public CarouselBeatmapSet(BeatmapSetInfo beatmapSet)
         {
             BeatmapSet = beatmapSet ?? throw new ArgumentNullException(nameof(beatmapSet));
 
@@ -25,8 +24,6 @@ namespace osu.Game.Screens.Select.Carousel
                       .Where(b => !b.Hidden)
                       .Select(b => new CarouselBeatmap(b))
                       .ForEach(AddChild);
-
-            Carousel = carousel;
         }
 
         protected override DrawableCarouselItem CreateDrawableRepresentation() => new DrawableCarouselBeatmapSet(this);
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 536fca9e6f..fd13bdc3eb 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -34,18 +34,20 @@ namespace osu.Game.Screens.Select.Carousel
         private DialogOverlay dialogOverlay;
         private readonly BeatmapSetInfo beatmapSet;
 
-        private BeatmapCarousel carousel;
+        private SongSelect songSelect;
 
         public DrawableCarouselBeatmapSet(CarouselBeatmapSet set)
             : base(set)
         {
             beatmapSet = set.BeatmapSet;
-            carousel = set.Carousel;
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(BeatmapManager manager, BeatmapSetOverlay beatmapOverlay, DialogOverlay overlay)
+        private void load(SongSelect songSelect, BeatmapManager manager, BeatmapSetOverlay beatmapOverlay, DialogOverlay overlay)
         {
+            if(songSelect != null)
+                this.songSelect = songSelect;
+
             restoreHiddenRequested = s => s.Beatmaps.ForEach(manager.Restore);
             dialogOverlay = overlay;
             if (beatmapOverlay != null)
@@ -121,7 +123,7 @@ namespace osu.Game.Screens.Select.Carousel
 
             return beatmaps.Count > maximum_difficulty_icons
                 ? (IEnumerable<DifficultyIcon>)beatmaps.GroupBy(b => b.Beatmap.Ruleset).Select(group => new FilterableGroupedDifficultyIcon(group.ToList(), group.Key))
-                : beatmaps.Select(b => new FilterableDifficultyIcon(b, carousel));
+                : beatmaps.Select(b => new FilterableDifficultyIcon(b, songSelect, songSelect.Carousel));
         }
 
         public MenuItem[] ContextMenuItems
@@ -214,32 +216,33 @@ namespace osu.Game.Screens.Select.Carousel
         {
             private readonly BindableBool filtered = new BindableBool();
 
+            private SongSelect songSelect;
             private BeatmapCarousel carousel;
             private BeatmapInfo info;
 
-            public FilterableDifficultyIcon(CarouselBeatmap item, BeatmapCarousel carousel)
+            public FilterableDifficultyIcon(CarouselBeatmap item, SongSelect songSelect, BeatmapCarousel carousel)
                 : base(item.Beatmap)
             {
                 filtered.BindTo(item.Filtered);
                 filtered.ValueChanged += isFiltered => Schedule(() => this.FadeTo(isFiltered.NewValue ? 0.1f : 1, 100));
                 filtered.TriggerChange();
 
+                this.songSelect = songSelect;
                 this.carousel = carousel;
                 info = item.Beatmap;
             }
 
             protected override bool OnClick(ClickEvent e)
             {
-                if(e.AltPressed || carousel.SelectedBeatmap == info)
+                if(!filtered.Value)
                 {
-                    Schedule(() => carousel.SelectionFinalised?.Invoke(info));
-                }
-                else
-                {
-                    carousel.SelectBeatmap(info);
+                    carousel?.SelectBeatmap(info);
+
+                    if (e.AltPressed)
+                        songSelect?.FinaliseSelection();
                 }
 
-                return true;
+                return base.OnClick(e);
             }
         }
 
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index bfa693cf3d..463a17989a 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Screens.Select
 
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap.Value);
 
-        protected BeatmapCarousel Carousel { get; private set; }
+        public BeatmapCarousel Carousel { get; private set; }
 
         private BeatmapInfoWedge beatmapInfoWedge;
         private DialogOverlay dialogOverlay;
@@ -155,7 +155,6 @@ namespace osu.Game.Screens.Select
                                             Origin = Anchor.CentreRight,
                                             RelativeSizeAxes = Axes.Both,
                                             SelectionChanged = updateSelectedBeatmap,
-                                            SelectionFinalised = beatmapInfo => { FinaliseSelection(beatmapInfo); },
                                             BeatmapSetsChanged = carouselBeatmapsLoaded,
                                         },
                                     }

From f8b69fe63285186a2e6b661e875353696e86ce1f Mon Sep 17 00:00:00 2001
From: voidedWarranties <wz68.scratch@gmail.com>
Date: Wed, 12 Feb 2020 20:11:39 -0800
Subject: [PATCH 0419/1142] Remove unnecessary carousel variable, fix code
 formatting

---
 .../Carousel/DrawableCarouselBeatmapSet.cs       | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index fd13bdc3eb..80dae575ff 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Screens.Select.Carousel
         [BackgroundDependencyLoader(true)]
         private void load(SongSelect songSelect, BeatmapManager manager, BeatmapSetOverlay beatmapOverlay, DialogOverlay overlay)
         {
-            if(songSelect != null)
+            if (songSelect != null)
                 this.songSelect = songSelect;
 
             restoreHiddenRequested = s => s.Beatmaps.ForEach(manager.Restore);
@@ -123,7 +123,7 @@ namespace osu.Game.Screens.Select.Carousel
 
             return beatmaps.Count > maximum_difficulty_icons
                 ? (IEnumerable<DifficultyIcon>)beatmaps.GroupBy(b => b.Beatmap.Ruleset).Select(group => new FilterableGroupedDifficultyIcon(group.ToList(), group.Key))
-                : beatmaps.Select(b => new FilterableDifficultyIcon(b, songSelect, songSelect.Carousel));
+                : beatmaps.Select(b => new FilterableDifficultyIcon(b, songSelect));
         }
 
         public MenuItem[] ContextMenuItems
@@ -216,11 +216,10 @@ namespace osu.Game.Screens.Select.Carousel
         {
             private readonly BindableBool filtered = new BindableBool();
 
-            private SongSelect songSelect;
-            private BeatmapCarousel carousel;
-            private BeatmapInfo info;
+            private readonly SongSelect songSelect;
+            private readonly BeatmapInfo info;
 
-            public FilterableDifficultyIcon(CarouselBeatmap item, SongSelect songSelect, BeatmapCarousel carousel)
+            public FilterableDifficultyIcon(CarouselBeatmap item, SongSelect songSelect)
                 : base(item.Beatmap)
             {
                 filtered.BindTo(item.Filtered);
@@ -228,15 +227,14 @@ namespace osu.Game.Screens.Select.Carousel
                 filtered.TriggerChange();
 
                 this.songSelect = songSelect;
-                this.carousel = carousel;
                 info = item.Beatmap;
             }
 
             protected override bool OnClick(ClickEvent e)
             {
-                if(!filtered.Value)
+                if (!filtered.Value)
                 {
-                    carousel?.SelectBeatmap(info);
+                    songSelect?.Carousel.SelectBeatmap(info);
 
                     if (e.AltPressed)
                         songSelect?.FinaliseSelection();

From 045d1f9c5b8db2974b53f8157bad41e0d2947e9c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Feb 2020 13:34:59 +0900
Subject: [PATCH 0420/1142] Disallow seeking on osu!direct download progress
 bars

---
 osu.Game/Overlays/Direct/DownloadProgressBar.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Direct/DownloadProgressBar.cs b/osu.Game/Overlays/Direct/DownloadProgressBar.cs
index a6cefaae84..9a8644efd2 100644
--- a/osu.Game/Overlays/Direct/DownloadProgressBar.cs
+++ b/osu.Game/Overlays/Direct/DownloadProgressBar.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Direct
         public DownloadProgressBar(BeatmapSetInfo beatmapSet)
             : base(beatmapSet)
         {
-            AddInternal(progressBar = new ProgressBar
+            AddInternal(progressBar = new InteractionDisabledProgressBar
             {
                 Height = 0,
                 Alpha = 0,
@@ -64,5 +64,11 @@ namespace osu.Game.Overlays.Direct
                 }
             }, true);
         }
+
+        private class InteractionDisabledProgressBar : ProgressBar
+        {
+            public override bool HandlePositionalInput => false;
+            public override bool HandleNonPositionalInput => false;
+        }
     }
 }

From 6f7196b0b81c4063c43006f655090e434df259a9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 12 Feb 2020 19:52:47 +0900
Subject: [PATCH 0421/1142] Make beatmap detail area abstractable

---
 osu.Game/Configuration/OsuConfigManager.cs    |   2 +-
 osu.Game/Screens/Select/BeatmapDetailArea.cs  | 106 +++++++------
 .../Select/BeatmapDetailAreaDetailTabItem.cs  |  10 ++
 .../BeatmapDetailAreaLeaderboardTabItem.cs    |  22 +++
 .../Select/BeatmapDetailAreaTabControl.cs     |  51 ++++---
 .../Select/BeatmapDetailAreaTabItem.cs        |  35 +++++
 osu.Game/Screens/Select/MatchSongSelect.cs    |   2 +
 .../Screens/Select/PlayBeatmapDetailArea.cs   | 143 ++++++++++++++++++
 osu.Game/Screens/Select/PlaySongSelect.cs     |   4 +
 osu.Game/Screens/Select/SongSelect.cs         |  20 +--
 10 files changed, 318 insertions(+), 77 deletions(-)
 create mode 100644 osu.Game/Screens/Select/BeatmapDetailAreaDetailTabItem.cs
 create mode 100644 osu.Game/Screens/Select/BeatmapDetailAreaLeaderboardTabItem.cs
 create mode 100644 osu.Game/Screens/Select/BeatmapDetailAreaTabItem.cs
 create mode 100644 osu.Game/Screens/Select/PlayBeatmapDetailArea.cs

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 6ae3c7ac64..ce959e9057 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Configuration
             Set(OsuSetting.Ruleset, 0, 0, int.MaxValue);
             Set(OsuSetting.Skin, 0, -1, int.MaxValue);
 
-            Set(OsuSetting.BeatmapDetailTab, BeatmapDetailTab.Details);
+            Set(OsuSetting.BeatmapDetailTab, PlayBeatmapDetailArea.TabType.Details);
 
             Set(OsuSetting.ShowConvertedBeatmaps, true);
             Set(OsuSetting.DisplayStarsMinimum, 0.0, 0, 10, 0.1);
diff --git a/osu.Game/Screens/Select/BeatmapDetailArea.cs b/osu.Game/Screens/Select/BeatmapDetailArea.cs
index 71733c9f06..1aae0cc243 100644
--- a/osu.Game/Screens/Select/BeatmapDetailArea.cs
+++ b/osu.Game/Screens/Select/BeatmapDetailArea.cs
@@ -2,37 +2,44 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
-using osu.Game.Screens.Select.Leaderboards;
 
 namespace osu.Game.Screens.Select
 {
-    public class BeatmapDetailArea : Container
+    public abstract class BeatmapDetailArea : Container
     {
         private const float details_padding = 10;
 
-        private readonly Container content;
-        protected override Container<Drawable> Content => content;
-
-        public readonly BeatmapDetails Details;
-        public readonly BeatmapLeaderboard Leaderboard;
-
         private WorkingBeatmap beatmap;
 
-        public WorkingBeatmap Beatmap
+        public virtual WorkingBeatmap Beatmap
         {
             get => beatmap;
             set
             {
                 beatmap = value;
-                Details.Beatmap = beatmap?.BeatmapInfo;
-                Leaderboard.Beatmap = beatmap is DummyWorkingBeatmap ? null : beatmap?.BeatmapInfo;
+
+                Details.Beatmap = value?.BeatmapInfo;
             }
         }
 
-        public BeatmapDetailArea()
+        public readonly BeatmapDetails Details;
+
+        protected Bindable<BeatmapDetailAreaTabItem> CurrentTab
+        {
+            get => tabControl.Current;
+            set => tabControl.Current = value;
+        }
+
+        private readonly Container content;
+        protected override Container<Drawable> Content => content;
+
+        private readonly BeatmapDetailAreaTabControl tabControl;
+
+        protected BeatmapDetailArea()
         {
             AddRangeInternal(new Drawable[]
             {
@@ -40,51 +47,62 @@ namespace osu.Game.Screens.Select
                 {
                     RelativeSizeAxes = Axes.Both,
                     Padding = new MarginPadding { Top = BeatmapDetailAreaTabControl.HEIGHT },
-                },
-                new BeatmapDetailAreaTabControl
-                {
-                    RelativeSizeAxes = Axes.X,
-                    OnFilter = (tab, mods) =>
+                    Child = Details = new BeatmapDetails
                     {
-                        Leaderboard.FilterMods = mods;
-
-                        switch (tab)
-                        {
-                            case BeatmapDetailTab.Details:
-                                Details.Show();
-                                Leaderboard.Hide();
-                                break;
-
-                            default:
-                                Details.Hide();
-                                Leaderboard.Scope = (BeatmapLeaderboardScope)tab - 1;
-                                Leaderboard.Show();
-                                break;
-                        }
-                    },
+                        RelativeSizeAxes = Axes.X,
+                        Alpha = 0,
+                        Margin = new MarginPadding { Top = details_padding },
+                    }
                 },
-            });
-
-            AddRange(new Drawable[]
-            {
-                Details = new BeatmapDetails
+                tabControl = new BeatmapDetailAreaTabControl
                 {
                     RelativeSizeAxes = Axes.X,
-                    Alpha = 0,
-                    Margin = new MarginPadding { Top = details_padding },
+                    TabItems = CreateTabItems(),
+                    OnFilter = OnTabChanged,
                 },
-                Leaderboard = new BeatmapLeaderboard
-                {
-                    RelativeSizeAxes = Axes.Both,
-                }
             });
         }
 
+        /// <summary>
+        /// Refreshes the currently-displayed details.
+        /// </summary>
+        public virtual void Refresh()
+        {
+        }
+
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
 
             Details.Height = Math.Min(DrawHeight - details_padding * 3 - BeatmapDetailAreaTabControl.HEIGHT, 450);
         }
+
+        /// <summary>
+        /// Invoked when a new tab is selected.
+        /// </summary>
+        /// <param name="tab">The tab that was selected.</param>
+        /// <param name="selectedMods">Whether the currently-selected mods should be considered.</param>
+        protected virtual void OnTabChanged(BeatmapDetailAreaTabItem tab, bool selectedMods)
+        {
+            switch (tab)
+            {
+                case BeatmapDetailAreaDetailTabItem _:
+                    Details.Show();
+                    break;
+
+                default:
+                    Details.Hide();
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Creates the tabs to be displayed.
+        /// </summary>
+        /// <returns>The tabs.</returns>
+        protected virtual BeatmapDetailAreaTabItem[] CreateTabItems() => new BeatmapDetailAreaTabItem[]
+        {
+            new BeatmapDetailAreaDetailTabItem(),
+        };
     }
 }
diff --git a/osu.Game/Screens/Select/BeatmapDetailAreaDetailTabItem.cs b/osu.Game/Screens/Select/BeatmapDetailAreaDetailTabItem.cs
new file mode 100644
index 0000000000..7376cb4708
--- /dev/null
+++ b/osu.Game/Screens/Select/BeatmapDetailAreaDetailTabItem.cs
@@ -0,0 +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.
+
+namespace osu.Game.Screens.Select
+{
+    public class BeatmapDetailAreaDetailTabItem : BeatmapDetailAreaTabItem
+    {
+        public override string Name => "Details";
+    }
+}
diff --git a/osu.Game/Screens/Select/BeatmapDetailAreaLeaderboardTabItem.cs b/osu.Game/Screens/Select/BeatmapDetailAreaLeaderboardTabItem.cs
new file mode 100644
index 0000000000..066944e9d2
--- /dev/null
+++ b/osu.Game/Screens/Select/BeatmapDetailAreaLeaderboardTabItem.cs
@@ -0,0 +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;
+
+namespace osu.Game.Screens.Select
+{
+    public class BeatmapDetailAreaLeaderboardTabItem<TScope> : BeatmapDetailAreaTabItem
+        where TScope : Enum
+    {
+        public override string Name => Scope.ToString();
+
+        public override bool FilterableByMods => true;
+
+        public readonly TScope Scope;
+
+        public BeatmapDetailAreaLeaderboardTabItem(TScope scope)
+        {
+            Scope = scope;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs b/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs
index 19ecdb6dbf..f4bf1ab059 100644
--- a/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs
+++ b/osu.Game/Screens/Select/BeatmapDetailAreaTabControl.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using osuTK.Graphics;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -18,14 +19,25 @@ namespace osu.Game.Screens.Select
     public class BeatmapDetailAreaTabControl : Container
     {
         public const float HEIGHT = 24;
+
+        public Bindable<BeatmapDetailAreaTabItem> Current
+        {
+            get => tabs.Current;
+            set => tabs.Current = value;
+        }
+
+        public Action<BeatmapDetailAreaTabItem, bool> OnFilter; //passed the selected tab and if mods is checked
+
+        public IReadOnlyList<BeatmapDetailAreaTabItem> TabItems
+        {
+            get => tabs.Items;
+            set => tabs.Items = value;
+        }
+
         private readonly OsuTabControlCheckbox modsCheckbox;
-        private readonly OsuTabControl<BeatmapDetailTab> tabs;
+        private readonly OsuTabControl<BeatmapDetailAreaTabItem> tabs;
         private readonly Container tabsContainer;
 
-        public Action<BeatmapDetailTab, bool> OnFilter; //passed the selected tab and if mods is checked
-
-        private Bindable<BeatmapDetailTab> selectedTab;
-
         public BeatmapDetailAreaTabControl()
         {
             Height = HEIGHT;
@@ -43,7 +55,7 @@ namespace osu.Game.Screens.Select
                 tabsContainer = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Child = tabs = new OsuTabControl<BeatmapDetailTab>
+                    Child = tabs = new OsuTabControl<BeatmapDetailAreaTabItem>
                     {
                         Anchor = Anchor.BottomLeft,
                         Origin = Anchor.BottomLeft,
@@ -68,29 +80,22 @@ namespace osu.Game.Screens.Select
         private void load(OsuColour colour, OsuConfigManager config)
         {
             modsCheckbox.AccentColour = tabs.AccentColour = colour.YellowLight;
-
-            selectedTab = config.GetBindable<BeatmapDetailTab>(OsuSetting.BeatmapDetailTab);
-
-            tabs.Current.BindTo(selectedTab);
-            tabs.Current.TriggerChange();
         }
 
         private void invokeOnFilter()
         {
             OnFilter?.Invoke(tabs.Current.Value, modsCheckbox.Current.Value);
 
-            modsCheckbox.FadeTo(tabs.Current.Value == BeatmapDetailTab.Details ? 0 : 1, 200, Easing.OutQuint);
-
-            tabsContainer.Padding = new MarginPadding { Right = tabs.Current.Value == BeatmapDetailTab.Details ? 0 : 100 };
+            if (tabs.Current.Value.FilterableByMods)
+            {
+                modsCheckbox.FadeTo(1, 200, Easing.OutQuint);
+                tabsContainer.Padding = new MarginPadding { Right = 100 };
+            }
+            else
+            {
+                modsCheckbox.FadeTo(0, 200, Easing.OutQuint);
+                tabsContainer.Padding = new MarginPadding();
+            }
         }
     }
-
-    public enum BeatmapDetailTab
-    {
-        Details,
-        Local,
-        Country,
-        Global,
-        Friends
-    }
 }
diff --git a/osu.Game/Screens/Select/BeatmapDetailAreaTabItem.cs b/osu.Game/Screens/Select/BeatmapDetailAreaTabItem.cs
new file mode 100644
index 0000000000..f28e5a7c22
--- /dev/null
+++ b/osu.Game/Screens/Select/BeatmapDetailAreaTabItem.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;
+
+namespace osu.Game.Screens.Select
+{
+    public abstract class BeatmapDetailAreaTabItem : IEquatable<BeatmapDetailAreaTabItem>
+    {
+        /// <summary>
+        /// The name of this tab, to be displayed in the tab control.
+        /// </summary>
+        public abstract string Name { get; }
+
+        /// <summary>
+        /// Whether the contents of this tab can be filtered by the user's currently-selected mods.
+        /// </summary>
+        public virtual bool FilterableByMods => false;
+
+        public override string ToString() => Name;
+
+        public bool Equals(BeatmapDetailAreaTabItem other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return Name == other.Name;
+        }
+
+        public override int GetHashCode()
+        {
+            return Name != null ? Name.GetHashCode() : 0;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index 6ba4157797..fd7a8a539c 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -34,6 +34,8 @@ namespace osu.Game.Screens.Select
             Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
         }
 
+        protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea(); // Todo: Temporary
+
         protected override bool OnStart()
         {
             var item = new PlaylistItem
diff --git a/osu.Game/Screens/Select/PlayBeatmapDetailArea.cs b/osu.Game/Screens/Select/PlayBeatmapDetailArea.cs
new file mode 100644
index 0000000000..d719502a4f
--- /dev/null
+++ b/osu.Game/Screens/Select/PlayBeatmapDetailArea.cs
@@ -0,0 +1,143 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Screens.Select.Leaderboards;
+
+namespace osu.Game.Screens.Select
+{
+    public class PlayBeatmapDetailArea : BeatmapDetailArea
+    {
+        public readonly BeatmapLeaderboard Leaderboard;
+
+        public override WorkingBeatmap Beatmap
+        {
+            get => base.Beatmap;
+            set
+            {
+                base.Beatmap = value;
+
+                Leaderboard.Beatmap = value is DummyWorkingBeatmap ? null : value?.BeatmapInfo;
+            }
+        }
+
+        private Bindable<TabType> selectedTab;
+
+        public PlayBeatmapDetailArea()
+        {
+            Add(Leaderboard = new BeatmapLeaderboard { RelativeSizeAxes = Axes.Both });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            selectedTab = config.GetBindable<TabType>(OsuSetting.BeatmapDetailTab);
+            selectedTab.BindValueChanged(tab => CurrentTab.Value = getTabItemFromTabType(tab.NewValue), true);
+            CurrentTab.BindValueChanged(tab => selectedTab.Value = getTabTypeFromTabItem(tab.NewValue));
+        }
+
+        public override void Refresh()
+        {
+            base.Refresh();
+
+            Leaderboard.RefreshScores();
+        }
+
+        protected override void OnTabChanged(BeatmapDetailAreaTabItem tab, bool selectedMods)
+        {
+            base.OnTabChanged(tab, selectedMods);
+
+            Leaderboard.FilterMods = selectedMods;
+
+            switch (tab)
+            {
+                case BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope> leaderboard:
+                    Leaderboard.Scope = leaderboard.Scope;
+                    Leaderboard.Show();
+                    break;
+
+                default:
+                    Leaderboard.Hide();
+                    break;
+            }
+        }
+
+        protected override BeatmapDetailAreaTabItem[] CreateTabItems() => base.CreateTabItems().Concat(new BeatmapDetailAreaTabItem[]
+        {
+            new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Local),
+            new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Country),
+            new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Global),
+            new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Friend),
+        }).ToArray();
+
+        private BeatmapDetailAreaTabItem getTabItemFromTabType(TabType type)
+        {
+            switch (type)
+            {
+                case TabType.Details:
+                    return new BeatmapDetailAreaDetailTabItem();
+
+                case TabType.Local:
+                    return new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Local);
+
+                case TabType.Country:
+                    return new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Country);
+
+                case TabType.Global:
+                    return new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Global);
+
+                case TabType.Friends:
+                    return new BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope>(BeatmapLeaderboardScope.Friend);
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(type));
+            }
+        }
+
+        private TabType getTabTypeFromTabItem(BeatmapDetailAreaTabItem item)
+        {
+            switch (item)
+            {
+                case BeatmapDetailAreaDetailTabItem _:
+                    return TabType.Details;
+
+                case BeatmapDetailAreaLeaderboardTabItem<BeatmapLeaderboardScope> leaderboardTab:
+                    switch (leaderboardTab.Scope)
+                    {
+                        case BeatmapLeaderboardScope.Local:
+                            return TabType.Local;
+
+                        case BeatmapLeaderboardScope.Country:
+                            return TabType.Country;
+
+                        case BeatmapLeaderboardScope.Global:
+                            return TabType.Global;
+
+                        case BeatmapLeaderboardScope.Friend:
+                            return TabType.Friends;
+
+                        default:
+                            throw new ArgumentOutOfRangeException(nameof(item));
+                    }
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(item));
+            }
+        }
+
+        public enum TabType
+        {
+            Details,
+            Local,
+            Country,
+            Global,
+            Friends
+        }
+    }
+}
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index f1dd125362..e744fd6a7b 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -29,8 +29,12 @@ namespace osu.Game.Screens.Select
                 ValidForResume = false;
                 Edit();
             }, Key.Number4);
+
+            ((PlayBeatmapDetailArea)BeatmapDetails).Leaderboard.ScoreSelected += score => this.Push(new SoloResults(score));
         }
 
+        protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();
+
         public override void OnResuming(IScreen last)
         {
             base.OnResuming(last);
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 0da260d752..67626d1e4f 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -23,7 +23,6 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Menu;
-using osu.Game.Screens.Play;
 using osu.Game.Screens.Select.Options;
 using osu.Game.Skinning;
 using osuTK;
@@ -207,11 +206,11 @@ namespace osu.Game.Screens.Select
                                                     Left = left_area_padding,
                                                     Right = left_area_padding * 2,
                                                 },
-                                                Child = BeatmapDetails = new BeatmapDetailArea
+                                                Child = BeatmapDetails = CreateBeatmapDetailArea().With(d =>
                                                 {
-                                                    RelativeSizeAxes = Axes.Both,
-                                                    Padding = new MarginPadding { Top = 10, Right = 5 },
-                                                },
+                                                    d.RelativeSizeAxes = Axes.Both;
+                                                    d.Padding = new MarginPadding { Top = 10, Right = 5 };
+                                                })
                                             },
                                         }
                                     },
@@ -262,8 +261,6 @@ namespace osu.Game.Screens.Select
                 });
             }
 
-            BeatmapDetails.Leaderboard.ScoreSelected += score => this.Push(new SoloResults(score));
-
             if (Footer != null)
             {
                 Footer.AddButton(new FooterButtonMods { Current = Mods }, ModSelect);
@@ -319,6 +316,11 @@ namespace osu.Game.Screens.Select
             return dependencies;
         }
 
+        /// <summary>
+        /// Creates the beatmap details to be displayed underneath the wedge.
+        /// </summary>
+        protected abstract BeatmapDetailArea CreateBeatmapDetailArea();
+
         public void Edit(BeatmapInfo beatmap = null)
         {
             if (!AllowEditing)
@@ -533,7 +535,7 @@ namespace osu.Game.Screens.Select
 
             Carousel.AllowSelection = true;
 
-            BeatmapDetails.Leaderboard.RefreshScores();
+            BeatmapDetails.Refresh();
 
             Beatmap.Value.Track.Looping = true;
             music?.ResetTrackAdjustments();
@@ -716,7 +718,7 @@ namespace osu.Game.Screens.Select
 
             dialogOverlay?.Push(new BeatmapClearScoresDialog(beatmap, () =>
                 // schedule done here rather than inside the dialog as the dialog may fade out and never callback.
-                Schedule(() => BeatmapDetails.Leaderboard.RefreshScores())));
+                Schedule(() => BeatmapDetails.Refresh())));
         }
 
         public virtual bool OnPressed(GlobalAction action)

From 53b62816f8db94b3aa90fe0be77ceca296a4feab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Feb 2020 14:07:37 +0900
Subject: [PATCH 0422/1142] Add index constants for cross-class safety

---
 osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs | 4 ++--
 osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs     | 4 ++--
 osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs            | 8 ++++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
index de7adaa261..e2465d727e 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Rulesets.Catch.Mods
 {
     public class CatchModDifficultyAdjust : ModDifficultyAdjust
     {
-        [SettingSource("Circle Size", "Override a beatmap's set CS.", 0)]
+        [SettingSource("Circle Size", "Override a beatmap's set CS.", FIRST_SETTING_ORDER - 1)]
         public BindableNumber<float> CircleSize { get; } = new BindableFloat
         {
             Precision = 0.1f,
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Catch.Mods
             Value = 5,
         };
 
-        [SettingSource("Approach Rate", "Override a beatmap's set AR.", 3)]
+        [SettingSource("Approach Rate", "Override a beatmap's set AR.", LAST_SETTING_ORDER + 1)]
         public BindableNumber<float> ApproachRate { get; } = new BindableFloat
         {
             Precision = 0.1f,
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
index 2c6eb19f3d..75de6896a3 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModDifficultyAdjust.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Rulesets.Osu.Mods
 {
     public class OsuModDifficultyAdjust : ModDifficultyAdjust
     {
-        [SettingSource("Circle Size", "Override a beatmap's set CS.", 0)]
+        [SettingSource("Circle Size", "Override a beatmap's set CS.", FIRST_SETTING_ORDER - 1)]
         public BindableNumber<float> CircleSize { get; } = new BindableFloat
         {
             Precision = 0.1f,
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Mods
             Value = 5,
         };
 
-        [SettingSource("Approach Rate", "Override a beatmap's set AR.", 3)]
+        [SettingSource("Approach Rate", "Override a beatmap's set AR.", LAST_SETTING_ORDER + 1)]
         public BindableNumber<float> ApproachRate { get; } = new BindableFloat
         {
             Precision = 0.1f,
diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index 6ba54ff8fb..2083671072 100644
--- a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
@@ -28,7 +28,11 @@ namespace osu.Game.Rulesets.Mods
 
         public override Type[] IncompatibleMods => new[] { typeof(ModEasy), typeof(ModHardRock) };
 
-        [SettingSource("HP Drain", "Override a beatmap's set HP.", 1)]
+        protected const int FIRST_SETTING_ORDER = 1;
+
+        protected const int LAST_SETTING_ORDER = 2;
+
+        [SettingSource("HP Drain", "Override a beatmap's set HP.", FIRST_SETTING_ORDER)]
         public BindableNumber<float> DrainRate { get; } = new BindableFloat
         {
             Precision = 0.1f,
@@ -38,7 +42,7 @@ namespace osu.Game.Rulesets.Mods
             Value = 5,
         };
 
-        [SettingSource("Accuracy", "Override a beatmap's set OD.", 2)]
+        [SettingSource("Accuracy", "Override a beatmap's set OD.", LAST_SETTING_ORDER)]
         public BindableNumber<float> OverallDifficulty { get; } = new BindableFloat
         {
             Precision = 0.1f,

From ad0de2796427ee9025d01afe82fe062d9a0a2b8e Mon Sep 17 00:00:00 2001
From: voidedWarranties <wz68.scratch@gmail.com>
Date: Wed, 12 Feb 2020 22:11:26 -0800
Subject: [PATCH 0423/1142] Safer dependency injection and accessibility levels

---
 osu.Game/OsuGame.cs                           | 47 +++++++++++--------
 .../Carousel/DrawableCarouselBeatmapSet.cs    | 26 +++++-----
 osu.Game/Screens/Select/SongSelect.cs         |  2 +-
 3 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index ff3dee55af..3d6b93c87d 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -311,22 +311,12 @@ namespace osu.Game
         public void ShowBeatmap(int beatmapId) => waitForReady(() => beatmapSetOverlay, _ => beatmapSetOverlay.FetchAndShowBeatmap(beatmapId));
 
         /// <summary>
-        /// Present a beatmap at song select immediately.
+        /// Present a specific beatmap difficulty at song select immediately.
         /// The user should have already requested this interactively.
         /// </summary>
         /// <param name="beatmap">The beatmap to select.</param>
-        public void PresentBeatmap(BeatmapSetInfo beatmap)
+        public void PresentBeatmap(BeatmapInfo beatmap)
         {
-            var databasedSet = beatmap.OnlineBeatmapSetID != null
-                ? BeatmapManager.QueryBeatmapSet(s => s.OnlineBeatmapSetID == beatmap.OnlineBeatmapSetID)
-                : BeatmapManager.QueryBeatmapSet(s => s.Hash == beatmap.Hash);
-
-            if (databasedSet == null)
-            {
-                Logger.Log("The requested beatmap could not be loaded.", LoggingTarget.Information);
-                return;
-            }
-
             PerformFromScreen(screen =>
             {
                 // we might already be at song select, so a check is required before performing the load to solo.
@@ -334,19 +324,36 @@ namespace osu.Game
                     menuScreen.LoadToSolo();
 
                 // we might even already be at the song
-                if (Beatmap.Value.BeatmapSetInfo.Hash == databasedSet.Hash)
-                {
+                if (Beatmap.Value.BeatmapInfo.Hash == beatmap.Hash)
                     return;
-                }
 
-                // Use first beatmap available for current ruleset, else switch ruleset.
-                var first = databasedSet.Beatmaps.Find(b => b.Ruleset.Equals(Ruleset.Value)) ?? databasedSet.Beatmaps.First();
-
-                Ruleset.Value = first.Ruleset;
-                Beatmap.Value = BeatmapManager.GetWorkingBeatmap(first);
+                Ruleset.Value = beatmap.Ruleset;
+                Beatmap.Value = BeatmapManager.GetWorkingBeatmap(beatmap);
             }, validScreens: new[] { typeof(PlaySongSelect) });
         }
 
+        /// <summary>
+        /// <see cref="PresentBeatmap(BeatmapInfo)"/>
+        /// Instead of selecting a specific difficulty, this will select the first difficulty of the current ruleset in a beatmapset,
+        /// or the first difficulty of the set if there is none.
+        /// </summary>
+        /// <param name="beatmapSet">The beatmapset to select.</param>
+        public void PresentBeatmap(BeatmapSetInfo beatmapSet)
+        {
+            var databasedSet = beatmapSet.OnlineBeatmapSetID != null
+                ? BeatmapManager.QueryBeatmapSet(s => s.OnlineBeatmapSetID == beatmapSet.OnlineBeatmapSetID)
+                : BeatmapManager.QueryBeatmapSet(s => s.Hash == beatmapSet.Hash);
+
+            if (databasedSet == null)
+            {
+                Logger.Log("The requested beatmap could not be loaded.", LoggingTarget.Information);
+                return;
+            }
+
+            var first = databasedSet.Beatmaps.Find(b => b.Ruleset.Equals(Ruleset.Value)) ?? databasedSet.Beatmaps.First();
+            PresentBeatmap(first);
+        }
+
         /// <summary>
         /// Present a score's replay immediately.
         /// The user should have already requested this interactively.
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 80dae575ff..9e4f31b15b 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -34,8 +34,6 @@ namespace osu.Game.Screens.Select.Carousel
         private DialogOverlay dialogOverlay;
         private readonly BeatmapSetInfo beatmapSet;
 
-        private SongSelect songSelect;
-
         public DrawableCarouselBeatmapSet(CarouselBeatmapSet set)
             : base(set)
         {
@@ -43,11 +41,8 @@ namespace osu.Game.Screens.Select.Carousel
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(SongSelect songSelect, BeatmapManager manager, BeatmapSetOverlay beatmapOverlay, DialogOverlay overlay)
+        private void load(BeatmapManager manager, BeatmapSetOverlay beatmapOverlay, DialogOverlay overlay)
         {
-            if (songSelect != null)
-                this.songSelect = songSelect;
-
             restoreHiddenRequested = s => s.Beatmaps.ForEach(manager.Restore);
             dialogOverlay = overlay;
             if (beatmapOverlay != null)
@@ -123,7 +118,7 @@ namespace osu.Game.Screens.Select.Carousel
 
             return beatmaps.Count > maximum_difficulty_icons
                 ? (IEnumerable<DifficultyIcon>)beatmaps.GroupBy(b => b.Beatmap.Ruleset).Select(group => new FilterableGroupedDifficultyIcon(group.ToList(), group.Key))
-                : beatmaps.Select(b => new FilterableDifficultyIcon(b, songSelect));
+                : beatmaps.Select(b => new FilterableDifficultyIcon(b));
         }
 
         public MenuItem[] ContextMenuItems
@@ -216,17 +211,17 @@ namespace osu.Game.Screens.Select.Carousel
         {
             private readonly BindableBool filtered = new BindableBool();
 
-            private readonly SongSelect songSelect;
+            private OsuGame game;
+            private SongSelect songSelect;
             private readonly BeatmapInfo info;
 
-            public FilterableDifficultyIcon(CarouselBeatmap item, SongSelect songSelect)
+            public FilterableDifficultyIcon(CarouselBeatmap item)
                 : base(item.Beatmap)
             {
                 filtered.BindTo(item.Filtered);
                 filtered.ValueChanged += isFiltered => Schedule(() => this.FadeTo(isFiltered.NewValue ? 0.1f : 1, 100));
                 filtered.TriggerChange();
 
-                this.songSelect = songSelect;
                 info = item.Beatmap;
             }
 
@@ -234,7 +229,7 @@ namespace osu.Game.Screens.Select.Carousel
             {
                 if (!filtered.Value)
                 {
-                    songSelect?.Carousel.SelectBeatmap(info);
+                    game.PresentBeatmap(info);
 
                     if (e.AltPressed)
                         songSelect?.FinaliseSelection();
@@ -242,6 +237,15 @@ namespace osu.Game.Screens.Select.Carousel
 
                 return base.OnClick(e);
             }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuGame game, SongSelect songSelect)
+            {
+                this.game = game;
+
+                if (songSelect != null)
+                    this.songSelect = songSelect;
+            }
         }
 
         public class FilterableGroupedDifficultyIcon : GroupedDifficultyIcon
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 463a17989a..5037081b5e 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Screens.Select
 
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap.Value);
 
-        public BeatmapCarousel Carousel { get; private set; }
+        protected BeatmapCarousel Carousel { get; private set; }
 
         private BeatmapInfoWedge beatmapInfoWedge;
         private DialogOverlay dialogOverlay;

From d4f14e552a26c041cf09f61043e2d96ac2e86a1e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 Feb 2020 18:05:53 +0900
Subject: [PATCH 0424/1142] Improve extensibility of mod display expansion

---
 .../UserInterface/TestSceneModDisplay.cs      | 40 +++++++++++++++++++
 osu.Game/Screens/Play/HUD/ModDisplay.cs       | 28 +++++++++++--
 osu.Game/Screens/Select/FooterButtonMods.cs   |  2 +-
 3 files changed, 66 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneModDisplay.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModDisplay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModDisplay.cs
new file mode 100644
index 0000000000..8168faa106
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModDisplay.cs
@@ -0,0 +1,40 @@
+// 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.Rulesets.Mods;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Screens.Play.HUD;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneModDisplay : OsuTestScene
+    {
+        [TestCase(ExpansionMode.ExpandOnHover)]
+        [TestCase(ExpansionMode.AlwaysExpanded)]
+        [TestCase(ExpansionMode.AlwaysContracted)]
+        public void TestMode(ExpansionMode mode)
+        {
+            AddStep("create mod display", () =>
+            {
+                Child = new ModDisplay
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    ExpansionMode = mode,
+                    Current =
+                    {
+                        Value = new Mod[]
+                        {
+                            new OsuModHardRock(),
+                            new OsuModDoubleTime(),
+                            new OsuModDifficultyAdjust(),
+                            new OsuModEasy(),
+                        }
+                    }
+                };
+            });
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/HUD/ModDisplay.cs b/osu.Game/Screens/Play/HUD/ModDisplay.cs
index 00edd4db99..336b03544f 100644
--- a/osu.Game/Screens/Play/HUD/ModDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/ModDisplay.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.Play.HUD
 
         public bool DisplayUnrankedText = true;
 
-        public bool AllowExpand = true;
+        public ExpansionMode ExpansionMode = ExpansionMode.ExpandOnHover;
 
         private readonly Bindable<IReadOnlyList<Mod>> current = new Bindable<IReadOnlyList<Mod>>();
 
@@ -110,11 +110,15 @@ namespace osu.Game.Screens.Play.HUD
 
         private void expand()
         {
-            if (AllowExpand)
+            if (ExpansionMode != ExpansionMode.AlwaysContracted)
                 IconsContainer.TransformSpacingTo(new Vector2(5, 0), 500, Easing.OutQuint);
         }
 
-        private void contract() => IconsContainer.TransformSpacingTo(new Vector2(-25, 0), 500, Easing.OutQuint);
+        private void contract()
+        {
+            if (ExpansionMode != ExpansionMode.AlwaysExpanded)
+                IconsContainer.TransformSpacingTo(new Vector2(-25, 0), 500, Easing.OutQuint);
+        }
 
         protected override bool OnHover(HoverEvent e)
         {
@@ -128,4 +132,22 @@ namespace osu.Game.Screens.Play.HUD
             base.OnHoverLost(e);
         }
     }
+
+    public enum ExpansionMode
+    {
+        /// <summary>
+        /// The <see cref="ModDisplay"/> will expand only when hovered.
+        /// </summary>
+        ExpandOnHover,
+
+        /// <summary>
+        /// The <see cref="ModDisplay"/> will always be expanded.
+        /// </summary>
+        AlwaysExpanded,
+
+        /// <summary>
+        /// The <see cref="ModDisplay"/> will always be contracted.
+        /// </summary>
+        AlwaysContracted
+    }
 }
diff --git a/osu.Game/Screens/Select/FooterButtonMods.cs b/osu.Game/Screens/Select/FooterButtonMods.cs
index 4f2369847f..2411cf26f9 100644
--- a/osu.Game/Screens/Select/FooterButtonMods.cs
+++ b/osu.Game/Screens/Select/FooterButtonMods.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Screens.Select
 
             public FooterModDisplay()
             {
-                AllowExpand = false;
+                ExpansionMode = ExpansionMode.AlwaysContracted;
                 IconsContainer.Margin = new MarginPadding();
             }
         }

From 91edadfe9d918f191baeb56c5ae7b555dada624a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 Feb 2020 18:12:47 +0900
Subject: [PATCH 0425/1142] Make playlist beatmap and ruleset into bindables

---
 .../TestSceneLoungeRoomsContainer.cs          |  9 +++--
 .../Multiplayer/TestSceneMatchBeatmapPanel.cs | 10 ++---
 .../Multiplayer/TestSceneMatchHeader.cs       | 19 ++++++----
 .../Visual/Multiplayer/TestSceneMatchInfo.cs  | 38 +++++++++++--------
 .../TestSceneMatchSettingsOverlay.cs          |  2 +-
 osu.Game/Online/Multiplayer/PlaylistItem.cs   | 30 +++++++--------
 .../Screens/Multi/Components/BeatmapTitle.cs  |  6 +--
 .../Multi/Components/BeatmapTypeInfo.cs       |  2 +-
 .../Screens/Multi/Components/ModeTypeInfo.cs  |  2 +-
 .../Components/MultiplayerBackgroundSprite.cs |  2 +-
 .../Multi/Lounge/Components/RoomsContainer.cs |  2 +-
 .../Screens/Multi/Match/Components/Header.cs  |  1 +
 .../Screens/Multi/Match/Components/Info.cs    |  2 +-
 .../Match/Components/MatchBeatmapPanel.cs     |  2 +-
 .../Screens/Multi/Match/MatchSubScreen.cs     |  7 ++--
 .../Screens/Multi/Play/TimeshiftPlayer.cs     |  4 +-
 osu.Game/Screens/Select/MatchSongSelect.cs    |  9 +++--
 17 files changed, 79 insertions(+), 68 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
index fe14a1ff0a..b5d946d049 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
@@ -121,10 +121,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     {
                         room.Playlist.Add(new PlaylistItem
                         {
-                            Ruleset = ruleset,
-                            Beatmap = new BeatmapInfo
+                            Ruleset = { Value = ruleset },
+                            Beatmap =
                             {
-                                Metadata = new BeatmapMetadata()
+                                Value = new BeatmapInfo
+                                {
+                                    Metadata = new BeatmapMetadata()
+                                }
                             }
                         });
                     }
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapPanel.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapPanel.cs
index 1e3e06ce7a..84ab6f9ccc 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapPanel.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapPanel.cs
@@ -32,11 +32,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 Origin = Anchor.Centre,
             });
 
-            Room.Playlist.Add(new PlaylistItem { Beatmap = new BeatmapInfo { OnlineBeatmapID = 1763072 } });
-            Room.Playlist.Add(new PlaylistItem { Beatmap = new BeatmapInfo { OnlineBeatmapID = 2101557 } });
-            Room.Playlist.Add(new PlaylistItem { Beatmap = new BeatmapInfo { OnlineBeatmapID = 1973466 } });
-            Room.Playlist.Add(new PlaylistItem { Beatmap = new BeatmapInfo { OnlineBeatmapID = 2109801 } });
-            Room.Playlist.Add(new PlaylistItem { Beatmap = new BeatmapInfo { OnlineBeatmapID = 1922035 } });
+            Room.Playlist.Add(new PlaylistItem { Beatmap = { Value = new BeatmapInfo { OnlineBeatmapID = 1763072 } } });
+            Room.Playlist.Add(new PlaylistItem { Beatmap = { Value = new BeatmapInfo { OnlineBeatmapID = 2101557 } } });
+            Room.Playlist.Add(new PlaylistItem { Beatmap = { Value = new BeatmapInfo { OnlineBeatmapID = 1973466 } } });
+            Room.Playlist.Add(new PlaylistItem { Beatmap = { Value = new BeatmapInfo { OnlineBeatmapID = 2109801 } } });
+            Room.Playlist.Add(new PlaylistItem { Beatmap = { Value = new BeatmapInfo { OnlineBeatmapID = 1922035 } } });
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
index e42042f2ea..7d7e7f85db 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
@@ -23,16 +23,19 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             Room.Playlist.Add(new PlaylistItem
             {
-                Beatmap = new BeatmapInfo
+                Beatmap =
                 {
-                    Metadata = new BeatmapMetadata
+                    Value = new BeatmapInfo
                     {
-                        Title = "Title",
-                        Artist = "Artist",
-                        AuthorString = "Author",
-                    },
-                    Version = "Version",
-                    Ruleset = new OsuRuleset().RulesetInfo
+                        Metadata = new BeatmapMetadata
+                        {
+                            Title = "Title",
+                            Artist = "Artist",
+                            AuthorString = "Author",
+                        },
+                        Version = "Version",
+                        Ruleset = new OsuRuleset().RulesetInfo
+                    }
                 },
                 RequiredMods =
                 {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchInfo.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchInfo.cs
index a6c036a876..6ee9ceb2dd 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchInfo.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchInfo.cs
@@ -37,16 +37,19 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 Room.Playlist.Clear();
                 Room.Playlist.Add(new PlaylistItem
                 {
-                    Beatmap = new BeatmapInfo
+                    Beatmap =
                     {
-                        StarDifficulty = 2.4,
-                        Ruleset = rulesets.GetRuleset(0),
-                        Metadata = new BeatmapMetadata
+                        Value = new BeatmapInfo
                         {
-                            Title = @"My Song",
-                            Artist = @"VisualTests",
-                            AuthorString = @"osu!lazer",
-                        },
+                            StarDifficulty = 2.4,
+                            Ruleset = rulesets.GetRuleset(0),
+                            Metadata = new BeatmapMetadata
+                            {
+                                Title = @"My Song",
+                                Artist = @"VisualTests",
+                                AuthorString = @"osu!lazer",
+                            },
+                        }
                     }
                 });
             });
@@ -60,16 +63,19 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 Room.Playlist.Clear();
                 Room.Playlist.Add(new PlaylistItem
                 {
-                    Beatmap = new BeatmapInfo
+                    Beatmap =
                     {
-                        StarDifficulty = 4.2,
-                        Ruleset = rulesets.GetRuleset(3),
-                        Metadata = new BeatmapMetadata
+                        Value = new BeatmapInfo
                         {
-                            Title = @"Your Song",
-                            Artist = @"Tester",
-                            AuthorString = @"Someone",
-                        },
+                            StarDifficulty = 4.2,
+                            Ruleset = rulesets.GetRuleset(3),
+                            Metadata = new BeatmapMetadata
+                            {
+                                Title = @"Your Song",
+                                Artist = @"Tester",
+                                AuthorString = @"Someone",
+                            },
+                        }
                     }
                 });
             });
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
index 8d842fc865..047e9d860d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddStep("set name", () => Room.Name.Value = "Room name");
             AddAssert("button disabled", () => !settings.ApplyButton.Enabled.Value);
 
-            AddStep("set beatmap", () => Room.Playlist.Add(new PlaylistItem { Beatmap = CreateBeatmap(Ruleset.Value).BeatmapInfo }));
+            AddStep("set beatmap", () => Room.Playlist.Add(new PlaylistItem { Beatmap = { Value = CreateBeatmap(Ruleset.Value).BeatmapInfo } }));
             AddAssert("button enabled", () => settings.ApplyButton.Enabled.Value);
 
             AddStep("clear name", () => Room.Name.Value = "");
diff --git a/osu.Game/Online/Multiplayer/PlaylistItem.cs b/osu.Game/Online/Multiplayer/PlaylistItem.cs
index 5f8edc607b..e243cfca08 100644
--- a/osu.Game/Online/Multiplayer/PlaylistItem.cs
+++ b/osu.Game/Online/Multiplayer/PlaylistItem.cs
@@ -1,9 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
+using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
@@ -24,24 +24,16 @@ namespace osu.Game.Online.Multiplayer
         public int RulesetID { get; set; }
 
         [JsonIgnore]
-        public BeatmapInfo Beatmap
-        {
-            get => beatmap;
-            set
-            {
-                beatmap = value;
-                BeatmapID = value?.OnlineBeatmapID ?? 0;
-            }
-        }
+        public readonly Bindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
 
         [JsonIgnore]
-        public RulesetInfo Ruleset { get; set; }
+        public readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
 
         [JsonIgnore]
-        public readonly List<Mod> AllowedMods = new List<Mod>();
+        public readonly BindableList<Mod> AllowedMods = new BindableList<Mod>();
 
         [JsonIgnore]
-        public readonly List<Mod> RequiredMods = new List<Mod>();
+        public readonly BindableList<Mod> RequiredMods = new BindableList<Mod>();
 
         [JsonProperty("beatmap")]
         private APIBeatmap apiBeatmap { get; set; }
@@ -64,16 +56,20 @@ namespace osu.Game.Online.Multiplayer
             set => requiredModsBacking = value;
         }
 
-        private BeatmapInfo beatmap;
+        public PlaylistItem()
+        {
+            Beatmap.BindValueChanged(beatmap => BeatmapID = beatmap.NewValue?.OnlineBeatmapID ?? 0);
+            Ruleset.BindValueChanged(ruleset => RulesetID = ruleset.NewValue?.ID ?? 0);
+        }
 
         public void MapObjects(BeatmapManager beatmaps, RulesetStore rulesets)
         {
             // If we don't have an api beatmap, the request occurred as a result of room creation, so we can query the local beatmap instead
             // Todo: Is this a bug? Room creation only returns the beatmap ID
-            Beatmap = apiBeatmap == null ? beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == BeatmapID) : apiBeatmap.ToBeatmap(rulesets);
-            Ruleset = rulesets.GetRuleset(RulesetID);
+            Beatmap.Value = apiBeatmap == null ? beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == BeatmapID) : apiBeatmap.ToBeatmap(rulesets);
+            Ruleset.Value = rulesets.GetRuleset(RulesetID);
 
-            Ruleset rulesetInstance = Ruleset.CreateInstance();
+            Ruleset rulesetInstance = Ruleset.Value.CreateInstance();
 
             if (allowedModsBacking != null)
             {
diff --git a/osu.Game/Screens/Multi/Components/BeatmapTitle.cs b/osu.Game/Screens/Multi/Components/BeatmapTitle.cs
index b41b2d073e..b991a3d68d 100644
--- a/osu.Game/Screens/Multi/Components/BeatmapTitle.cs
+++ b/osu.Game/Screens/Multi/Components/BeatmapTitle.cs
@@ -70,7 +70,7 @@ namespace osu.Game.Screens.Multi.Components
                 {
                     new OsuSpriteText
                     {
-                        Text = new LocalisedString((beatmap.Metadata.ArtistUnicode, beatmap.Metadata.Artist)),
+                        Text = new LocalisedString((beatmap.Value.Metadata.ArtistUnicode, beatmap.Value.Metadata.Artist)),
                         Font = OsuFont.GetFont(size: TextSize),
                     },
                     new OsuSpriteText
@@ -80,10 +80,10 @@ namespace osu.Game.Screens.Multi.Components
                     },
                     new OsuSpriteText
                     {
-                        Text = new LocalisedString((beatmap.Metadata.TitleUnicode, beatmap.Metadata.Title)),
+                        Text = new LocalisedString((beatmap.Value.Metadata.TitleUnicode, beatmap.Value.Metadata.Title)),
                         Font = OsuFont.GetFont(size: TextSize),
                     }
-                }, LinkAction.OpenBeatmap, beatmap.OnlineBeatmapID.ToString(), "Open beatmap");
+                }, LinkAction.OpenBeatmap, beatmap.Value.OnlineBeatmapID.ToString(), "Open beatmap");
             }
         }
     }
diff --git a/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs b/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs
index d63f2fecd2..21b228bb5c 100644
--- a/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs
+++ b/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Screens.Multi.Components
                 if (beatmap != null)
                 {
                     beatmapAuthor.AddText("mapped by ", s => s.Colour = OsuColour.Gray(0.8f));
-                    beatmapAuthor.AddUserLink(beatmap.Metadata.Author);
+                    beatmapAuthor.AddUserLink(beatmap.Value.Metadata.Author);
                 }
             }, true);
         }
diff --git a/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs b/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs
index 6080458aec..5465463888 100644
--- a/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs
+++ b/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Screens.Multi.Components
             if (item?.Beatmap != null)
             {
                 drawableRuleset.FadeIn(transition_duration);
-                drawableRuleset.Child = new DifficultyIcon(item.Beatmap, item.Ruleset) { Size = new Vector2(height) };
+                drawableRuleset.Child = new DifficultyIcon(item.Beatmap.Value, item.Ruleset.Value) { Size = new Vector2(height) };
             }
             else
                 drawableRuleset.FadeOut(transition_duration);
diff --git a/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs b/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs
index 968fa6e72e..9a1a482699 100644
--- a/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs
+++ b/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.Multi.Components
 
             InternalChild = sprite = CreateBackgroundSprite();
 
-            CurrentItem.BindValueChanged(item => sprite.Beatmap.Value = item.NewValue?.Beatmap, true);
+            CurrentItem.BindValueChanged(item => sprite.Beatmap.Value = item.NewValue?.Beatmap.Value, true);
         }
 
         protected virtual UpdateableBeatmapBackgroundSprite CreateBackgroundSprite() => new UpdateableBeatmapBackgroundSprite(beatmapSetCoverType) { RelativeSizeAxes = Axes.Both };
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
index 063957d816..64618a1d85 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                 {
                     bool matchingFilter = true;
 
-                    matchingFilter &= r.Room.Playlist.Count == 0 || r.Room.Playlist.Any(i => i.Ruleset.Equals(criteria.Ruleset));
+                    matchingFilter &= r.Room.Playlist.Count == 0 || r.Room.Playlist.Any(i => i.Ruleset.Value.Equals(criteria.Ruleset));
 
                     if (!string.IsNullOrEmpty(criteria.SearchString))
                         matchingFilter &= r.FilterTerms.Any(term => term.IndexOf(criteria.SearchString, StringComparison.InvariantCultureIgnoreCase) >= 0);
diff --git a/osu.Game/Screens/Multi/Match/Components/Header.cs b/osu.Game/Screens/Multi/Match/Components/Header.cs
index a52d43acf4..991060cac0 100644
--- a/osu.Game/Screens/Multi/Match/Components/Header.cs
+++ b/osu.Game/Screens/Multi/Match/Components/Header.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
diff --git a/osu.Game/Screens/Multi/Match/Components/Info.cs b/osu.Game/Screens/Multi/Match/Components/Info.cs
index 74f000c21f..f0b54baa4c 100644
--- a/osu.Game/Screens/Multi/Match/Components/Info.cs
+++ b/osu.Game/Screens/Multi/Match/Components/Info.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Screens.Multi.Match.Components
                 },
             };
 
-            CurrentItem.BindValueChanged(item => readyButton.Beatmap.Value = item.NewValue?.Beatmap, true);
+            CurrentItem.BindValueChanged(item => readyButton.Beatmap.Value = item.NewValue?.Beatmap.Value, true);
 
             hostInfo.Host.BindTo(Host);
         }
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchBeatmapPanel.cs b/osu.Game/Screens/Multi/Match/Components/MatchBeatmapPanel.cs
index 7c1fe91393..f67f6d9f43 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchBeatmapPanel.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchBeatmapPanel.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Multi.Match.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            CurrentItem.BindValueChanged(item => loadNewPanel(item.NewValue?.Beatmap), true);
+            CurrentItem.BindValueChanged(item => loadNewPanel(item.NewValue?.Beatmap.Value), true);
         }
 
         private void loadNewPanel(BeatmapInfo beatmap)
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index c2bb7da6b5..9165ef6d0f 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -183,13 +184,13 @@ namespace osu.Game.Screens.Multi.Match
         private void currentItemChanged(ValueChangedEvent<PlaylistItem> e)
         {
             // Retrieve the corresponding local beatmap, since we can't directly use the playlist's beatmap info
-            var localBeatmap = e.NewValue?.Beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == e.NewValue.Beatmap.OnlineBeatmapID);
+            var localBeatmap = e.NewValue?.Beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == e.NewValue.Beatmap.Value.OnlineBeatmapID);
 
             Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
             Mods.Value = e.NewValue?.RequiredMods?.ToArray() ?? Array.Empty<Mod>();
 
             if (e.NewValue?.Ruleset != null)
-                Ruleset.Value = e.NewValue.Ruleset;
+                Ruleset.Value = e.NewValue.Ruleset.Value;
 
             previewTrackManager.StopAnyPlaying(this);
         }
@@ -206,7 +207,7 @@ namespace osu.Game.Screens.Multi.Match
                 return;
 
             // Try to retrieve the corresponding local beatmap
-            var localBeatmap = beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == CurrentItem.Value.Beatmap.OnlineBeatmapID);
+            var localBeatmap = beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == CurrentItem.Value.Beatmap.Value.OnlineBeatmapID);
 
             if (localBeatmap != null)
                 Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
index 88c6fc5e2e..3afacf2f31 100644
--- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
+++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
@@ -50,10 +50,10 @@ namespace osu.Game.Screens.Multi.Play
             bool failed = false;
 
             // Sanity checks to ensure that TimeshiftPlayer matches the settings for the current PlaylistItem
-            if (Beatmap.Value.BeatmapInfo.OnlineBeatmapID != playlistItem.Beatmap.OnlineBeatmapID)
+            if (Beatmap.Value.BeatmapInfo.OnlineBeatmapID != playlistItem.Beatmap.Value.OnlineBeatmapID)
                 throw new InvalidOperationException("Current Beatmap does not match PlaylistItem's Beatmap");
 
-            if (ruleset.Value.ID != playlistItem.Ruleset.ID)
+            if (ruleset.Value.ID != playlistItem.Ruleset.Value.ID)
                 throw new InvalidOperationException("Current Ruleset does not match PlaylistItem's Ruleset");
 
             if (!playlistItem.RequiredMods.All(m => Mods.Value.Any(m.Equals)))
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index 6ba4157797..ff0544d227 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -38,8 +39,8 @@ namespace osu.Game.Screens.Select
         {
             var item = new PlaylistItem
             {
-                Beatmap = Beatmap.Value.BeatmapInfo,
-                Ruleset = Ruleset.Value,
+                Beatmap = { Value = Beatmap.Value.BeatmapInfo },
+                Ruleset = { Value = Ruleset.Value },
                 RulesetID = Ruleset.Value.ID ?? 0
             };
 
@@ -60,8 +61,8 @@ namespace osu.Game.Screens.Select
 
             if (CurrentItem.Value != null)
             {
-                Ruleset.Value = CurrentItem.Value.Ruleset;
-                Beatmap.Value = beatmaps.GetWorkingBeatmap(CurrentItem.Value.Beatmap);
+                Ruleset.Value = CurrentItem.Value.Ruleset.Value;
+                Beatmap.Value = beatmaps.GetWorkingBeatmap(CurrentItem.Value.Beatmap.Value);
                 Mods.Value = CurrentItem.Value.RequiredMods?.ToArray() ?? Array.Empty<Mod>();
             }
 

From be2d1c6b4305897f12a1b25802bf1e0cfdc71fbe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Feb 2020 18:35:31 +0900
Subject: [PATCH 0426/1142] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 25bde037db..494842f38f 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -54,6 +54,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.207.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.213.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 389fbe8210..50d8c25b11 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.207.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.213.0" />
     <PackageReference Include="Sentry" Version="2.0.2" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 3ed25360c5..e56fc41b07 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -74,7 +74,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.207.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.213.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
@@ -82,7 +82,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.207.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.213.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 75bef15583aecec6bb2f4d0d223a7e0b64a5fd5e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 Feb 2020 18:48:28 +0900
Subject: [PATCH 0427/1142] Remove "current" multiplayer room item

---
 .../Multiplayer/TestSceneMatchBeatmapPanel.cs | 12 -------
 osu.Game/Online/Multiplayer/PlaylistItem.cs   | 12 ++++++-
 osu.Game/Online/Multiplayer/Room.cs           | 24 ++------------
 .../Screens/Multi/Components/BeatmapTitle.cs  |  8 +++--
 .../Multi/Components/BeatmapTypeInfo.cs       | 32 ++++++++++--------
 .../Screens/Multi/Components/ModeTypeInfo.cs  | 13 +++++---
 .../Components/MultiplayerBackgroundSprite.cs | 14 ++++++--
 .../Screens/Multi/Match/Components/Header.cs  | 16 +++++++--
 .../Screens/Multi/Match/Components/Info.cs    | 16 +++++++--
 .../Match/Components/MatchBeatmapPanel.cs     | 11 +++++--
 .../Screens/Multi/Match/MatchSubScreen.cs     | 33 ++++++++++++-------
 .../Screens/Multi/MultiplayerComposite.cs     |  3 --
 osu.Game/Screens/Select/MatchSongSelect.cs    | 16 +++++----
 13 files changed, 123 insertions(+), 87 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapPanel.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapPanel.cs
index 84ab6f9ccc..f014b08325 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapPanel.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapPanel.cs
@@ -7,7 +7,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Match.Components;
 using osu.Framework.Graphics;
-using osu.Framework.Utils;
 using osu.Game.Audio;
 using osu.Framework.Allocation;
 
@@ -38,16 +37,5 @@ namespace osu.Game.Tests.Visual.Multiplayer
             Room.Playlist.Add(new PlaylistItem { Beatmap = { Value = new BeatmapInfo { OnlineBeatmapID = 2109801 } } });
             Room.Playlist.Add(new PlaylistItem { Beatmap = { Value = new BeatmapInfo { OnlineBeatmapID = 1922035 } } });
         }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            AddStep("Select random beatmap", () =>
-            {
-                Room.CurrentItem.Value = Room.Playlist[RNG.Next(Room.Playlist.Count)];
-                previewTrackManager.StopAnyPlaying(this);
-            });
-        }
     }
 }
diff --git a/osu.Game/Online/Multiplayer/PlaylistItem.cs b/osu.Game/Online/Multiplayer/PlaylistItem.cs
index e243cfca08..69e1f0db13 100644
--- a/osu.Game/Online/Multiplayer/PlaylistItem.cs
+++ b/osu.Game/Online/Multiplayer/PlaylistItem.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Linq;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
@@ -12,7 +13,7 @@ using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Online.Multiplayer
 {
-    public class PlaylistItem
+    public class PlaylistItem : IEquatable<PlaylistItem>
     {
         [JsonProperty("id")]
         public int ID { get; set; }
@@ -90,5 +91,14 @@ namespace osu.Game.Online.Multiplayer
 
         public bool ShouldSerializeID() => false;
         public bool ShouldSerializeapiBeatmap() => false;
+
+        public bool Equals(PlaylistItem other) => ID == other?.ID && BeatmapID == other.BeatmapID && RulesetID == other.RulesetID;
+
+        public override int GetHashCode()
+        {
+            // ReSharper disable NonReadonlyMemberInGetHashCode
+            return HashCode.Combine(ID, BeatmapID, RulesetID);
+            // ReSharper restore NonReadonlyMemberInGetHashCode
+        }
     }
 }
diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs
index 53089897f7..1f123de1a3 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Multiplayer/Room.cs
@@ -31,10 +31,6 @@ namespace osu.Game.Online.Multiplayer
         [JsonProperty("playlist")]
         public BindableList<PlaylistItem> Playlist { get; private set; } = new BindableList<PlaylistItem>();
 
-        [Cached]
-        [JsonIgnore]
-        public Bindable<PlaylistItem> CurrentItem { get; private set; } = new Bindable<PlaylistItem>();
-
         [Cached]
         [JsonProperty("channel_id")]
         public Bindable<int> ChannelId { get; private set; } = new Bindable<int>();
@@ -70,18 +66,6 @@ namespace osu.Game.Online.Multiplayer
         [Cached]
         public Bindable<int> ParticipantCount { get; private set; } = new Bindable<int>();
 
-        public Room()
-        {
-            Playlist.ItemsAdded += updateCurrent;
-            Playlist.ItemsRemoved += updateCurrent;
-            updateCurrent(Playlist);
-        }
-
-        private void updateCurrent(IEnumerable<PlaylistItem> playlist)
-        {
-            CurrentItem.Value = playlist.FirstOrDefault();
-        }
-
         // todo: TEMPORARY
         [JsonProperty("participant_count")]
         private int? participantCount
@@ -136,11 +120,9 @@ namespace osu.Game.Online.Multiplayer
             if (DateTimeOffset.Now >= EndDate.Value)
                 Status.Value = new RoomStatusEnded();
 
-            // Todo: Temporary, should only remove/add new items (requires framework changes)
-            if (Playlist.Count == 0)
-                Playlist.AddRange(other.Playlist);
-            else if (other.Playlist.Count > 0)
-                Playlist.First().ID = other.Playlist.First().ID;
+            foreach (var removedItem in Playlist.Except(other.Playlist).ToArray())
+                Playlist.Remove(removedItem);
+            Playlist.AddRange(other.Playlist.Except(Playlist).ToArray());
 
             Position = other.Position;
         }
diff --git a/osu.Game/Screens/Multi/Components/BeatmapTitle.cs b/osu.Game/Screens/Multi/Components/BeatmapTitle.cs
index b991a3d68d..baf11dfe0d 100644
--- a/osu.Game/Screens/Multi/Components/BeatmapTitle.cs
+++ b/osu.Game/Screens/Multi/Components/BeatmapTitle.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Localisation;
@@ -25,7 +26,10 @@ namespace osu.Game.Screens.Multi.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            CurrentItem.BindValueChanged(_ => updateText(), true);
+            Playlist.ItemsAdded += _ => updateText();
+            Playlist.ItemsRemoved += _ => updateText();
+
+            updateText();
         }
 
         private float textSize = OsuFont.DEFAULT_FONT_SIZE;
@@ -54,7 +58,7 @@ namespace osu.Game.Screens.Multi.Components
 
             textFlow.Clear();
 
-            var beatmap = CurrentItem.Value?.Beatmap;
+            var beatmap = Playlist.FirstOrDefault()?.Beatmap;
 
             if (beatmap == null)
             {
diff --git a/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs b/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs
index 21b228bb5c..a1334101b8 100644
--- a/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs
+++ b/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -12,6 +13,8 @@ namespace osu.Game.Screens.Multi.Components
 {
     public class BeatmapTypeInfo : MultiplayerComposite
     {
+        private LinkFlowContainer beatmapAuthor;
+
         public BeatmapTypeInfo()
         {
             AutoSizeAxes = Axes.Both;
@@ -20,8 +23,6 @@ namespace osu.Game.Screens.Multi.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            LinkFlowContainer beatmapAuthor;
-
             InternalChild = new FillFlowContainer
             {
                 AutoSizeAxes = Axes.Both,
@@ -50,18 +51,23 @@ namespace osu.Game.Screens.Multi.Components
                 }
             };
 
-            CurrentItem.BindValueChanged(item =>
+            Playlist.ItemsAdded += _ => updateInfo();
+            Playlist.ItemsRemoved += _ => updateInfo();
+
+            updateInfo();
+        }
+
+        private void updateInfo()
+        {
+            beatmapAuthor.Clear();
+
+            var beatmap = Playlist.FirstOrDefault()?.Beatmap;
+
+            if (beatmap != null)
             {
-                beatmapAuthor.Clear();
-
-                var beatmap = item.NewValue?.Beatmap;
-
-                if (beatmap != null)
-                {
-                    beatmapAuthor.AddText("mapped by ", s => s.Colour = OsuColour.Gray(0.8f));
-                    beatmapAuthor.AddUserLink(beatmap.Value.Metadata.Author);
-                }
-            }, true);
+                beatmapAuthor.AddText("mapped by ", s => s.Colour = OsuColour.Gray(0.8f));
+                beatmapAuthor.AddUserLink(beatmap.Value.Metadata.Author);
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs b/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs
index 5465463888..258541bbd6 100644
--- a/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs
+++ b/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs
@@ -1,11 +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.
 
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps.Drawables;
-using osu.Game.Online.Multiplayer;
 using osuTK;
 
 namespace osu.Game.Screens.Multi.Components
@@ -46,13 +46,18 @@ namespace osu.Game.Screens.Multi.Components
                 },
             };
 
-            CurrentItem.BindValueChanged(item => updateBeatmap(item.NewValue), true);
-
             Type.BindValueChanged(type => gameTypeContainer.Child = new DrawableGameType(type.NewValue) { Size = new Vector2(height) }, true);
+
+            Playlist.ItemsAdded += _ => updateBeatmap();
+            Playlist.ItemsRemoved += _ => updateBeatmap();
+
+            updateBeatmap();
         }
 
-        private void updateBeatmap(PlaylistItem item)
+        private void updateBeatmap()
         {
+            var item = Playlist.FirstOrDefault();
+
             if (item?.Beatmap != null)
             {
                 drawableRuleset.FadeIn(transition_duration);
diff --git a/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs b/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs
index 9a1a482699..5e2f2e530a 100644
--- a/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs
+++ b/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps.Drawables;
@@ -10,6 +11,7 @@ namespace osu.Game.Screens.Multi.Components
     public class MultiplayerBackgroundSprite : MultiplayerComposite
     {
         private readonly BeatmapSetCoverType beatmapSetCoverType;
+        private UpdateableBeatmapBackgroundSprite sprite;
 
         public MultiplayerBackgroundSprite(BeatmapSetCoverType beatmapSetCoverType = BeatmapSetCoverType.Cover)
         {
@@ -19,11 +21,17 @@ namespace osu.Game.Screens.Multi.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            UpdateableBeatmapBackgroundSprite sprite;
-
             InternalChild = sprite = CreateBackgroundSprite();
 
-            CurrentItem.BindValueChanged(item => sprite.Beatmap.Value = item.NewValue?.Beatmap.Value, true);
+            Playlist.ItemsAdded += _ => updateBeatmap();
+            Playlist.ItemsRemoved += _ => updateBeatmap();
+
+            updateBeatmap();
+        }
+
+        private void updateBeatmap()
+        {
+            sprite.Beatmap.Value = Playlist.FirstOrDefault()?.Beatmap.Value;
         }
 
         protected virtual UpdateableBeatmapBackgroundSprite CreateBackgroundSprite() => new UpdateableBeatmapBackgroundSprite(beatmapSetCoverType) { RelativeSizeAxes = Axes.Both };
diff --git a/osu.Game/Screens/Multi/Match/Components/Header.cs b/osu.Game/Screens/Multi/Match/Components/Header.cs
index 991060cac0..cf1eb6b6ed 100644
--- a/osu.Game/Screens/Multi/Match/Components/Header.cs
+++ b/osu.Game/Screens/Multi/Match/Components/Header.cs
@@ -33,6 +33,7 @@ namespace osu.Game.Screens.Multi.Match.Components
         public Action RequestBeatmapSelection;
 
         private MatchBeatmapPanel beatmapPanel;
+        private ModDisplay modDisplay;
 
         public Header()
         {
@@ -44,7 +45,6 @@ namespace osu.Game.Screens.Multi.Match.Components
         private void load(OsuColour colours)
         {
             BeatmapSelectButton beatmapButton;
-            ModDisplay modDisplay;
 
             InternalChildren = new Drawable[]
             {
@@ -120,9 +120,12 @@ namespace osu.Game.Screens.Multi.Match.Components
                 },
             };
 
-            CurrentItem.BindValueChanged(item => modDisplay.Current.Value = item.NewValue?.RequiredMods?.ToArray() ?? Array.Empty<Mod>(), true);
-
             beatmapButton.Action = () => RequestBeatmapSelection?.Invoke();
+
+            Playlist.ItemsAdded += _ => updateMods();
+            Playlist.ItemsRemoved += _ => updateMods();
+
+            updateMods();
         }
 
         protected override void LoadComplete()
@@ -131,6 +134,13 @@ namespace osu.Game.Screens.Multi.Match.Components
             ShowBeatmapPanel.BindValueChanged(value => beatmapPanel.FadeTo(value.NewValue ? 1 : 0, 200, Easing.OutQuint), true);
         }
 
+        private void updateMods()
+        {
+            var item = Playlist.FirstOrDefault();
+
+            modDisplay.Current.Value = item?.RequiredMods?.ToArray() ?? Array.Empty<Mod>();
+        }
+
         private class BeatmapSelectButton : HeaderButton
         {
             [Resolved(typeof(Room), nameof(Room.RoomID))]
diff --git a/osu.Game/Screens/Multi/Match/Components/Info.cs b/osu.Game/Screens/Multi/Match/Components/Info.cs
index f0b54baa4c..a320b08cc4 100644
--- a/osu.Game/Screens/Multi/Match/Components/Info.cs
+++ b/osu.Game/Screens/Multi/Match/Components/Info.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -18,6 +19,8 @@ namespace osu.Game.Screens.Multi.Match.Components
     {
         public Action OnStart;
 
+        private ReadyButton readyButton;
+
         public Info()
         {
             RelativeSizeAxes = Axes.X;
@@ -27,7 +30,6 @@ namespace osu.Game.Screens.Multi.Match.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            ReadyButton readyButton;
             HostInfo hostInfo;
 
             InternalChildren = new Drawable[]
@@ -89,9 +91,17 @@ namespace osu.Game.Screens.Multi.Match.Components
                 },
             };
 
-            CurrentItem.BindValueChanged(item => readyButton.Beatmap.Value = item.NewValue?.Beatmap.Value, true);
-
             hostInfo.Host.BindTo(Host);
+
+            Playlist.ItemsAdded += _ => updateBeatmap();
+            Playlist.ItemsRemoved += _ => updateBeatmap();
+
+            updateBeatmap();
+        }
+
+        private void updateBeatmap()
+        {
+            readyButton.Beatmap.Value = Playlist.FirstOrDefault()?.Beatmap.Value;
         }
     }
 }
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchBeatmapPanel.cs b/osu.Game/Screens/Multi/Match/Components/MatchBeatmapPanel.cs
index f67f6d9f43..c8de066caa 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchBeatmapPanel.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchBeatmapPanel.cs
@@ -1,10 +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 System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Overlays.Direct;
@@ -32,10 +32,13 @@ namespace osu.Game.Screens.Multi.Match.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            CurrentItem.BindValueChanged(item => loadNewPanel(item.NewValue?.Beatmap.Value), true);
+            Playlist.ItemsAdded += _ => loadNewPanel();
+            Playlist.ItemsRemoved += _ => loadNewPanel();
+
+            loadNewPanel();
         }
 
-        private void loadNewPanel(BeatmapInfo beatmap)
+        private void loadNewPanel()
         {
             loadCancellation?.Cancel();
             request?.Cancel();
@@ -44,6 +47,8 @@ namespace osu.Game.Screens.Multi.Match.Components
             panel?.Expire();
             panel = null;
 
+            var beatmap = Playlist.FirstOrDefault()?.Beatmap.Value;
+
             if (beatmap?.OnlineBeatmapID == null)
                 return;
 
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index 9165ef6d0f..890664e99b 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -41,9 +41,6 @@ namespace osu.Game.Screens.Multi.Match
         [Resolved(typeof(Room))]
         protected BindableList<PlaylistItem> Playlist { get; private set; }
 
-        [Resolved(typeof(Room))]
-        protected Bindable<PlaylistItem> CurrentItem { get; private set; }
-
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
@@ -53,6 +50,7 @@ namespace osu.Game.Screens.Multi.Match
         [Resolved(CanBeNull = true)]
         private OsuGame game { get; set; }
 
+        private readonly Bindable<PlaylistItem> selectedItem = new Bindable<PlaylistItem>();
         private MatchLeaderboard leaderboard;
 
         public MatchSubScreen(Room room)
@@ -166,7 +164,16 @@ namespace osu.Game.Screens.Multi.Match
         {
             base.LoadComplete();
 
-            CurrentItem.BindValueChanged(currentItemChanged, true);
+            Playlist.ItemsAdded += _ => updateSelectedItem();
+            Playlist.ItemsRemoved += _ => updateSelectedItem();
+
+            updateSelectedItem();
+        }
+
+        private void updateSelectedItem()
+        {
+            selectedItem.Value = Playlist.FirstOrDefault();
+            currentItemChanged();
         }
 
         public override bool OnExiting(IScreen next)
@@ -181,16 +188,18 @@ namespace osu.Game.Screens.Multi.Match
         /// <summary>
         /// Handles propagation of the current playlist item's content to game-wide mechanisms.
         /// </summary>
-        private void currentItemChanged(ValueChangedEvent<PlaylistItem> e)
+        private void currentItemChanged()
         {
+            var item = selectedItem.Value;
+
             // Retrieve the corresponding local beatmap, since we can't directly use the playlist's beatmap info
-            var localBeatmap = e.NewValue?.Beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == e.NewValue.Beatmap.Value.OnlineBeatmapID);
+            var localBeatmap = item?.Beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == item.Beatmap.Value.OnlineBeatmapID);
 
             Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
-            Mods.Value = e.NewValue?.RequiredMods?.ToArray() ?? Array.Empty<Mod>();
+            Mods.Value = item?.RequiredMods?.ToArray() ?? Array.Empty<Mod>();
 
-            if (e.NewValue?.Ruleset != null)
-                Ruleset.Value = e.NewValue.Ruleset.Value;
+            if (item?.Ruleset != null)
+                Ruleset.Value = item.Ruleset.Value;
 
             previewTrackManager.StopAnyPlaying(this);
         }
@@ -203,11 +212,11 @@ namespace osu.Game.Screens.Multi.Match
             if (Beatmap.Value != beatmapManager.DefaultBeatmap)
                 return;
 
-            if (CurrentItem.Value == null)
+            if (selectedItem.Value == null)
                 return;
 
             // Try to retrieve the corresponding local beatmap
-            var localBeatmap = beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == CurrentItem.Value.Beatmap.Value.OnlineBeatmapID);
+            var localBeatmap = beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == selectedItem.Value.Beatmap.Value.OnlineBeatmapID);
 
             if (localBeatmap != null)
                 Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
@@ -224,7 +233,7 @@ namespace osu.Game.Screens.Multi.Match
             {
                 default:
                 case GameTypeTimeshift _:
-                    multiplayer?.Start(() => new TimeshiftPlayer(CurrentItem.Value)
+                    multiplayer?.Start(() => new TimeshiftPlayer(selectedItem.Value)
                     {
                         Exited = () => leaderboard.RefreshScores()
                     });
diff --git a/osu.Game/Screens/Multi/MultiplayerComposite.cs b/osu.Game/Screens/Multi/MultiplayerComposite.cs
index 8c09d576ff..cf4a189951 100644
--- a/osu.Game/Screens/Multi/MultiplayerComposite.cs
+++ b/osu.Game/Screens/Multi/MultiplayerComposite.cs
@@ -31,9 +31,6 @@ namespace osu.Game.Screens.Multi
         [Resolved(typeof(Room))]
         protected BindableList<PlaylistItem> Playlist { get; private set; }
 
-        [Resolved(typeof(Room))]
-        protected Bindable<PlaylistItem> CurrentItem { get; private set; }
-
         [Resolved(typeof(Room))]
         protected Bindable<IEnumerable<User>> Participants { get; private set; }
 
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index ff0544d227..251456bf0d 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -22,11 +22,11 @@ namespace osu.Game.Screens.Select
         public string ShortTitle => "song selection";
         public override string Title => ShortTitle.Humanize();
 
-        [Resolved(typeof(Room))]
-        protected Bindable<PlaylistItem> CurrentItem { get; private set; }
-
         public override bool AllowEditing => false;
 
+        [Resolved(typeof(Room), nameof(Room.Playlist))]
+        protected BindableList<PlaylistItem> Playlist { get; private set; }
+
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
@@ -59,11 +59,13 @@ namespace osu.Game.Screens.Select
             if (base.OnExiting(next))
                 return true;
 
-            if (CurrentItem.Value != null)
+            var firstItem = Playlist.FirstOrDefault();
+
+            if (firstItem != null)
             {
-                Ruleset.Value = CurrentItem.Value.Ruleset.Value;
-                Beatmap.Value = beatmaps.GetWorkingBeatmap(CurrentItem.Value.Beatmap.Value);
-                Mods.Value = CurrentItem.Value.RequiredMods?.ToArray() ?? Array.Empty<Mod>();
+                Ruleset.Value = firstItem.Ruleset.Value;
+                Beatmap.Value = beatmaps.GetWorkingBeatmap(firstItem.Beatmap.Value);
+                Mods.Value = firstItem.RequiredMods?.ToArray() ?? Array.Empty<Mod>();
             }
 
             return false;

From bce9c8f3f30352ffa9b29d705fd72557d98b55f9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 Feb 2020 18:59:15 +0900
Subject: [PATCH 0428/1142] Make room participants into a bindable list

---
 .../Multiplayer/TestSceneMatchParticipants.cs |  6 +++---
 osu.Game/Online/Multiplayer/Room.cs           |  7 +++++--
 .../Multi/Match/Components/Participants.cs    | 13 +++++++++----
 .../Screens/Multi/MultiplayerComposite.cs     |  3 +--
 osu.Game/Users/UserPanel.cs                   | 19 ++++++++++---------
 5 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchParticipants.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchParticipants.cs
index 1ac914e27d..a6f47961e9 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchParticipants.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchParticipants.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             Add(new Participants { RelativeSizeAxes = Axes.Both });
 
             AddStep(@"set max to null", () => Room.MaxParticipants.Value = null);
-            AddStep(@"set users", () => Room.Participants.Value = new[]
+            AddStep(@"set users", () => Room.Participants.AddRange(new[]
             {
                 new User
                 {
@@ -42,10 +42,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
                     CoverUrl = @"https://assets.ppy.sh/user-profile-covers/5287410/5cfeaa9dd41cbce038ecdc9d781396ed4b0108089170bf7f50492ef8eadeb368.jpeg",
                     IsSupporter = true,
                 },
-            });
+            }));
 
             AddStep(@"set max", () => Room.MaxParticipants.Value = 10);
-            AddStep(@"clear users", () => Room.Participants.Value = System.Array.Empty<User>());
+            AddStep(@"clear users", () => Room.Participants.Clear());
             AddStep(@"set max to null", () => Room.MaxParticipants.Value = null);
         }
     }
diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs
index 53089897f7..0f4abeafd4 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Multiplayer/Room.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Online.Multiplayer
 
         [Cached]
         [JsonIgnore]
-        public Bindable<IEnumerable<User>> Participants { get; private set; } = new Bindable<IEnumerable<User>>(Enumerable.Empty<User>());
+        public BindableList<User> Participants { get; private set; } = new BindableList<User>();
 
         [Cached]
         public Bindable<int> ParticipantCount { get; private set; } = new Bindable<int>();
@@ -130,7 +130,6 @@ namespace osu.Game.Online.Multiplayer
             Type.Value = other.Type.Value;
             MaxParticipants.Value = other.MaxParticipants.Value;
             ParticipantCount.Value = other.ParticipantCount.Value;
-            Participants.Value = other.Participants.Value.ToArray();
             EndDate.Value = other.EndDate.Value;
 
             if (DateTimeOffset.Now >= EndDate.Value)
@@ -142,6 +141,10 @@ namespace osu.Game.Online.Multiplayer
             else if (other.Playlist.Count > 0)
                 Playlist.First().ID = other.Playlist.First().ID;
 
+            foreach (var removedItem in Participants.Except(other.Participants).ToArray())
+                Participants.Remove(removedItem);
+            Participants.AddRange(other.Participants.Except(Participants).ToArray());
+
             Position = other.Position;
         }
 
diff --git a/osu.Game/Screens/Multi/Match/Components/Participants.cs b/osu.Game/Screens/Multi/Match/Components/Participants.cs
index ad38ec6a99..00d2f3e150 100644
--- a/osu.Game/Screens/Multi/Match/Components/Participants.cs
+++ b/osu.Game/Screens/Multi/Match/Components/Participants.cs
@@ -51,9 +51,9 @@ namespace osu.Game.Screens.Multi.Match.Components
                 },
             };
 
-            Participants.BindValueChanged(participants =>
+            Participants.ItemsAdded += users =>
             {
-                usersFlow.Children = participants.NewValue.Select(u =>
+                usersFlow.AddRange(users.Select(u =>
                 {
                     var panel = new UserPanel(u)
                     {
@@ -65,8 +65,13 @@ namespace osu.Game.Screens.Multi.Match.Components
                     panel.OnLoadComplete += d => d.FadeInFromZero(60);
 
                     return panel;
-                }).ToList();
-            }, true);
+                }).ToList());
+            };
+
+            Participants.ItemsRemoved += users =>
+            {
+                usersFlow.RemoveAll(p => users.Contains(p.User));
+            };
         }
     }
 }
diff --git a/osu.Game/Screens/Multi/MultiplayerComposite.cs b/osu.Game/Screens/Multi/MultiplayerComposite.cs
index 8c09d576ff..346f78f2c6 100644
--- a/osu.Game/Screens/Multi/MultiplayerComposite.cs
+++ b/osu.Game/Screens/Multi/MultiplayerComposite.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
@@ -35,7 +34,7 @@ namespace osu.Game.Screens.Multi
         protected Bindable<PlaylistItem> CurrentItem { get; private set; }
 
         [Resolved(typeof(Room))]
-        protected Bindable<IEnumerable<User>> Participants { get; private set; }
+        protected BindableList<User> Participants { get; private set; }
 
         [Resolved(typeof(Room))]
         protected Bindable<int> ParticipantCount { get; private set; }
diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index 6ddbc13a06..6f34466e94 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -26,11 +26,12 @@ namespace osu.Game.Users
 {
     public class UserPanel : OsuClickableContainer, IHasContextMenu
     {
-        private readonly User user;
         private const float height = 100;
         private const float content_padding = 10;
         private const float status_height = 30;
 
+        public readonly User User;
+
         [Resolved(canBeNull: true)]
         private OsuColour colours { get; set; }
 
@@ -54,7 +55,7 @@ namespace osu.Game.Users
             if (user == null)
                 throw new ArgumentNullException(nameof(user));
 
-            this.user = user;
+            User = user;
 
             Height = height - status_height;
         }
@@ -86,7 +87,7 @@ namespace osu.Game.Users
                         RelativeSizeAxes = Axes.Both,
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
-                        User = user,
+                        User = User,
                     }, 300, 5000)
                     {
                         RelativeSizeAxes = Axes.Both,
@@ -106,7 +107,7 @@ namespace osu.Game.Users
                             new UpdateableAvatar
                             {
                                 Size = new Vector2(height - status_height - content_padding * 2),
-                                User = user,
+                                User = User,
                                 Masking = true,
                                 CornerRadius = 5,
                                 OpenOnClick = { Value = false },
@@ -125,7 +126,7 @@ namespace osu.Game.Users
                                 {
                                     new OsuSpriteText
                                     {
-                                        Text = user.Username,
+                                        Text = User.Username,
                                         Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 18, italics: true),
                                     },
                                     infoContainer = new FillFlowContainer
@@ -138,7 +139,7 @@ namespace osu.Game.Users
                                         Spacing = new Vector2(5f, 0f),
                                         Children = new Drawable[]
                                         {
-                                            new UpdateableFlag(user.Country)
+                                            new UpdateableFlag(User.Country)
                                             {
                                                 Width = 30f,
                                                 RelativeSizeAxes = Axes.Y,
@@ -191,12 +192,12 @@ namespace osu.Game.Users
                 }
             });
 
-            if (user.IsSupporter)
+            if (User.IsSupporter)
             {
                 infoContainer.Add(new SupporterIcon
                 {
                     Height = 20f,
-                    SupportLevel = user.SupportLevel
+                    SupportLevel = User.SupportLevel
                 });
             }
 
@@ -206,7 +207,7 @@ namespace osu.Game.Users
             base.Action = ViewProfile = () =>
             {
                 Action?.Invoke();
-                profile?.ShowUser(user);
+                profile?.ShowUser(User);
             };
         }
 

From bc1c4f6b583eae9b2b6020f0f896cba6c21e1907 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 13 Feb 2020 19:04:23 +0900
Subject: [PATCH 0429/1142] Add missing null-allowance

---
 osu.Game/Online/Leaderboards/LeaderboardScore.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index c9131883bb..1f52a4481b 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Online.Leaderboards
 
         private List<ScoreComponentLabel> statisticsLabels;
 
-        [Resolved]
+        [Resolved(CanBeNull = true)]
         private DialogOverlay dialogOverlay { get; set; }
 
         public LeaderboardScore(ScoreInfo score, int rank, bool allowHighlight = true)

From a677aa6cfc5212223175d40f34279cb3573c78ae Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 13 Feb 2020 13:39:33 +0300
Subject: [PATCH 0430/1142] Add rankings overlay to the game

---
 osu.Game/OsuGame.cs                           |  5 ++++-
 osu.Game/Overlays/Toolbar/Toolbar.cs          |  1 +
 .../Overlays/Toolbar/ToolbarRankingsButton.cs | 22 +++++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index e7fffd49b4..e034fcc3ac 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -65,6 +65,8 @@ namespace osu.Game
 
         private DirectOverlay direct;
 
+        private RankingsOverlay rankings;
+
         private SocialOverlay social;
 
         private UserProfileOverlay userProfile;
@@ -600,6 +602,7 @@ namespace osu.Game
             //overlay elements
             loadComponentSingleFile(direct = new DirectOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(social = new SocialOverlay(), overlayContent.Add, true);
+            loadComponentSingleFile(rankings = new RankingsOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(channelManager = new ChannelManager(), AddInternal, true);
             loadComponentSingleFile(chatOverlay = new ChatOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(Settings = new SettingsOverlay { GetToolbarHeight = () => ToolbarOffset }, leftFloatingOverlayContent.Add, true);
@@ -643,7 +646,7 @@ namespace osu.Game
             }
 
             // eventually informational overlays should be displayed in a stack, but for now let's only allow one to stay open at a time.
-            var informationalOverlays = new OverlayContainer[] { beatmapSetOverlay, userProfile };
+            var informationalOverlays = new OverlayContainer[] { beatmapSetOverlay, userProfile, rankings };
 
             foreach (var overlay in informationalOverlays)
             {
diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index b044bc4de0..897587d198 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -70,6 +70,7 @@ namespace osu.Game.Overlays.Toolbar
                     Children = new Drawable[]
                     {
                         new ToolbarChangelogButton(),
+                        new ToolbarRankingsButton(),
                         new ToolbarDirectButton(),
                         new ToolbarChatButton(),
                         new ToolbarSocialButton(),
diff --git a/osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs b/osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs
new file mode 100644
index 0000000000..cbd097696d
--- /dev/null
+++ b/osu.Game/Overlays/Toolbar/ToolbarRankingsButton.cs
@@ -0,0 +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 osu.Framework.Allocation;
+using osu.Framework.Graphics.Sprites;
+
+namespace osu.Game.Overlays.Toolbar
+{
+    public class ToolbarRankingsButton : ToolbarOverlayToggleButton
+    {
+        public ToolbarRankingsButton()
+        {
+            SetIcon(FontAwesome.Regular.ChartBar);
+        }
+
+        [BackgroundDependencyLoader(true)]
+        private void load(RankingsOverlay rankings)
+        {
+            StateContainer = rankings;
+        }
+    }
+}

From f05c1de4c10a68c910ae7435f2a04a288cebf250 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 13 Feb 2020 14:11:53 +0300
Subject: [PATCH 0431/1142] Fix possible nullref

---
 osu.Game/Overlays/RankingsOverlay.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index f3215d07fa..69ca687871 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -135,6 +135,9 @@ namespace osu.Game.Overlays
 
         private void loadNewContent()
         {
+            if (ruleset.Value == null)
+                return;
+
             loading.Show();
 
             cancellationToken?.Cancel();

From 11c59a141f24aebf68f21fb7d79f88980b1233f1 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 13 Feb 2020 14:12:10 +0300
Subject: [PATCH 0432/1142] Add background to rankings header

---
 osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
index 2674b3a81e..72d5b6462d 100644
--- a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
+++ b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
@@ -29,6 +29,8 @@ namespace osu.Game.Overlays.Rankings
             Current = Country
         };
 
+        protected override Drawable CreateBackground() => new OverlayHeaderBackground(@"Headers/rankings");
+
         private class RankingsTitle : ScreenTitle
         {
             public readonly Bindable<RankingsScope> Scope = new Bindable<RankingsScope>();

From 382cc1a91ba24fa00e89e641e5f86ff517d2e34e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 13 Feb 2020 14:26:35 +0300
Subject: [PATCH 0433/1142] Fix incorrect overlays overlapping

---
 osu.Game/OsuGame.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index e034fcc3ac..c31f15716b 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -65,8 +65,6 @@ namespace osu.Game
 
         private DirectOverlay direct;
 
-        private RankingsOverlay rankings;
-
         private SocialOverlay social;
 
         private UserProfileOverlay userProfile;
@@ -602,7 +600,7 @@ namespace osu.Game
             //overlay elements
             loadComponentSingleFile(direct = new DirectOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(social = new SocialOverlay(), overlayContent.Add, true);
-            loadComponentSingleFile(rankings = new RankingsOverlay(), overlayContent.Add, true);
+            var rankingsOverlay = loadComponentSingleFile(new RankingsOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(channelManager = new ChannelManager(), AddInternal, true);
             loadComponentSingleFile(chatOverlay = new ChatOverlay(), overlayContent.Add, true);
             loadComponentSingleFile(Settings = new SettingsOverlay { GetToolbarHeight = () => ToolbarOffset }, leftFloatingOverlayContent.Add, true);
@@ -646,7 +644,7 @@ namespace osu.Game
             }
 
             // eventually informational overlays should be displayed in a stack, but for now let's only allow one to stay open at a time.
-            var informationalOverlays = new OverlayContainer[] { beatmapSetOverlay, userProfile, rankings };
+            var informationalOverlays = new OverlayContainer[] { beatmapSetOverlay, userProfile };
 
             foreach (var overlay in informationalOverlays)
             {
@@ -659,7 +657,7 @@ namespace osu.Game
             }
 
             // ensure only one of these overlays are open at once.
-            var singleDisplayOverlays = new OverlayContainer[] { chatOverlay, social, direct, changelogOverlay };
+            var singleDisplayOverlays = new OverlayContainer[] { chatOverlay, social, direct, changelogOverlay, rankingsOverlay };
 
             foreach (var overlay in singleDisplayOverlays)
             {

From b2fbeab7732437b8671c512fe69eabeb6deefb47 Mon Sep 17 00:00:00 2001
From: Maximilian Junges <Maxi.Junges@gmx.de>
Date: Thu, 13 Feb 2020 14:07:14 +0100
Subject: [PATCH 0434/1142] simplify string formatting and fix color

---
 osu.Game/Graphics/DrawableDate.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Graphics/DrawableDate.cs b/osu.Game/Graphics/DrawableDate.cs
index dcbea96071..8c520f4e10 100644
--- a/osu.Game/Graphics/DrawableDate.cs
+++ b/osu.Game/Graphics/DrawableDate.cs
@@ -126,10 +126,8 @@ namespace osu.Game.Graphics
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
             {
-                // Temporary colour since it's currently impossible to change it without bugs (see https://github.com/ppy/osu-framework/issues/3231)
-                // If above is fixed, this should use OverlayColourProvider
-                background.Colour = colours.Gray1;
-                timeText.Colour = colours.GreyCyanLighter;
+                background.Colour = colours.GreySeafoamDarker;
+                timeText.Colour = colours.BlueLighter;
             }
 
             protected override void PopIn() => this.FadeIn(200, Easing.OutQuint);
@@ -140,8 +138,8 @@ namespace osu.Game.Graphics
                 if (!(content is DateTimeOffset date))
                     return false;
 
-                dateText.Text = string.Format($"{date:d MMMM yyyy}") + " ";
-                timeText.Text = string.Format($"{date:hh:mm:ss \"UTC\"z}");
+                dateText.Text = $"{date:d MMMM yyyy} ";
+                timeText.Text = $"{date:hh:mm:ss \"UTC\"z}";
                 return true;
             }
 

From e181a95c855d1ba6562219a7df9776955f1a7a4d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Feb 2020 22:28:37 +0900
Subject: [PATCH 0435/1142] Remove unused using

---
 osu.Game/Online/Multiplayer/Room.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs
index ff11a74a1a..400afb39a1 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Multiplayer/Room.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
 using osu.Framework.Allocation;

From e67e4f708ea996e594992321a0e01cf037a967ed Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 13 Feb 2020 19:01:26 +0300
Subject: [PATCH 0436/1142] Adjust country name design

---
 .../Rankings/Tables/CountriesTable.cs         | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs b/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs
index a0e4f694bd..ed8e956e5e 100644
--- a/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs
+++ b/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs
@@ -8,6 +8,7 @@ using osu.Game.Users;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics;
 using System.Collections.Generic;
+using osu.Framework.Allocation;
 
 namespace osu.Game.Overlays.Rankings.Tables
 {
@@ -30,11 +31,7 @@ namespace osu.Game.Overlays.Rankings.Tables
 
         protected override Country GetCountry(CountryStatistics item) => item.Country;
 
-        protected override Drawable CreateFlagContent(CountryStatistics item) => new OsuSpriteText
-        {
-            Font = OsuFont.GetFont(size: TEXT_SIZE),
-            Text = $@"{item.Country.FullName}",
-        };
+        protected override Drawable CreateFlagContent(CountryStatistics item) => new CountryName(item.Country);
 
         protected override Drawable[] CreateAdditionalContent(CountryStatistics item) => new Drawable[]
         {
@@ -63,5 +60,20 @@ namespace osu.Game.Overlays.Rankings.Tables
                 Text = $@"{item.Performance / Math.Max(item.ActiveUsers, 1):N0}",
             }
         };
+
+        private class CountryName : OsuSpriteText
+        {
+            public CountryName(Country country)
+            {
+                Font = OsuFont.GetFont(size: 12, italics: true);
+                Text = $@"{country.FullName}";
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                Colour = colourProvider.Light2;
+            }
+        }
     }
 }

From 791bf6bc0197118f44654f754f9a407f4bda5f6b Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 13 Feb 2020 19:03:07 +0300
Subject: [PATCH 0437/1142] Make username text italic

---
 osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs b/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs
index 0e77d7d764..cad7364103 100644
--- a/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs
+++ b/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Rankings.Tables
 
         protected sealed override Drawable CreateFlagContent(UserStatistics item)
         {
-            var username = new LinkFlowContainer(t => t.Font = OsuFont.GetFont(size: TEXT_SIZE)) { AutoSizeAxes = Axes.Both };
+            var username = new LinkFlowContainer(t => t.Font = OsuFont.GetFont(size: TEXT_SIZE, italics: true)) { AutoSizeAxes = Axes.Both };
             username.AddUserLink(item.User);
             return username;
         }

From dac0148c94076026b579a8bc31fbba93bdd134c3 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 13 Feb 2020 20:08:14 +0100
Subject: [PATCH 0438/1142] Apply review suggestions.

---
 .../Online/TestSceneOnlineViewContainer.cs       |  2 +-
 osu.Game/Online/OnlineViewContainer.cs           | 16 ++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
index 2b9609f6e0..9dac28d347 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             public new LoadingAnimation LoadingAnimation => base.LoadingAnimation;
 
-            public CompositeDrawable ViewTarget => base.Content.Parent;
+            public CompositeDrawable ViewTarget => base.Content;
 
             public TestOnlineViewContainer()
                 : base(@"Please sign in to view dummy test content")
diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
index c512ca531a..4b59f6ae80 100644
--- a/osu.Game/Online/OnlineViewContainer.cs
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -21,8 +21,8 @@ namespace osu.Game.Online
 
         protected const double TRANSFORM_TIME = 300.0;
 
-        private readonly Container viewTarget;
-        protected override Container<Drawable> Content { get; }
+        private Container viewContent;
+        protected override Container<Drawable> Content => viewContent;
 
         [Resolved]
         protected IAPIProvider API { get; private set; }
@@ -31,13 +31,9 @@ namespace osu.Game.Online
         {
             InternalChildren = new Drawable[]
             {
-                viewTarget = new Container
+                viewContent = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Child = Content = new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                    }
                 },
                 placeholder = new LoginPlaceholder(placeholderMessage),
                 LoadingAnimation = new LoadingAnimation
@@ -52,21 +48,21 @@ namespace osu.Game.Online
             switch (state)
             {
                 case APIState.Offline:
-                    PopContentOut(viewTarget);
+                    PopContentOut(viewContent);
                     placeholder.ScaleTo(0.8f).Then().ScaleTo(1, 3 * TRANSFORM_TIME, Easing.OutQuint);
                     placeholder.FadeInFromZero(2 * TRANSFORM_TIME, Easing.OutQuint);
                     LoadingAnimation.Hide();
                     break;
 
                 case APIState.Online:
-                    PopContentIn(viewTarget);
+                    PopContentIn(viewContent);
                     placeholder.FadeOut(TRANSFORM_TIME / 2, Easing.OutQuint);
                     LoadingAnimation.Hide();
                     break;
 
                 case APIState.Failing:
                 case APIState.Connecting:
-                    PopContentOut(viewTarget);
+                    PopContentOut(viewContent);
                     LoadingAnimation.Show();
                     placeholder.FadeOut(TRANSFORM_TIME / 2, Easing.OutQuint);
                     break;

From cc625e3b897dd2669fe6300de9a6924082e97652 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 13 Feb 2020 20:44:02 +0100
Subject: [PATCH 0439/1142] Move initialisation logic to [SetUp]

---
 .../UserInterface/TestSceneCommentEditor.cs   | 122 +++++++++---------
 1 file changed, 59 insertions(+), 63 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
index a7888bb0b4..aaf26f78a7 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
@@ -31,73 +31,13 @@ namespace osu.Game.Tests.Visual.UserInterface
         private string commitText;
         private bool cancelActionFired;
 
-        [Test]
-        public void TestCommitViaKeyboard()
+        [SetUp]
+        public void SetUp()
         {
-            AddStep("Create", createEditors);
-            AddStep("Click on textbox", () =>
-            {
-                InputManager.MoveMouseTo(commentEditor);
-                InputManager.Click(MouseButton.Left);
-            });
-            AddStep("Write something", () => commentEditor.Current.Value = "text");
-            AddStep("Click Enter", () => press(Key.Enter));
-            AddAssert("Text has been invoked", () => !string.IsNullOrEmpty(commitText));
-            AddAssert("Button is loading", () => commentEditor.IsLoading);
-        }
-
-        [Test]
-        public void TestCommitViaKeyboardWhenEmpty()
-        {
-            AddStep("Create", createEditors);
-            AddStep("Click on textbox", () =>
-            {
-                InputManager.MoveMouseTo(commentEditor);
-                InputManager.Click(MouseButton.Left);
-            });
-            AddStep("Click Enter", () => press(Key.Enter));
-            AddAssert("Text not invoked", () => string.IsNullOrEmpty(commitText));
-            AddAssert("Button is not loading", () => !commentEditor.IsLoading);
-        }
-
-        [Test]
-        public void TestCommitViaButton()
-        {
-            AddStep("Create", createEditors);
-            AddStep("Click on textbox", () =>
-            {
-                InputManager.MoveMouseTo(commentEditor);
-                InputManager.Click(MouseButton.Left);
-            });
-            AddStep("Write something", () => commentEditor.Current.Value = "text");
-            AddStep("Click on button", () =>
-            {
-                InputManager.MoveMouseTo(commentEditor.ButtonsContainer);
-                InputManager.Click(MouseButton.Left);
-            });
-            AddAssert("Text has been invoked", () => !string.IsNullOrEmpty(commitText));
-            AddAssert("Button is loading", () => commentEditor.IsLoading);
-        }
-
-        [Test]
-        public void TestCancelAction()
-        {
-            AddStep("Create", createEditors);
-            AddStep("Click on cancel button", () =>
-            {
-                InputManager.MoveMouseTo(cancellableCommentEditor.ButtonsContainer);
-                InputManager.Click(MouseButton.Left);
-            });
-            AddAssert("Cancel action is fired", () => cancelActionFired);
-        }
-
-        private void createEditors()
-        {
-            Clear();
             commitText = string.Empty;
             cancelActionFired = false;
 
-            Add(new FillFlowContainer
+            Schedule(() => Add(new FillFlowContainer
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
@@ -117,7 +57,63 @@ namespace osu.Game.Tests.Visual.UserInterface
                         OnCancel = onCancel
                     }
                 }
+            }));
+        }
+
+        [Test]
+        public void TestCommitViaKeyboard()
+        {
+            AddStep("Click on textbox", () =>
+            {
+                InputManager.MoveMouseTo(commentEditor);
+                InputManager.Click(MouseButton.Left);
             });
+            AddStep("Write something", () => commentEditor.Current.Value = "text");
+            AddStep("Click Enter", () => press(Key.Enter));
+            AddAssert("Text has been invoked", () => !string.IsNullOrEmpty(commitText));
+            AddAssert("Button is loading", () => commentEditor.IsLoading);
+        }
+
+        [Test]
+        public void TestCommitViaKeyboardWhenEmpty()
+        {
+            AddStep("Click on textbox", () =>
+            {
+                InputManager.MoveMouseTo(commentEditor);
+                InputManager.Click(MouseButton.Left);
+            });
+            AddStep("Click Enter", () => press(Key.Enter));
+            AddAssert("Text not invoked", () => string.IsNullOrEmpty(commitText));
+            AddAssert("Button is not loading", () => !commentEditor.IsLoading);
+        }
+
+        [Test]
+        public void TestCommitViaButton()
+        {
+            AddStep("Click on textbox", () =>
+            {
+                InputManager.MoveMouseTo(commentEditor);
+                InputManager.Click(MouseButton.Left);
+            });
+            AddStep("Write something", () => commentEditor.Current.Value = "text");
+            AddStep("Click on button", () =>
+            {
+                InputManager.MoveMouseTo(commentEditor.ButtonsContainer);
+                InputManager.Click(MouseButton.Left);
+            });
+            AddAssert("Text has been invoked", () => !string.IsNullOrEmpty(commitText));
+            AddAssert("Button is loading", () => commentEditor.IsLoading);
+        }
+
+        [Test]
+        public void TestCancelAction()
+        {
+            AddStep("Click on cancel button", () =>
+            {
+                InputManager.MoveMouseTo(cancellableCommentEditor.ButtonsContainer);
+                InputManager.Click(MouseButton.Left);
+            });
+            AddAssert("Cancel action is fired", () => cancelActionFired);
         }
 
         private void onCommit(string value)

From 09b2e7beed1d317bfa0bce11f02b3dd7f86f35bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 13 Feb 2020 20:56:34 +0100
Subject: [PATCH 0440/1142] Encapsulate test editors

---
 .../UserInterface/TestSceneCommentEditor.cs   | 68 ++++++++-----------
 1 file changed, 28 insertions(+), 40 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
index aaf26f78a7..8005e9a2bc 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
@@ -28,16 +28,10 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private TestCommentEditor commentEditor;
         private TestCancellableCommentEditor cancellableCommentEditor;
-        private string commitText;
-        private bool cancelActionFired;
 
         [SetUp]
-        public void SetUp()
-        {
-            commitText = string.Empty;
-            cancelActionFired = false;
-
-            Schedule(() => Add(new FillFlowContainer
+        public void SetUp() => Schedule(() =>
+            Add(new FillFlowContainer
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
@@ -47,18 +41,10 @@ namespace osu.Game.Tests.Visual.UserInterface
                 Spacing = new Vector2(0, 20),
                 Children = new Drawable[]
                 {
-                    commentEditor = new TestCommentEditor
-                    {
-                        OnCommit = onCommit,
-                    },
-                    cancellableCommentEditor = new TestCancellableCommentEditor
-                    {
-                        OnCommit = onCommit,
-                        OnCancel = onCancel
-                    }
+                    commentEditor = new TestCommentEditor(),
+                    cancellableCommentEditor = new TestCancellableCommentEditor()
                 }
             }));
-        }
 
         [Test]
         public void TestCommitViaKeyboard()
@@ -70,7 +56,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             });
             AddStep("Write something", () => commentEditor.Current.Value = "text");
             AddStep("Click Enter", () => press(Key.Enter));
-            AddAssert("Text has been invoked", () => !string.IsNullOrEmpty(commitText));
+            AddAssert("Text has been invoked", () => !string.IsNullOrEmpty(commentEditor.CommittedText));
             AddAssert("Button is loading", () => commentEditor.IsLoading);
         }
 
@@ -83,7 +69,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 InputManager.Click(MouseButton.Left);
             });
             AddStep("Click Enter", () => press(Key.Enter));
-            AddAssert("Text not invoked", () => string.IsNullOrEmpty(commitText));
+            AddAssert("Text not invoked", () => string.IsNullOrEmpty(commentEditor.CommittedText));
             AddAssert("Button is not loading", () => !commentEditor.IsLoading);
         }
 
@@ -101,7 +87,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 InputManager.MoveMouseTo(commentEditor.ButtonsContainer);
                 InputManager.Click(MouseButton.Left);
             });
-            AddAssert("Text has been invoked", () => !string.IsNullOrEmpty(commitText));
+            AddAssert("Text has been invoked", () => !string.IsNullOrEmpty(commentEditor.CommittedText));
             AddAssert("Button is loading", () => commentEditor.IsLoading);
         }
 
@@ -113,22 +99,9 @@ namespace osu.Game.Tests.Visual.UserInterface
                 InputManager.MoveMouseTo(cancellableCommentEditor.ButtonsContainer);
                 InputManager.Click(MouseButton.Left);
             });
-            AddAssert("Cancel action is fired", () => cancelActionFired);
+            AddAssert("Cancel action is fired", () => cancellableCommentEditor.Cancelled);
         }
 
-        private void onCommit(string value)
-        {
-            commitText = value;
-
-            Scheduler.AddDelayed(() =>
-            {
-                commentEditor.IsLoading = false;
-                cancellableCommentEditor.IsLoading = false;
-            }, 1000);
-        }
-
-        private void onCancel() => cancelActionFired = true;
-
         private void press(Key key)
         {
             InputManager.PressKey(key);
@@ -138,24 +111,39 @@ namespace osu.Game.Tests.Visual.UserInterface
         private class TestCommentEditor : CommentEditor
         {
             public new Bindable<string> Current => base.Current;
-
             public new FillFlowContainer ButtonsContainer => base.ButtonsContainer;
 
+            public string CommittedText { get; private set; }
+
+            public TestCommentEditor()
+            {
+                OnCommit = onCommit;
+            }
+
+            private void onCommit(string value)
+            {
+                CommittedText = value;
+                Scheduler.AddDelayed(() => IsLoading = false, 1000);
+            }
+
             protected override string FooterText => @"Footer text. And it is pretty long. Cool.";
-
             protected override string CommitButtonText => @"Commit";
-
             protected override string TextboxPlaceholderText => @"This textbox is empty";
         }
 
         private class TestCancellableCommentEditor : CancellableCommentEditor
         {
             public new FillFlowContainer ButtonsContainer => base.ButtonsContainer;
-
             protected override string FooterText => @"Wow, another one. Sicc";
 
-            protected override string CommitButtonText => @"Save";
+            public bool Cancelled { get; private set; }
 
+            public TestCancellableCommentEditor()
+            {
+                OnCancel = () => Cancelled = true;
+            }
+
+            protected override string CommitButtonText => @"Save";
             protected override string TextboxPlaceholderText => @"Miltiline textboxes soon";
         }
     }

From 5646083ed9ae4214e9f436b6ff1a7f0d8e107576 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 13 Feb 2020 21:01:25 +0100
Subject: [PATCH 0441/1142] Adjust code style in test

---
 .../UserInterface/TestSceneCommentEditor.cs   | 43 +++++++++++--------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
index 8005e9a2bc..a5ef8b046d 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
@@ -49,57 +49,64 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void TestCommitViaKeyboard()
         {
-            AddStep("Click on textbox", () =>
+            AddStep("click on text box", () =>
             {
                 InputManager.MoveMouseTo(commentEditor);
                 InputManager.Click(MouseButton.Left);
             });
-            AddStep("Write something", () => commentEditor.Current.Value = "text");
-            AddStep("Click Enter", () => press(Key.Enter));
-            AddAssert("Text has been invoked", () => !string.IsNullOrEmpty(commentEditor.CommittedText));
-            AddAssert("Button is loading", () => commentEditor.IsLoading);
+            AddStep("enter text", () => commentEditor.Current.Value = "text");
+
+            AddStep("press Enter", () => press(Key.Enter));
+
+            AddAssert("text committed", () => commentEditor.CommittedText == "text");
+            AddAssert("button is loading", () => commentEditor.IsLoading);
         }
 
         [Test]
         public void TestCommitViaKeyboardWhenEmpty()
         {
-            AddStep("Click on textbox", () =>
+            AddStep("click on text box", () =>
             {
                 InputManager.MoveMouseTo(commentEditor);
                 InputManager.Click(MouseButton.Left);
             });
-            AddStep("Click Enter", () => press(Key.Enter));
-            AddAssert("Text not invoked", () => string.IsNullOrEmpty(commentEditor.CommittedText));
-            AddAssert("Button is not loading", () => !commentEditor.IsLoading);
+
+            AddStep("press Enter", () => press(Key.Enter));
+
+            AddAssert("no text committed", () => commentEditor.CommittedText == null);
+            AddAssert("button is not loading", () => !commentEditor.IsLoading);
         }
 
         [Test]
         public void TestCommitViaButton()
         {
-            AddStep("Click on textbox", () =>
+            AddStep("click on text box", () =>
             {
                 InputManager.MoveMouseTo(commentEditor);
                 InputManager.Click(MouseButton.Left);
             });
-            AddStep("Write something", () => commentEditor.Current.Value = "text");
-            AddStep("Click on button", () =>
+            AddStep("enter text", () => commentEditor.Current.Value = "some other text");
+
+            AddStep("click submit", () =>
             {
                 InputManager.MoveMouseTo(commentEditor.ButtonsContainer);
                 InputManager.Click(MouseButton.Left);
             });
-            AddAssert("Text has been invoked", () => !string.IsNullOrEmpty(commentEditor.CommittedText));
-            AddAssert("Button is loading", () => commentEditor.IsLoading);
+
+            AddAssert("text committed", () => commentEditor.CommittedText == "some other text");
+            AddAssert("button is loading", () => commentEditor.IsLoading);
         }
 
         [Test]
         public void TestCancelAction()
         {
-            AddStep("Click on cancel button", () =>
+            AddStep("click cancel button", () =>
             {
                 InputManager.MoveMouseTo(cancellableCommentEditor.ButtonsContainer);
                 InputManager.Click(MouseButton.Left);
             });
-            AddAssert("Cancel action is fired", () => cancellableCommentEditor.Cancelled);
+
+            AddAssert("cancel action fired", () => cancellableCommentEditor.Cancelled);
         }
 
         private void press(Key key)
@@ -128,7 +135,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             protected override string FooterText => @"Footer text. And it is pretty long. Cool.";
             protected override string CommitButtonText => @"Commit";
-            protected override string TextboxPlaceholderText => @"This textbox is empty";
+            protected override string TextboxPlaceholderText => @"This text box is empty";
         }
 
         private class TestCancellableCommentEditor : CancellableCommentEditor
@@ -144,7 +151,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             }
 
             protected override string CommitButtonText => @"Save";
-            protected override string TextboxPlaceholderText => @"Miltiline textboxes soon";
+            protected override string TextboxPlaceholderText => @"Multiline textboxes soon";
         }
     }
 }

From 0f25864faed05910713df23ecdf5d6310f295a9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 13 Feb 2020 21:04:53 +0100
Subject: [PATCH 0442/1142] Textbox -> TextBox rename pass

---
 .../Visual/UserInterface/TestSceneCommentEditor.cs |  4 ++--
 osu.Game/Overlays/Comments/CommentEditor.cs        | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
index a5ef8b046d..7b0b644dab 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneCommentEditor.cs
@@ -135,7 +135,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             protected override string FooterText => @"Footer text. And it is pretty long. Cool.";
             protected override string CommitButtonText => @"Commit";
-            protected override string TextboxPlaceholderText => @"This text box is empty";
+            protected override string TextBoxPlaceholder => @"This text box is empty";
         }
 
         private class TestCancellableCommentEditor : CancellableCommentEditor
@@ -151,7 +151,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             }
 
             protected override string CommitButtonText => @"Save";
-            protected override string TextboxPlaceholderText => @"Multiline textboxes soon";
+            protected override string TextBoxPlaceholder => @"Multiline textboxes soon";
         }
     }
 }
diff --git a/osu.Game/Overlays/Comments/CommentEditor.cs b/osu.Game/Overlays/Comments/CommentEditor.cs
index 765e5e228c..f7e53addbe 100644
--- a/osu.Game/Overlays/Comments/CommentEditor.cs
+++ b/osu.Game/Overlays/Comments/CommentEditor.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Comments
 
         protected abstract string CommitButtonText { get; }
 
-        protected abstract string TextboxPlaceholderText { get; }
+        protected abstract string TextBoxPlaceholder { get; }
 
         protected FillFlowContainer ButtonsContainer;
 
@@ -45,7 +45,7 @@ namespace osu.Game.Overlays.Comments
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
         {
-            EditorTextbox textbox;
+            EditorTextBox textBox;
 
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
@@ -68,11 +68,11 @@ namespace osu.Game.Overlays.Comments
                     Direction = FillDirection.Vertical,
                     Children = new Drawable[]
                     {
-                        textbox = new EditorTextbox
+                        textBox = new EditorTextBox
                         {
                             Height = 40,
                             RelativeSizeAxes = Axes.X,
-                            PlaceholderText = TextboxPlaceholderText,
+                            PlaceholderText = TextBoxPlaceholder,
                             Current = Current
                         },
                         new Container
@@ -115,7 +115,7 @@ namespace osu.Game.Overlays.Comments
                 }
             });
 
-            textbox.OnCommit += (u, v) =>
+            textBox.OnCommit += (u, v) =>
             {
                 if (commitButton.IsBlocked.Value)
                     return;
@@ -131,7 +131,7 @@ namespace osu.Game.Overlays.Comments
             Current.BindValueChanged(text => commitButton.IsBlocked.Value = string.IsNullOrEmpty(text.NewValue), true);
         }
 
-        private class EditorTextbox : BasicTextBox
+        private class EditorTextBox : BasicTextBox
         {
             protected override float LeftRightPadding => side_padding;
 
@@ -139,7 +139,7 @@ namespace osu.Game.Overlays.Comments
 
             private OsuSpriteText placeholder;
 
-            public EditorTextbox()
+            public EditorTextBox()
             {
                 Masking = false;
                 TextContainer.Height = 0.4f;

From ab84f4085a83d8f8d597ddaa3e3aca8955d8c76a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 13 Feb 2020 23:20:45 +0300
Subject: [PATCH 0443/1142] Fix possible error on SpotlightsLayout disposal

---
 osu.Game/Overlays/Rankings/SpotlightsLayout.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Rankings/SpotlightsLayout.cs b/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
index 33811cc982..cb409a2135 100644
--- a/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
@@ -151,11 +151,11 @@ namespace osu.Game.Overlays.Rankings
 
         protected override void Dispose(bool isDisposing)
         {
-            base.Dispose(isDisposing);
-
             spotlightsRequest?.Cancel();
             getRankingsRequest?.Cancel();
             cancellationToken?.Cancel();
+
+            base.Dispose(isDisposing);
         }
     }
 }

From 049b0d93d13530c090612a20a27124ee79fcaf38 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Thu, 13 Feb 2020 21:40:08 +0100
Subject: [PATCH 0444/1142] Add back default content fade transitions

---
 .../Visual/Online/TestSceneOnlineViewContainer.cs           | 4 ----
 osu.Game/Online/OnlineViewContainer.cs                      | 6 +++---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
index 9dac28d347..39b9fd71d0 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
@@ -54,10 +54,6 @@ namespace osu.Game.Tests.Visual.Online
                     }
                 };
             }
-
-            protected override void PopContentOut(Drawable content) => content.Hide();
-
-            protected override void PopContentIn(Drawable content) => content.Show();
         }
 
         [Test]
diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
index 4b59f6ae80..2a9aa60e2d 100644
--- a/osu.Game/Online/OnlineViewContainer.cs
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Online
 
         protected const double TRANSFORM_TIME = 300.0;
 
-        private Container viewContent;
+        private readonly Container viewContent;
         protected override Container<Drawable> Content => viewContent;
 
         [Resolved]
@@ -69,9 +69,9 @@ namespace osu.Game.Online
             }
         }
 
-        protected abstract void PopContentOut(Drawable content);
+        protected virtual void PopContentOut(Drawable content) => content.FadeOut(TRANSFORM_TIME / 2, Easing.OutQuint);
 
-        protected abstract void PopContentIn(Drawable content);
+        protected virtual void PopContentIn(Drawable content) => content.FadeIn(TRANSFORM_TIME, Easing.OutQuint);
 
         protected override void LoadComplete()
         {

From c68c347503df8514ca0337ec01f9716d643b7da7 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 14 Feb 2020 00:40:52 +0300
Subject: [PATCH 0445/1142] Remove unwanted property interpolation

---
 osu.Game/Overlays/Rankings/Tables/CountriesTable.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs b/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs
index ed8e956e5e..997438ac07 100644
--- a/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs
+++ b/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Overlays.Rankings.Tables
             public CountryName(Country country)
             {
                 Font = OsuFont.GetFont(size: 12, italics: true);
-                Text = $@"{country.FullName}";
+                Text = country.FullName ?? string.Empty;
             }
 
             [BackgroundDependencyLoader]

From c871f07d2ef9f55d1c91f9ac6138fd2d162e7ed3 Mon Sep 17 00:00:00 2001
From: voidedWarranties <wz68.scratch@gmail.com>
Date: Thu, 13 Feb 2020 17:14:46 -0800
Subject: [PATCH 0446/1142] Use CarouselBeatmap action to select beatmap

---
 osu.Game/OsuGame.cs                           | 55 ++++++++-----------
 osu.Game/Screens/Select/BeatmapCarousel.cs    |  2 +
 .../Select/Carousel/CarouselBeatmap.cs        |  5 ++
 .../Carousel/DrawableCarouselBeatmapSet.cs    | 23 +-------
 4 files changed, 34 insertions(+), 51 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 3d6b93c87d..79616ef97c 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -311,38 +311,15 @@ namespace osu.Game
         public void ShowBeatmap(int beatmapId) => waitForReady(() => beatmapSetOverlay, _ => beatmapSetOverlay.FetchAndShowBeatmap(beatmapId));
 
         /// <summary>
-        /// Present a specific beatmap difficulty at song select immediately.
+        /// Present a beatmap at song select immediately.
         /// The user should have already requested this interactively.
         /// </summary>
         /// <param name="beatmap">The beatmap to select.</param>
-        public void PresentBeatmap(BeatmapInfo beatmap)
+        public void PresentBeatmap(BeatmapSetInfo beatmap)
         {
-            PerformFromScreen(screen =>
-            {
-                // we might already be at song select, so a check is required before performing the load to solo.
-                if (screen is MainMenu)
-                    menuScreen.LoadToSolo();
-
-                // we might even already be at the song
-                if (Beatmap.Value.BeatmapInfo.Hash == beatmap.Hash)
-                    return;
-
-                Ruleset.Value = beatmap.Ruleset;
-                Beatmap.Value = BeatmapManager.GetWorkingBeatmap(beatmap);
-            }, validScreens: new[] { typeof(PlaySongSelect) });
-        }
-
-        /// <summary>
-        /// <see cref="PresentBeatmap(BeatmapInfo)"/>
-        /// Instead of selecting a specific difficulty, this will select the first difficulty of the current ruleset in a beatmapset,
-        /// or the first difficulty of the set if there is none.
-        /// </summary>
-        /// <param name="beatmapSet">The beatmapset to select.</param>
-        public void PresentBeatmap(BeatmapSetInfo beatmapSet)
-        {
-            var databasedSet = beatmapSet.OnlineBeatmapSetID != null
-                ? BeatmapManager.QueryBeatmapSet(s => s.OnlineBeatmapSetID == beatmapSet.OnlineBeatmapSetID)
-                : BeatmapManager.QueryBeatmapSet(s => s.Hash == beatmapSet.Hash);
+            var databasedSet = beatmap.OnlineBeatmapSetID != null
+                ? BeatmapManager.QueryBeatmapSet(s => s.OnlineBeatmapSetID == beatmap.OnlineBeatmapSetID)
+                : BeatmapManager.QueryBeatmapSet(s => s.Hash == beatmap.Hash);
 
             if (databasedSet == null)
             {
@@ -350,8 +327,24 @@ namespace osu.Game
                 return;
             }
 
-            var first = databasedSet.Beatmaps.Find(b => b.Ruleset.Equals(Ruleset.Value)) ?? databasedSet.Beatmaps.First();
-            PresentBeatmap(first);
+            PerformFromScreen(screen =>
+            {
+                // we might already be at song select, so a check is required before performing the load to solo.
+                if (screen is MainMenu)
+                    menuScreen.LoadToSolo();
+
+                // we might even already be at the song
+                if (Beatmap.Value.BeatmapSetInfo.Hash == databasedSet.Hash)
+                {
+                    return;
+                }
+
+                // Use first beatmap available for current ruleset, else switch ruleset.
+                var first = databasedSet.Beatmaps.Find(b => b.Ruleset.Equals(Ruleset.Value)) ?? databasedSet.Beatmaps.First();
+
+                Ruleset.Value = first.Ruleset;
+                Beatmap.Value = BeatmapManager.GetWorkingBeatmap(first);
+            }, validScreens: new[] { typeof(PlaySongSelect) });
         }
 
         /// <summary>
@@ -453,7 +446,7 @@ namespace osu.Game
         /// </summary>
         /// <param name="action">The action to perform once we are in the correct state.</param>
         /// <param name="validScreens">An optional collection of valid screen types. If any of these screens are already current we can perform the action immediately, else the first valid parent will be made current before performing the action. <see cref="MainMenu"/> is used if not specified.</param>
-        protected void PerformFromScreen(Action<IScreen> action, IEnumerable<Type> validScreens = null)
+        public void PerformFromScreen(Action<IScreen> action, IEnumerable<Type> validScreens = null)
         {
             performFromMainMenuTask?.Cancel();
 
diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 592e26adc2..f6e0e6bf70 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -592,6 +592,8 @@ namespace osu.Game.Screens.Select
                         scrollPositionCache.Invalidate();
                     }
                 };
+
+                c.Select = () => SelectBeatmap(c.Beatmap);
             }
 
             return set;
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index 2ffb73f226..116053b4f2 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -13,6 +13,11 @@ namespace osu.Game.Screens.Select.Carousel
     {
         public readonly BeatmapInfo Beatmap;
 
+        /// <summary>
+        /// Select this beatmap on the carousel.
+        /// </summary>
+        public Action Select;
+
         public CarouselBeatmap(BeatmapInfo beatmap)
         {
             Beatmap = beatmap;
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 9e4f31b15b..5ef0e8a018 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -211,9 +211,7 @@ namespace osu.Game.Screens.Select.Carousel
         {
             private readonly BindableBool filtered = new BindableBool();
 
-            private OsuGame game;
-            private SongSelect songSelect;
-            private readonly BeatmapInfo info;
+            private readonly Action select;
 
             public FilterableDifficultyIcon(CarouselBeatmap item)
                 : base(item.Beatmap)
@@ -222,30 +220,15 @@ namespace osu.Game.Screens.Select.Carousel
                 filtered.ValueChanged += isFiltered => Schedule(() => this.FadeTo(isFiltered.NewValue ? 0.1f : 1, 100));
                 filtered.TriggerChange();
 
-                info = item.Beatmap;
+                select = item.Select;
             }
 
             protected override bool OnClick(ClickEvent e)
             {
-                if (!filtered.Value)
-                {
-                    game.PresentBeatmap(info);
-
-                    if (e.AltPressed)
-                        songSelect?.FinaliseSelection();
-                }
+                select?.Invoke();
 
                 return base.OnClick(e);
             }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuGame game, SongSelect songSelect)
-            {
-                this.game = game;
-
-                if (songSelect != null)
-                    this.songSelect = songSelect;
-            }
         }
 
         public class FilterableGroupedDifficultyIcon : GroupedDifficultyIcon

From 368e6f9579492d6321c89850cf4fe114a0337c83 Mon Sep 17 00:00:00 2001
From: voidedWarranties <wz68.scratch@gmail.com>
Date: Thu, 13 Feb 2020 17:47:16 -0800
Subject: [PATCH 0447/1142] Use CarouselBeatmap.State to select

---
 osu.Game/OsuGame.cs                                       | 2 +-
 osu.Game/Screens/Select/BeatmapCarousel.cs                | 2 --
 osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs       | 5 -----
 .../Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs | 8 ++++----
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 79616ef97c..ff3dee55af 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -446,7 +446,7 @@ namespace osu.Game
         /// </summary>
         /// <param name="action">The action to perform once we are in the correct state.</param>
         /// <param name="validScreens">An optional collection of valid screen types. If any of these screens are already current we can perform the action immediately, else the first valid parent will be made current before performing the action. <see cref="MainMenu"/> is used if not specified.</param>
-        public void PerformFromScreen(Action<IScreen> action, IEnumerable<Type> validScreens = null)
+        protected void PerformFromScreen(Action<IScreen> action, IEnumerable<Type> validScreens = null)
         {
             performFromMainMenuTask?.Cancel();
 
diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index f6e0e6bf70..592e26adc2 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -592,8 +592,6 @@ namespace osu.Game.Screens.Select
                         scrollPositionCache.Invalidate();
                     }
                 };
-
-                c.Select = () => SelectBeatmap(c.Beatmap);
             }
 
             return set;
diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index 116053b4f2..2ffb73f226 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -13,11 +13,6 @@ namespace osu.Game.Screens.Select.Carousel
     {
         public readonly BeatmapInfo Beatmap;
 
-        /// <summary>
-        /// Select this beatmap on the carousel.
-        /// </summary>
-        public Action Select;
-
         public CarouselBeatmap(BeatmapInfo beatmap)
         {
             Beatmap = beatmap;
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 5ef0e8a018..572580f7c1 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -211,7 +211,7 @@ namespace osu.Game.Screens.Select.Carousel
         {
             private readonly BindableBool filtered = new BindableBool();
 
-            private readonly Action select;
+            private readonly CarouselBeatmap item;
 
             public FilterableDifficultyIcon(CarouselBeatmap item)
                 : base(item.Beatmap)
@@ -220,14 +220,14 @@ namespace osu.Game.Screens.Select.Carousel
                 filtered.ValueChanged += isFiltered => Schedule(() => this.FadeTo(isFiltered.NewValue ? 0.1f : 1, 100));
                 filtered.TriggerChange();
 
-                select = item.Select;
+                this.item = item;
             }
 
             protected override bool OnClick(ClickEvent e)
             {
-                select?.Invoke();
+                item.State.Value = CarouselItemState.Selected;
 
-                return base.OnClick(e);
+                return true;
             }
         }
 

From 50899ddccba2e8dfc89d0282ee5a547728c53f3e Mon Sep 17 00:00:00 2001
From: Berkan Diler <b.diler@gmx.de>
Date: Fri, 14 Feb 2020 03:19:25 +0100
Subject: [PATCH 0448/1142] Use Span for OsuColour.FromHex

---
 osu.Game/Graphics/OsuColour.cs | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index c8298543a1..59dd823266 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Globalization;
 using osu.Game.Beatmaps;
 using osuTK.Graphics;
 
@@ -14,41 +15,40 @@ namespace osu.Game.Graphics
 
         public static Color4 FromHex(string hex)
         {
-            if (hex[0] == '#')
-                hex = hex.Substring(1);
+            var hexSpan = hex[0] == '#' ? hex.AsSpan().Slice(1) : hex.AsSpan();
 
-            switch (hex.Length)
+            switch (hexSpan.Length)
             {
                 default:
                     throw new ArgumentException(@"Invalid hex string length!");
 
                 case 3:
                     return new Color4(
-                        (byte)(Convert.ToByte(hex.Substring(0, 1), 16) * 17),
-                        (byte)(Convert.ToByte(hex.Substring(1, 1), 16) * 17),
-                        (byte)(Convert.ToByte(hex.Substring(2, 1), 16) * 17),
+                        (byte)(byte.Parse(hexSpan.Slice(0, 1), NumberStyles.HexNumber) * 17),
+                        (byte)(byte.Parse(hexSpan.Slice(1, 1), NumberStyles.HexNumber) * 17),
+                        (byte)(byte.Parse(hexSpan.Slice(2, 1), NumberStyles.HexNumber) * 17),
                         255);
 
                 case 6:
                     return new Color4(
-                        Convert.ToByte(hex.Substring(0, 2), 16),
-                        Convert.ToByte(hex.Substring(2, 2), 16),
-                        Convert.ToByte(hex.Substring(4, 2), 16),
+                        byte.Parse(hexSpan.Slice(0, 2), NumberStyles.HexNumber),
+                        byte.Parse(hexSpan.Slice(2, 2), NumberStyles.HexNumber),
+                        byte.Parse(hexSpan.Slice(4, 2), NumberStyles.HexNumber),
                         255);
 
                 case 4:
                     return new Color4(
-                        (byte)(Convert.ToByte(hex.Substring(0, 1), 16) * 17),
-                        (byte)(Convert.ToByte(hex.Substring(1, 1), 16) * 17),
-                        (byte)(Convert.ToByte(hex.Substring(2, 1), 16) * 17),
-                        (byte)(Convert.ToByte(hex.Substring(3, 1), 16) * 17));
+                        (byte)(byte.Parse(hexSpan.Slice(0, 1), NumberStyles.HexNumber) * 17),
+                        (byte)(byte.Parse(hexSpan.Slice(1, 1), NumberStyles.HexNumber) * 17),
+                        (byte)(byte.Parse(hexSpan.Slice(0, 1), NumberStyles.HexNumber) * 17),
+                        (byte)(byte.Parse(hexSpan.Slice(0, 1), NumberStyles.HexNumber) * 17));
 
                 case 8:
                     return new Color4(
-                        Convert.ToByte(hex.Substring(0, 2), 16),
-                        Convert.ToByte(hex.Substring(2, 2), 16),
-                        Convert.ToByte(hex.Substring(4, 2), 16),
-                        Convert.ToByte(hex.Substring(6, 2), 16));
+                        byte.Parse(hexSpan.Slice(0, 2), NumberStyles.HexNumber),
+                        byte.Parse(hexSpan.Slice(2, 2), NumberStyles.HexNumber),
+                        byte.Parse(hexSpan.Slice(4, 2), NumberStyles.HexNumber),
+                        byte.Parse(hexSpan.Slice(6, 2), NumberStyles.HexNumber));
             }
         }
 

From 884a5fbad44f1eb58731de2176d7cf67428dd521 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Feb 2020 12:30:11 +0900
Subject: [PATCH 0449/1142] Fix osu! gameplay cursor not adjusting to
 mod/convert circle size changes

---
 .../TestSceneGameplayCursor.cs                | 46 +++++++++++++++++--
 .../UI/Cursor/OsuCursorContainer.cs           | 44 +++++++++++++-----
 osu.Game/Screens/Play/GameplayBeatmap.cs      | 42 +++++++++++++++++
 osu.Game/Screens/Play/Player.cs               | 11 +++++
 4 files changed, 128 insertions(+), 15 deletions(-)
 create mode 100644 osu.Game/Screens/Play/GameplayBeatmap.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
index aa170eae1e..90f1cdb2ea 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
@@ -7,7 +7,9 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Testing.Input;
+using osu.Game.Configuration;
 using osu.Game.Rulesets.Osu.UI.Cursor;
+using osu.Game.Screens.Play;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
@@ -21,12 +23,50 @@ namespace osu.Game.Rulesets.Osu.Tests
             typeof(CursorTrail)
         };
 
-        [BackgroundDependencyLoader]
-        private void load()
+        [Cached]
+        private GameplayBeatmap gameplayBeatmap;
+
+        private ClickingCursorContainer lastContainer;
+
+        [Resolved]
+        private OsuConfigManager config { get; set; }
+
+        public TestSceneGameplayCursor()
+        {
+            gameplayBeatmap = new GameplayBeatmap(CreateBeatmap(new OsuRuleset().RulesetInfo));
+        }
+
+        [TestCase(1, 1)]
+        [TestCase(5, 1)]
+        [TestCase(10, 1)]
+        [TestCase(1, 1.5f)]
+        [TestCase(5, 1.5f)]
+        [TestCase(10, 1.5f)]
+        public void TestSizing(int circleSize, float userScale)
+        {
+            AddStep($"set user scale to {userScale}", () => config.Set(OsuSetting.GameplayCursorSize, userScale));
+            AddStep($"adjust cs to {circleSize}", () => gameplayBeatmap.BeatmapInfo.BaseDifficulty.CircleSize = circleSize);
+            AddStep("turn on autosizing", () => config.Set(OsuSetting.AutoCursorSize, true));
+
+            AddStep("load content", loadContent);
+
+            AddUntilStep("cursor size correct", () => lastContainer.ActiveCursor.Scale.X == OsuCursorContainer.GetScaleForCircleSize(circleSize) * userScale);
+
+            AddStep("set user scale to 1", () => config.Set(OsuSetting.GameplayCursorSize, 1f));
+            AddUntilStep("cursor size correct", () => lastContainer.ActiveCursor.Scale.X == OsuCursorContainer.GetScaleForCircleSize(circleSize));
+
+            AddStep("turn off autosizing", () => config.Set(OsuSetting.AutoCursorSize, false));
+            AddUntilStep("cursor size correct", () => lastContainer.ActiveCursor.Scale.X == 1);
+
+            AddStep($"set user scale to {userScale}", () => config.Set(OsuSetting.GameplayCursorSize, userScale));
+            AddUntilStep("cursor size correct", () => lastContainer.ActiveCursor.Scale.X == userScale);
+        }
+
+        private void loadContent()
         {
             SetContents(() => new MovingCursorInputManager
             {
-                Child = new ClickingCursorContainer
+                Child = lastContainer = new ClickingCursorContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Masking = true,
diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
index 79b5d1b7f8..7ebc26ebfb 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
@@ -12,6 +12,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Osu.Configuration;
 using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Play;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -32,7 +33,6 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
         public Bindable<float> CursorScale;
         private Bindable<float> userCursorScale;
         private Bindable<bool> autoCursorScale;
-        private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
 
         public OsuCursorContainer()
         {
@@ -43,13 +43,21 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             };
         }
 
+        [Resolved(canBeNull: true)]
+        private GameplayBeatmap beatmap { get; set; }
+
+        [Resolved]
+        private OsuConfigManager config { get; set; }
+
         [BackgroundDependencyLoader(true)]
-        private void load(OsuConfigManager config, OsuRulesetConfigManager rulesetConfig, IBindable<WorkingBeatmap> beatmap)
+        private void load(OsuConfigManager config, OsuRulesetConfigManager rulesetConfig)
         {
             rulesetConfig?.BindWith(OsuRulesetSetting.ShowCursorTrail, showTrail);
+        }
 
-            this.beatmap.BindTo(beatmap);
-            this.beatmap.ValueChanged += _ => calculateScale();
+        protected override void LoadComplete()
+        {
+            showTrail.BindValueChanged(v => cursorTrail.FadeTo(v.NewValue ? 1 : 0, 200), true);
 
             userCursorScale = config.GetBindable<float>(OsuSetting.GameplayCursorSize);
             userCursorScale.ValueChanged += _ => calculateScale();
@@ -58,29 +66,41 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             autoCursorScale.ValueChanged += _ => calculateScale();
 
             CursorScale = new BindableFloat();
-            CursorScale.ValueChanged += e => ActiveCursor.Scale = cursorTrail.Scale = new Vector2(e.NewValue);
+            CursorScale.ValueChanged += e =>
+            {
+                var newScale = new Vector2(e.NewValue);
+
+                ActiveCursor.Scale = newScale;
+                cursorTrail.Scale = newScale;
+            };
 
             calculateScale();
+
+            base.LoadComplete();
         }
 
+        /// <summary>
+        /// Get the scale applicable to the ActiveCursor based on a beatmap's circle size.
+        /// </summary>
+        public static float GetScaleForCircleSize(float circleSize) =>
+            1f - 0.7f * (1f + circleSize - BeatmapDifficulty.DEFAULT_DIFFICULTY) / BeatmapDifficulty.DEFAULT_DIFFICULTY;
+
         private void calculateScale()
         {
             float scale = userCursorScale.Value;
 
-            if (autoCursorScale.Value && beatmap.Value != null)
+            if (autoCursorScale.Value && beatmap != null)
             {
                 // if we have a beatmap available, let's get its circle size to figure out an automatic cursor scale modifier.
-                scale *= 1f - 0.7f * (1f + beatmap.Value.BeatmapInfo.BaseDifficulty.CircleSize - BeatmapDifficulty.DEFAULT_DIFFICULTY) / BeatmapDifficulty.DEFAULT_DIFFICULTY;
+                scale *= GetScaleForCircleSize(beatmap.BeatmapInfo.BaseDifficulty.CircleSize);
             }
 
             CursorScale.Value = scale;
-        }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
+            var newScale = new Vector2(scale);
 
-            showTrail.BindValueChanged(v => cursorTrail.FadeTo(v.NewValue ? 1 : 0, 200), true);
+            ActiveCursor.ScaleTo(newScale, 400, Easing.OutQuint);
+            cursorTrail.Scale = newScale;
         }
 
         private int downCount;
diff --git a/osu.Game/Screens/Play/GameplayBeatmap.cs b/osu.Game/Screens/Play/GameplayBeatmap.cs
new file mode 100644
index 0000000000..d7f939a883
--- /dev/null
+++ b/osu.Game/Screens/Play/GameplayBeatmap.cs
@@ -0,0 +1,42 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Beatmaps.Timing;
+using osu.Game.Rulesets.Objects;
+
+namespace osu.Game.Screens.Play
+{
+    public class GameplayBeatmap : Component, IBeatmap
+    {
+        public readonly IBeatmap PlayableBeatmap;
+
+        public GameplayBeatmap(IBeatmap playableBeatmap)
+        {
+            PlayableBeatmap = playableBeatmap;
+        }
+
+        public BeatmapInfo BeatmapInfo
+        {
+            get => PlayableBeatmap.BeatmapInfo;
+            set => PlayableBeatmap.BeatmapInfo = value;
+        }
+
+        public BeatmapMetadata Metadata => PlayableBeatmap.Metadata;
+
+        public ControlPointInfo ControlPointInfo => PlayableBeatmap.ControlPointInfo;
+
+        public List<BreakPeriod> Breaks => PlayableBeatmap.Breaks;
+
+        public double TotalBreakTime => PlayableBeatmap.TotalBreakTime;
+
+        public IReadOnlyList<HitObject> HitObjects => PlayableBeatmap.HitObjects;
+
+        public IEnumerable<BeatmapStatistic> GetStatistics() => PlayableBeatmap.GetStatistics();
+
+        public IBeatmap Clone() => PlayableBeatmap.Clone();
+    }
+}
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index aecd35f7dc..9bfdcd79fe 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -110,6 +110,13 @@ namespace osu.Game.Screens.Play
             this.showResults = showResults;
         }
 
+        private GameplayBeatmap gameplayBeatmap;
+
+        private DependencyContainer dependencies;
+
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+            => dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, IAPIProvider api, OsuConfigManager config)
         {
@@ -143,6 +150,10 @@ namespace osu.Game.Screens.Play
 
             InternalChild = GameplayClockContainer = new GameplayClockContainer(Beatmap.Value, Mods.Value, DrawableRuleset.GameplayStartTime);
 
+            AddInternal(gameplayBeatmap = new GameplayBeatmap(playableBeatmap));
+
+            dependencies.CacheAs(gameplayBeatmap);
+
             addUnderlayComponents(GameplayClockContainer);
             addGameplayComponents(GameplayClockContainer, Beatmap.Value);
             addOverlayComponents(GameplayClockContainer, Beatmap.Value);

From 0e439e3a7025a2cfded813fda28f90c8d9a79a88 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Feb 2020 14:41:55 +0900
Subject: [PATCH 0450/1142] Fix missing dependency in ZoomableScrollContainer
 test

---
 .../Compose/Components/Timeline/ZoomableScrollContainer.cs    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
index baaad63e57..227eecf9c7 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private float currentZoom = 1;
 
-        [Resolved]
+        [Resolved(canBeNull: true)]
         private IFrameBasedClock editorClock { get; set; }
 
         public ZoomableScrollContainer()
@@ -112,7 +112,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             {
                 // can't handle scroll correctly while playing.
                 // the editor will handle this case for us.
-                if (editorClock.IsRunning)
+                if (editorClock?.IsRunning == true)
                     return false;
 
                 // for now, we don't support zoom when using a precision scroll device. this needs gesture support.

From 3a0b2508d42b1d09da1aa30bbc356d88b5b4f76d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 15:01:30 +0900
Subject: [PATCH 0451/1142] Fix possible nullrefs

---
 osu.Game/Overlays/Direct/PanelDownloadButton.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Direct/PanelDownloadButton.cs b/osu.Game/Overlays/Direct/PanelDownloadButton.cs
index ed44f1e960..1b3657f010 100644
--- a/osu.Game/Overlays/Direct/PanelDownloadButton.cs
+++ b/osu.Game/Overlays/Direct/PanelDownloadButton.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Overlays.Direct
         [BackgroundDependencyLoader(true)]
         private void load(OsuGame game, BeatmapManager beatmaps)
         {
-            if (BeatmapSet.Value.OnlineInfo.Availability?.DownloadDisabled ?? false)
+            if (BeatmapSet.Value?.OnlineInfo?.Availability?.DownloadDisabled ?? false)
             {
                 button.Enabled.Value = false;
                 button.TooltipText = "this beatmap is currently not available for download.";
@@ -62,7 +62,7 @@ namespace osu.Game.Overlays.Direct
                         break;
 
                     case DownloadState.LocallyAvailable:
-                        game.PresentBeatmap(BeatmapSet.Value);
+                        game?.PresentBeatmap(BeatmapSet.Value);
                         break;
 
                     default:

From eb14dbcd77ffc141ff717f4307df40028027d451 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 15:01:45 +0900
Subject: [PATCH 0452/1142] Initial implementation of rearrangeable playlist

---
 .../TestSceneDrawableRoomPlaylist.cs          |  86 +++++
 .../Screens/Multi/DrawableRoomPlaylist.cs     |  81 ++++
 .../Screens/Multi/DrawableRoomPlaylistItem.cs | 347 ++++++++++++++++++
 3 files changed, 514 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
 create mode 100644 osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
 create mode 100644 osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
new file mode 100644
index 0000000000..b906ce82e9
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -0,0 +1,86 @@
+// 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.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Screens.Multi;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneDrawableRoomPlaylist : OsuTestScene
+    {
+        [Resolved]
+        private BeatmapManager beatmapManager { get; set; }
+
+        [Resolved]
+        private RulesetStore rulesetStore { get; set; }
+
+        private DrawableRoomPlaylist playlist;
+
+        [Test]
+        public void TestItemsCanNotBeRemovedOrSelectedFromNonEditableAndNonSelectablePlaylist()
+        {
+            createPlaylist(false, false);
+        }
+
+        [Test]
+        public void TestItemsCanBeRemovedFromEditablePlaylist()
+        {
+            createPlaylist(true, false);
+        }
+
+        [Test]
+        public void TestItemsCanBeSelectedInSelectablePlaylist()
+        {
+            createPlaylist(false, true);
+        }
+
+        [Test]
+        public void TestItemsCanBeSelectedAndRemovedFromEditableAndSelectablePlaylist()
+        {
+            createPlaylist(true, true);
+        }
+
+        private void createPlaylist(bool allowEdit, bool allowSelection) => AddStep("create playlist", () =>
+        {
+            Child = playlist = new DrawableRoomPlaylist(allowEdit, allowSelection)
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(500, 300)
+            };
+
+            var beatmapSets = beatmapManager.GetAllUsableBeatmapSets();
+            var rulesets = rulesetStore.AvailableRulesets.ToList();
+
+            for (int i = 0; i < 20; i++)
+            {
+                var set = beatmapSets[RNG.Next(0, beatmapSets.Count)];
+                var beatmap = set.Beatmaps[RNG.Next(0, set.Beatmaps.Count)];
+
+                beatmap.BeatmapSet = set;
+                beatmap.Metadata = set.Metadata;
+
+                playlist.Items.Add(new PlaylistItem
+                {
+                    Beatmap = { Value = beatmap },
+                    Ruleset = { Value = rulesets[RNG.Next(0, rulesets.Count)] },
+                    RequiredMods =
+                    {
+                        new OsuModHardRock(),
+                        new OsuModDoubleTime(),
+                        new OsuModAutoplay()
+                    }
+                });
+            }
+        });
+    }
+}
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
new file mode 100644
index 0000000000..b42a8575ec
--- /dev/null
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
@@ -0,0 +1,81 @@
+// 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.Bindables;
+using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.Containers;
+using osu.Game.Online.Multiplayer;
+using osuTK;
+
+namespace osu.Game.Screens.Multi
+{
+    public class DrawableRoomPlaylist : RearrangeableListContainer<PlaylistItem>
+    {
+        public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
+
+        private readonly bool allowEdit;
+        private readonly bool allowSelection;
+
+        public DrawableRoomPlaylist(bool allowEdit, bool allowSelection)
+        {
+            this.allowEdit = allowEdit;
+            this.allowSelection = allowSelection;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            SelectedItem.BindValueChanged(item =>
+            {
+                if (item.OldValue != null && ItemMap.TryGetValue(item.OldValue, out var oldItem))
+                    ((DrawableRoomPlaylistItem)oldItem).Deselect();
+
+                if (item.NewValue != null && ItemMap.TryGetValue(item.NewValue, out var newItem))
+                    ((DrawableRoomPlaylistItem)newItem).Select();
+            }, true);
+
+            Items.ItemsRemoved += items =>
+            {
+                if (items.Any(i => i == SelectedItem.Value))
+                    SelectedItem.Value = null;
+            };
+        }
+
+        protected override ScrollContainer<Drawable> CreateScrollContainer() => new OsuScrollContainer
+        {
+            ScrollbarVisible = false
+        };
+
+        protected override FillFlowContainer<RearrangeableListItem<PlaylistItem>> CreateListFillFlowContainer() => new FillFlowContainer<RearrangeableListItem<PlaylistItem>>
+        {
+            LayoutDuration = 200,
+            LayoutEasing = Easing.OutQuint,
+            Spacing = new Vector2(0, 2)
+        };
+
+        protected override RearrangeableListItem<PlaylistItem> CreateDrawable(PlaylistItem item) => new DrawableRoomPlaylistItem(item, allowEdit, allowSelection)
+        {
+            RequestSelection = requestSelection,
+            RequestDeletion = requestDeletion
+        };
+
+        private void requestSelection(PlaylistItem item) => SelectedItem.Value = item;
+
+        private void requestDeletion(PlaylistItem item)
+        {
+            if (SelectedItem.Value == item)
+            {
+                if (Items.Count == 1)
+                    SelectedItem.Value = null;
+                else
+                    SelectedItem.Value = Items.GetNext(item) ?? Items[^2];
+            }
+
+            Items.Remove(item);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
new file mode 100644
index 0000000000..d2788a5c4b
--- /dev/null
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
@@ -0,0 +1,347 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Events;
+using osu.Framework.Threading;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Drawables;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.Chat;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Overlays.Direct;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Play.HUD;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Multi
+{
+    public class DrawableRoomPlaylistItem : RearrangeableListItem<PlaylistItem>
+    {
+        public Action<PlaylistItem> RequestSelection;
+        public Action<PlaylistItem> RequestDeletion;
+
+        private Container maskingContainer;
+        private Container difficultyIconContainer;
+        private LinkFlowContainer beatmapText;
+        private LinkFlowContainer authorText;
+        private ItemHandle handle;
+        private ModDisplay modDisplay;
+
+        private readonly Bindable<BeatmapInfo> beatmap = new Bindable<BeatmapInfo>();
+        private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
+        private readonly BindableList<Mod> requiredMods = new BindableList<Mod>();
+
+        private readonly PlaylistItem item;
+        private readonly bool allowEdit;
+        private readonly bool allowSelection;
+
+        public DrawableRoomPlaylistItem(PlaylistItem item, bool allowEdit, bool allowSelection)
+            : base(item)
+        {
+            this.item = item;
+            this.allowEdit = allowEdit;
+            this.allowSelection = allowSelection;
+
+            RelativeSizeAxes = Axes.X;
+            Height = 50;
+
+            beatmap.BindTo(item.Beatmap);
+            ruleset.BindTo(item.Ruleset);
+            requiredMods.BindTo(item.RequiredMods);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            InternalChild = new GridContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Content = new[]
+                {
+                    new Drawable[]
+                    {
+                        new Container
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            AutoSizeAxes = Axes.Both,
+                            Alpha = allowEdit ? 1 : 0,
+                            Child = handle = new ItemHandle
+                            {
+                                Size = new Vector2(12),
+                                AlwaysPresent = true,
+                                Alpha = 0,
+                            },
+                        },
+                        maskingContainer = new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Masking = true,
+                            CornerRadius = 10,
+                            BorderColour = colours.Yellow,
+                            Children = new Drawable[]
+                            {
+                                new Box // A transparent box that forces the border to be drawn if the panel background is opaque
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Alpha = 0,
+                                    AlwaysPresent = true
+                                },
+                                new PanelBackground
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Beatmap = { BindTarget = beatmap }
+                                },
+                                new FillFlowContainer
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Padding = new MarginPadding { Left = 8 },
+                                    Spacing = new Vector2(8, 0),
+                                    Direction = FillDirection.Horizontal,
+                                    Children = new Drawable[]
+                                    {
+                                        difficultyIconContainer = new Container
+                                        {
+                                            Anchor = Anchor.CentreLeft,
+                                            Origin = Anchor.CentreLeft,
+                                            AutoSizeAxes = Axes.Both,
+                                        },
+                                        new FillFlowContainer
+                                        {
+                                            Anchor = Anchor.CentreLeft,
+                                            Origin = Anchor.CentreLeft,
+                                            AutoSizeAxes = Axes.Both,
+                                            Direction = FillDirection.Vertical,
+                                            Children = new Drawable[]
+                                            {
+                                                beatmapText = new LinkFlowContainer { AutoSizeAxes = Axes.Both },
+                                                new FillFlowContainer
+                                                {
+                                                    AutoSizeAxes = Axes.Both,
+                                                    Direction = FillDirection.Horizontal,
+                                                    Spacing = new Vector2(10, 0),
+                                                    Children = new Drawable[]
+                                                    {
+                                                        authorText = new LinkFlowContainer { AutoSizeAxes = Axes.Both },
+                                                        modDisplay = new ModDisplay
+                                                        {
+                                                            Anchor = Anchor.CentreLeft,
+                                                            Origin = Anchor.CentreLeft,
+                                                            AutoSizeAxes = Axes.Both,
+                                                            Scale = new Vector2(0.4f),
+                                                            DisplayUnrankedText = false,
+                                                            ExpansionMode = ExpansionMode.AlwaysExpanded
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                },
+                                new Container
+                                {
+                                    Anchor = Anchor.CentreRight,
+                                    Origin = Anchor.CentreRight,
+                                    AutoSizeAxes = Axes.Both,
+                                    X = -18,
+                                    Children = new Drawable[]
+                                    {
+                                        new IconButton
+                                        {
+                                            Icon = FontAwesome.Solid.MinusSquare,
+                                            Alpha = allowEdit ? 1 : 0,
+                                            Action = () => RequestDeletion?.Invoke(Model),
+                                        },
+                                        new PanelDownloadButton(item.Beatmap.Value.BeatmapSet)
+                                        {
+                                            Size = new Vector2(50, 30),
+                                            Alpha = allowEdit ? 0 : 1
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    },
+                },
+                ColumnDimensions = new[] { new Dimension(GridSizeMode.AutoSize) },
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            beatmap.BindValueChanged(_ => scheduleRefresh());
+            ruleset.BindValueChanged(_ => scheduleRefresh());
+
+            requiredMods.ItemsAdded += _ => scheduleRefresh();
+            requiredMods.ItemsRemoved += _ => scheduleRefresh();
+
+            refresh();
+        }
+
+        private ScheduledDelegate scheduledRefresh;
+
+        private void scheduleRefresh()
+        {
+            scheduledRefresh?.Cancel();
+            scheduledRefresh = Schedule(refresh);
+        }
+
+        private void refresh()
+        {
+            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());
+
+            authorText.Clear();
+
+            if (item.Beatmap?.Value?.Metadata?.Author != null)
+            {
+                authorText.AddText("mapped by ");
+                authorText.AddUserLink(item.Beatmap.Value?.Metadata.Author);
+            }
+
+            modDisplay.Current.Value = requiredMods.ToArray();
+        }
+
+        protected override bool IsDraggableAt(Vector2 screenSpacePos) => handle.HandlingDrag;
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            handle.UpdateHoverState(true);
+            return base.OnHover(e);
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e) => handle.UpdateHoverState(false);
+
+        protected override bool OnClick(ClickEvent e)
+        {
+            if (allowSelection)
+                RequestSelection?.Invoke(Model);
+            return true;
+        }
+
+        public void Select() => maskingContainer.BorderThickness = 5;
+
+        public void Deselect() => maskingContainer.BorderThickness = 0;
+
+        // For now, this is the same implementation as in PanelBackground, but supports a beatmap info rather than a working beatmap
+        private class PanelBackground : Container // todo: should be a buffered container (https://github.com/ppy/osu-framework/issues/3222)
+        {
+            public readonly Bindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
+
+            public PanelBackground()
+            {
+                InternalChildren = new Drawable[]
+                {
+                    new UpdateableBeatmapBackgroundSprite
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        FillMode = FillMode.Fill,
+                        Beatmap = { BindTarget = Beatmap }
+                    },
+                    new Container
+                    {
+                        Depth = -1,
+                        RelativeSizeAxes = Axes.Both,
+                        // This makes the gradient not be perfectly horizontal, but diagonal at a ~40° angle
+                        Shear = new Vector2(0.8f, 0),
+                        Alpha = 0.5f,
+                        Children = new[]
+                        {
+                            // The left half with no gradient applied
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                RelativePositionAxes = Axes.Both,
+                                Colour = Color4.Black,
+                                Width = 0.4f,
+                            },
+                            // Piecewise-linear gradient with 3 segments to make it appear smoother
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                RelativePositionAxes = Axes.Both,
+                                Colour = ColourInfo.GradientHorizontal(Color4.Black, new Color4(0f, 0f, 0f, 0.9f)),
+                                Width = 0.05f,
+                                X = 0.4f,
+                            },
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                RelativePositionAxes = Axes.Both,
+                                Colour = ColourInfo.GradientHorizontal(new Color4(0f, 0f, 0f, 0.9f), new Color4(0f, 0f, 0f, 0.1f)),
+                                Width = 0.2f,
+                                X = 0.45f,
+                            },
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                RelativePositionAxes = Axes.Both,
+                                Colour = ColourInfo.GradientHorizontal(new Color4(0f, 0f, 0f, 0.1f), new Color4(0, 0, 0, 0)),
+                                Width = 0.05f,
+                                X = 0.65f,
+                            },
+                        }
+                    }
+                };
+            }
+        }
+
+        private class ItemHandle : SpriteIcon
+        {
+            public bool HandlingDrag { get; private set; }
+            private bool isHovering;
+
+            public ItemHandle()
+            {
+                Margin = new MarginPadding { Horizontal = 5 };
+
+                Icon = FontAwesome.Solid.Bars;
+            }
+
+            protected override bool OnMouseDown(MouseDownEvent e)
+            {
+                base.OnMouseDown(e);
+
+                HandlingDrag = true;
+                UpdateHoverState(isHovering);
+
+                return false;
+            }
+
+            protected override void OnMouseUp(MouseUpEvent e)
+            {
+                base.OnMouseUp(e);
+
+                HandlingDrag = false;
+                UpdateHoverState(isHovering);
+            }
+
+            public void UpdateHoverState(bool hovering)
+            {
+                isHovering = hovering;
+
+                if (isHovering || HandlingDrag)
+                    this.FadeIn(100);
+                else
+                    this.FadeOut(100);
+            }
+        }
+    }
+}

From aa7efe6141e0ca80c3a908e3902b1dba5c95d4e9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Feb 2020 15:26:55 +0900
Subject: [PATCH 0453/1142] Fix tests potentially failing due to timing issues

---
 .../Online/TestSceneOnlineViewContainer.cs       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
index 39b9fd71d0..d656600a18 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
@@ -61,8 +61,8 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddStep("set status to online", () => ((DummyAPIAccess)API).State = APIState.Online);
 
-            AddAssert("children are visible", () => onlineView.ViewTarget.IsPresent);
-            AddAssert("loading animation is not visible", () => !onlineView.LoadingAnimation.IsPresent);
+            AddUntilStep("children are visible", () => onlineView.ViewTarget.IsPresent);
+            AddUntilStep("loading animation is not visible", () => !onlineView.LoadingAnimation.IsPresent);
         }
 
         [Test]
@@ -70,8 +70,8 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddStep("set status to offline", () => ((DummyAPIAccess)API).State = APIState.Offline);
 
-            AddAssert("children are hidden", () => !onlineView.ViewTarget.IsPresent);
-            AddAssert("loading animation is not visible", () => !onlineView.LoadingAnimation.IsPresent);
+            AddUntilStep("children are not visible", () => !onlineView.ViewTarget.IsPresent);
+            AddUntilStep("loading animation is not visible", () => !onlineView.LoadingAnimation.IsPresent);
         }
 
         [Test]
@@ -79,8 +79,8 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddStep("set status to connecting", () => ((DummyAPIAccess)API).State = APIState.Connecting);
 
-            AddAssert("children are hidden", () => !onlineView.ViewTarget.IsPresent);
-            AddAssert("loading animation is visible", () => onlineView.LoadingAnimation.IsPresent);
+            AddUntilStep("children are not visible", () => !onlineView.ViewTarget.IsPresent);
+            AddUntilStep("loading animation is visible", () => onlineView.LoadingAnimation.IsPresent);
         }
 
         [Test]
@@ -88,8 +88,8 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddStep("set status to failing", () => ((DummyAPIAccess)API).State = APIState.Failing);
 
-            AddAssert("children are hidden", () => !onlineView.ViewTarget.IsPresent);
-            AddAssert("loading animation is visible", () => onlineView.LoadingAnimation.IsPresent);
+            AddUntilStep("children are not visible", () => !onlineView.ViewTarget.IsPresent);
+            AddUntilStep("loading animation is visible", () => onlineView.LoadingAnimation.IsPresent);
         }
     }
 }

From c34f1f40eafd8e06f6a7009fc4661105e40664cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Feb 2020 15:27:09 +0900
Subject: [PATCH 0454/1142] Fix test text not being centered

---
 osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
index d656600a18..2bd0d59632 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
@@ -6,6 +6,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online;
@@ -38,6 +39,7 @@ namespace osu.Game.Tests.Visual.Online
                 : base(@"Please sign in to view dummy test content")
             {
                 RelativeSizeAxes = Axes.Both;
+
                 Children = new Drawable[]
                 {
                     new Box
@@ -48,7 +50,7 @@ namespace osu.Game.Tests.Visual.Online
                     new OsuSpriteText
                     {
                         Text = "dummy online content",
-                        RelativeSizeAxes = Axes.Both,
+                        Font = OsuFont.Default.With(size: 40),
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                     }

From b86b5e9adb3369f675346d0ef2b22429d87c7a61 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Feb 2020 15:27:39 +0900
Subject: [PATCH 0455/1142] Move nested class to bottom of file

---
 .../Online/TestSceneOnlineViewContainer.cs    | 58 +++++++++----------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
index 2bd0d59632..3c2735ca56 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
@@ -29,35 +29,6 @@ namespace osu.Game.Tests.Visual.Online
             };
         }
 
-        private class TestOnlineViewContainer : OnlineViewContainer
-        {
-            public new LoadingAnimation LoadingAnimation => base.LoadingAnimation;
-
-            public CompositeDrawable ViewTarget => base.Content;
-
-            public TestOnlineViewContainer()
-                : base(@"Please sign in to view dummy test content")
-            {
-                RelativeSizeAxes = Axes.Both;
-
-                Children = new Drawable[]
-                {
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = Color4.Blue.Opacity(0.8f),
-                    },
-                    new OsuSpriteText
-                    {
-                        Text = "dummy online content",
-                        Font = OsuFont.Default.With(size: 40),
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                    }
-                };
-            }
-        }
-
         [Test]
         public void TestOnlineStateVisibility()
         {
@@ -93,5 +64,34 @@ namespace osu.Game.Tests.Visual.Online
             AddUntilStep("children are not visible", () => !onlineView.ViewTarget.IsPresent);
             AddUntilStep("loading animation is visible", () => onlineView.LoadingAnimation.IsPresent);
         }
+
+        private class TestOnlineViewContainer : OnlineViewContainer
+        {
+            public new LoadingAnimation LoadingAnimation => base.LoadingAnimation;
+
+            public CompositeDrawable ViewTarget => base.Content;
+
+            public TestOnlineViewContainer()
+                : base(@"Please sign in to view dummy test content")
+            {
+                RelativeSizeAxes = Axes.Both;
+
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4.Blue.Opacity(0.8f),
+                    },
+                    new OsuSpriteText
+                    {
+                        Text = "dummy online content",
+                        Font = OsuFont.Default.With(size: 40),
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    }
+                };
+            }
+        }
     }
 }

From 4d5abab2ee0b39704f0e5b91bf41e01e7b50f83b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Feb 2020 15:29:50 +0900
Subject: [PATCH 0456/1142] Remove unnecessary content private storage

---
 osu.Game/Online/OnlineViewContainer.cs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
index 2a9aa60e2d..0ffb342bfc 100644
--- a/osu.Game/Online/OnlineViewContainer.cs
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -21,8 +21,7 @@ namespace osu.Game.Online
 
         protected const double TRANSFORM_TIME = 300.0;
 
-        private readonly Container viewContent;
-        protected override Container<Drawable> Content => viewContent;
+        protected override Container<Drawable> Content { get; }
 
         [Resolved]
         protected IAPIProvider API { get; private set; }
@@ -31,7 +30,7 @@ namespace osu.Game.Online
         {
             InternalChildren = new Drawable[]
             {
-                viewContent = new Container
+                Content = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
                 },
@@ -48,21 +47,21 @@ namespace osu.Game.Online
             switch (state)
             {
                 case APIState.Offline:
-                    PopContentOut(viewContent);
+                    PopContentOut(Content);
                     placeholder.ScaleTo(0.8f).Then().ScaleTo(1, 3 * TRANSFORM_TIME, Easing.OutQuint);
                     placeholder.FadeInFromZero(2 * TRANSFORM_TIME, Easing.OutQuint);
                     LoadingAnimation.Hide();
                     break;
 
                 case APIState.Online:
-                    PopContentIn(viewContent);
+                    PopContentIn(Content);
                     placeholder.FadeOut(TRANSFORM_TIME / 2, Easing.OutQuint);
                     LoadingAnimation.Hide();
                     break;
 
                 case APIState.Failing:
                 case APIState.Connecting:
-                    PopContentOut(viewContent);
+                    PopContentOut(Content);
                     LoadingAnimation.Show();
                     placeholder.FadeOut(TRANSFORM_TIME / 2, Easing.OutQuint);
                     break;

From 7e6c194d4a9c9f04712db293bc39f5f6baf201f5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Feb 2020 15:34:46 +0900
Subject: [PATCH 0457/1142] Add missing xmldoc

---
 osu.Game/Online/OnlineViewContainer.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
index 0ffb342bfc..50b4820d15 100644
--- a/osu.Game/Online/OnlineViewContainer.cs
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -68,8 +68,14 @@ namespace osu.Game.Online
             }
         }
 
+        /// <summary>
+        /// Applies a transform to the online content to make it hidden.
+        /// </summary>
         protected virtual void PopContentOut(Drawable content) => content.FadeOut(TRANSFORM_TIME / 2, Easing.OutQuint);
 
+        /// <summary>
+        /// Applies a transform to the online content to make it visible.
+        /// </summary>
         protected virtual void PopContentIn(Drawable content) => content.FadeIn(TRANSFORM_TIME, Easing.OutQuint);
 
         protected override void LoadComplete()

From 6f1cecd86f7fc4efa6e00c0da8e44972f332f880 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Feb 2020 15:35:39 +0900
Subject: [PATCH 0458/1142] Move LoadComplete up in method

---
 osu.Game/Online/OnlineViewContainer.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
index 50b4820d15..3b2243c97a 100644
--- a/osu.Game/Online/OnlineViewContainer.cs
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -42,6 +42,12 @@ namespace osu.Game.Online
             };
         }
 
+        protected override void LoadComplete()
+        {
+            API?.Register(this);
+            base.LoadComplete();
+        }
+
         public virtual void APIStateChanged(IAPIProvider api, APIState state)
         {
             switch (state)
@@ -78,12 +84,6 @@ namespace osu.Game.Online
         /// </summary>
         protected virtual void PopContentIn(Drawable content) => content.FadeIn(TRANSFORM_TIME, Easing.OutQuint);
 
-        protected override void LoadComplete()
-        {
-            API?.Register(this);
-            base.LoadComplete();
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             API?.Unregister(this);

From edf9cfc8635580d7e40c188828a2533ec5b824ab Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Feb 2020 15:36:06 +0900
Subject: [PATCH 0459/1142] API can't be null on load

---
 osu.Game/Online/OnlineViewContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
index 3b2243c97a..b16fbb7aed 100644
--- a/osu.Game/Online/OnlineViewContainer.cs
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Online
 
         protected override void LoadComplete()
         {
-            API?.Register(this);
+            API.Register(this);
             base.LoadComplete();
         }
 

From eb75d26c8f5c3365fda1965401f4df77fb900078 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 15:36:16 +0900
Subject: [PATCH 0460/1142] Extract common rearrangeable list design

---
 .../OsuRearrangeableListContainer.cs          |  26 +++
 .../Containers/OsuRearrangeableListItem.cs    | 149 ++++++++++++++++++
 osu.Game/Overlays/Music/Playlist.cs           |  12 +-
 osu.Game/Overlays/Music/PlaylistItem.cs       | 121 ++------------
 4 files changed, 190 insertions(+), 118 deletions(-)
 create mode 100644 osu.Game/Graphics/Containers/OsuRearrangeableListContainer.cs
 create mode 100644 osu.Game/Graphics/Containers/OsuRearrangeableListItem.cs

diff --git a/osu.Game/Graphics/Containers/OsuRearrangeableListContainer.cs b/osu.Game/Graphics/Containers/OsuRearrangeableListContainer.cs
new file mode 100644
index 0000000000..47aed1c500
--- /dev/null
+++ b/osu.Game/Graphics/Containers/OsuRearrangeableListContainer.cs
@@ -0,0 +1,26 @@
+// 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.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Graphics.Containers
+{
+    public abstract class OsuRearrangeableListContainer<TModel> : RearrangeableListContainer<TModel>
+    {
+        /// <summary>
+        /// Whether any item is currently being dragged. Used to hide other items' drag handles.
+        /// </summary>
+        private readonly BindableBool playlistDragActive = new BindableBool();
+
+        protected override ScrollContainer<Drawable> CreateScrollContainer() => new OsuScrollContainer();
+
+        protected sealed override RearrangeableListItem<TModel> CreateDrawable(TModel item) => CreateOsuDrawable(item).With(d =>
+        {
+            d.PlaylistDragActive.BindTo(playlistDragActive);
+        });
+
+        protected abstract OsuRearrangeableListItem<TModel> CreateOsuDrawable(TModel item);
+    }
+}
diff --git a/osu.Game/Graphics/Containers/OsuRearrangeableListItem.cs b/osu.Game/Graphics/Containers/OsuRearrangeableListItem.cs
new file mode 100644
index 0000000000..f75a3330e2
--- /dev/null
+++ b/osu.Game/Graphics/Containers/OsuRearrangeableListItem.cs
@@ -0,0 +1,149 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Events;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Graphics.Containers
+{
+    public abstract class OsuRearrangeableListItem<TModel> : RearrangeableListItem<TModel>
+    {
+        public const float FADE_DURATION = 100;
+
+        /// <summary>
+        /// Whether any item is currently being dragged. Used to hide other items' drag handles.
+        /// </summary>
+        public readonly BindableBool PlaylistDragActive = new BindableBool();
+
+        private Color4 handleColour = Color4.White;
+
+        protected Color4 HandleColour
+        {
+            get => handleColour;
+            set
+            {
+                if (handleColour == value)
+                    return;
+
+                handleColour = value;
+
+                if (handle != null)
+                    handle.Colour = value;
+            }
+        }
+
+        private PlaylistItemHandle handle;
+
+        protected OsuRearrangeableListItem(TModel item)
+            : base(item)
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChild = new GridContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Content = new[]
+                {
+                    new[]
+                    {
+                        new Container
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            AutoSizeAxes = Axes.Both,
+                            Padding = new MarginPadding { Horizontal = 5 },
+                            Child = handle = new PlaylistItemHandle
+                            {
+                                Size = new Vector2(12),
+                                Colour = HandleColour,
+                                AlwaysPresent = true,
+                                Alpha = 0
+                            }
+                        },
+                        CreateContent()
+                    }
+                },
+                ColumnDimensions = new[] { new Dimension(GridSizeMode.AutoSize) },
+                RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
+            };
+        }
+
+        protected override bool OnDragStart(DragStartEvent e)
+        {
+            if (!base.OnDragStart(e))
+                return false;
+
+            PlaylistDragActive.Value = true;
+            return true;
+        }
+
+        protected override void OnDragEnd(DragEndEvent e)
+        {
+            PlaylistDragActive.Value = false;
+            base.OnDragEnd(e);
+        }
+
+        protected override bool IsDraggableAt(Vector2 screenSpacePos) => handle.HandlingDrag;
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            handle.UpdateHoverState(IsDragged || !PlaylistDragActive.Value);
+            return base.OnHover(e);
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e) => handle.UpdateHoverState(false);
+
+        protected abstract Drawable CreateContent();
+
+        private class PlaylistItemHandle : SpriteIcon
+        {
+            public bool HandlingDrag { get; private set; }
+            private bool isHovering;
+
+            public PlaylistItemHandle()
+            {
+                Icon = FontAwesome.Solid.Bars;
+            }
+
+            protected override bool OnMouseDown(MouseDownEvent e)
+            {
+                base.OnMouseDown(e);
+
+                HandlingDrag = true;
+                UpdateHoverState(isHovering);
+
+                return false;
+            }
+
+            protected override void OnMouseUp(MouseUpEvent e)
+            {
+                base.OnMouseUp(e);
+
+                HandlingDrag = false;
+                UpdateHoverState(isHovering);
+            }
+
+            public void UpdateHoverState(bool hovering)
+            {
+                isHovering = hovering;
+
+                if (isHovering || HandlingDrag)
+                    this.FadeIn(FADE_DURATION);
+                else
+                    this.FadeOut(FADE_DURATION);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Music/Playlist.cs b/osu.Game/Overlays/Music/Playlist.cs
index 1ba568443d..621a533dd6 100644
--- a/osu.Game/Overlays/Music/Playlist.cs
+++ b/osu.Game/Overlays/Music/Playlist.cs
@@ -12,17 +12,12 @@ using osuTK;
 
 namespace osu.Game.Overlays.Music
 {
-    public class Playlist : RearrangeableListContainer<BeatmapSetInfo>
+    public class Playlist : OsuRearrangeableListContainer<BeatmapSetInfo>
     {
         public Action<BeatmapSetInfo> RequestSelection;
 
         public readonly Bindable<BeatmapSetInfo> SelectedSet = new Bindable<BeatmapSetInfo>();
 
-        /// <summary>
-        /// Whether any item is currently being dragged. Used to hide other items' drag handles.
-        /// </summary>
-        private readonly BindableBool playlistDragActive = new BindableBool();
-
         public new MarginPadding Padding
         {
             get => base.Padding;
@@ -33,15 +28,12 @@ namespace osu.Game.Overlays.Music
 
         public BeatmapSetInfo FirstVisibleSet => Items.FirstOrDefault(i => ((PlaylistItem)ItemMap[i]).MatchingFilter);
 
-        protected override RearrangeableListItem<BeatmapSetInfo> CreateDrawable(BeatmapSetInfo item) => new PlaylistItem(item)
+        protected override OsuRearrangeableListItem<BeatmapSetInfo> CreateOsuDrawable(BeatmapSetInfo item) => new PlaylistItem(item)
         {
             SelectedSet = { BindTarget = SelectedSet },
-            PlaylistDragActive = { BindTarget = playlistDragActive },
             RequestSelection = set => RequestSelection?.Invoke(set)
         };
 
-        protected override ScrollContainer<Drawable> CreateScrollContainer() => new OsuScrollContainer();
-
         protected override FillFlowContainer<RearrangeableListItem<BeatmapSetInfo>> CreateListFillFlowContainer() => new SearchContainer<RearrangeableListItem<BeatmapSetInfo>>
         {
             Spacing = new Vector2(0, 3),
diff --git a/osu.Game/Overlays/Music/PlaylistItem.cs b/osu.Game/Overlays/Music/PlaylistItem.cs
index 0569261867..8cafbc694a 100644
--- a/osu.Game/Overlays/Music/PlaylistItem.cs
+++ b/osu.Game/Overlays/Music/PlaylistItem.cs
@@ -14,36 +14,27 @@ using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Music
 {
-    public class PlaylistItem : RearrangeableListItem<BeatmapSetInfo>, IFilterable
+    public class PlaylistItem : OsuRearrangeableListItem<BeatmapSetInfo>, IFilterable
     {
-        private const float fade_duration = 100;
-
-        public BindableBool PlaylistDragActive = new BindableBool();
-
         public readonly Bindable<BeatmapSetInfo> SelectedSet = new Bindable<BeatmapSetInfo>();
 
         public Action<BeatmapSetInfo> RequestSelection;
 
-        private PlaylistItemHandle handle;
         private TextFlowContainer text;
         private IEnumerable<Drawable> titleSprites;
         private ILocalisedBindableString titleBind;
         private ILocalisedBindableString artistBind;
 
-        private Color4 hoverColour;
+        private Color4 selectedColour;
         private Color4 artistColour;
 
         public PlaylistItem(BeatmapSetInfo item)
             : base(item)
         {
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
-
             Padding = new MarginPadding { Left = 5 };
 
             FilterTerms = item.Metadata.SearchableTerms;
@@ -52,42 +43,12 @@ namespace osu.Game.Overlays.Music
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, LocalisationManager localisation)
         {
-            hoverColour = colours.Yellow;
+            selectedColour = colours.Yellow;
             artistColour = colours.Gray9;
-
-            InternalChild = new GridContainer
-            {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                Content = new[]
-                {
-                    new Drawable[]
-                    {
-                        handle = new PlaylistItemHandle
-                        {
-                            Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.CentreLeft,
-                            Size = new Vector2(12),
-                            Colour = colours.Gray5,
-                            AlwaysPresent = true,
-                            Alpha = 0
-                        },
-                        text = new OsuTextFlowContainer
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Padding = new MarginPadding { Left = 5 },
-                        },
-                    }
-                },
-                ColumnDimensions = new[] { new Dimension(GridSizeMode.AutoSize) },
-                RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
-            };
+            HandleColour = colours.Gray5;
 
             titleBind = localisation.GetLocalisedString(new LocalisedString((Model.Metadata.TitleUnicode, Model.Metadata.Title)));
             artistBind = localisation.GetLocalisedString(new LocalisedString((Model.Metadata.ArtistUnicode, Model.Metadata.Artist)));
-
-            artistBind.BindValueChanged(_ => recreateText(), true);
         }
 
         protected override void LoadComplete()
@@ -100,10 +61,18 @@ namespace osu.Game.Overlays.Music
                     return;
 
                 foreach (Drawable s in titleSprites)
-                    s.FadeColour(set.NewValue == Model ? hoverColour : Color4.White, fade_duration);
+                    s.FadeColour(set.NewValue == Model ? selectedColour : Color4.White, FADE_DURATION);
             }, true);
+
+            artistBind.BindValueChanged(_ => recreateText(), true);
         }
 
+        protected override Drawable CreateContent() => text = new OsuTextFlowContainer
+        {
+            RelativeSizeAxes = Axes.X,
+            AutoSizeAxes = Axes.Y,
+        };
+
         private void recreateText()
         {
             text.Clear();
@@ -125,31 +94,6 @@ namespace osu.Game.Overlays.Music
             return true;
         }
 
-        protected override bool OnDragStart(DragStartEvent e)
-        {
-            if (!base.OnDragStart(e))
-                return false;
-
-            PlaylistDragActive.Value = true;
-            return true;
-        }
-
-        protected override void OnDragEnd(DragEndEvent e)
-        {
-            PlaylistDragActive.Value = false;
-            base.OnDragEnd(e);
-        }
-
-        protected override bool IsDraggableAt(Vector2 screenSpacePos) => handle.HandlingDrag;
-
-        protected override bool OnHover(HoverEvent e)
-        {
-            handle.UpdateHoverState(IsDragged || !PlaylistDragActive.Value);
-            return base.OnHover(e);
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e) => handle.UpdateHoverState(false);
-
         public IEnumerable<string> FilterTerms { get; }
 
         private bool matching = true;
@@ -168,44 +112,5 @@ namespace osu.Game.Overlays.Music
         }
 
         public bool FilteringActive { get; set; }
-
-        private class PlaylistItemHandle : SpriteIcon
-        {
-            public bool HandlingDrag { get; private set; }
-            private bool isHovering;
-
-            public PlaylistItemHandle()
-            {
-                Icon = FontAwesome.Solid.Bars;
-            }
-
-            protected override bool OnMouseDown(MouseDownEvent e)
-            {
-                base.OnMouseDown(e);
-
-                HandlingDrag = true;
-                UpdateHoverState(isHovering);
-
-                return false;
-            }
-
-            protected override void OnMouseUp(MouseUpEvent e)
-            {
-                base.OnMouseUp(e);
-
-                HandlingDrag = false;
-                UpdateHoverState(isHovering);
-            }
-
-            public void UpdateHoverState(bool hovering)
-            {
-                isHovering = hovering;
-
-                if (isHovering || HandlingDrag)
-                    this.FadeIn(fade_duration);
-                else
-                    this.FadeOut(fade_duration);
-            }
-        }
     }
 }

From 5e871f9838b16f5319cfa5886dc4a81c93137641 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 15:36:47 +0900
Subject: [PATCH 0461/1142] Make room playlist use the common rearrangeable
 design

---
 .../TestSceneDrawableRoomPlaylist.cs          |  16 +-
 .../Screens/Multi/DrawableRoomPlaylist.cs     |  10 +-
 .../Screens/Multi/DrawableRoomPlaylistItem.cs | 263 +++++++-----------
 3 files changed, 112 insertions(+), 177 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index b906ce82e9..393fd281d4 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -17,6 +19,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneDrawableRoomPlaylist : OsuTestScene
     {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(DrawableRoomPlaylist),
+            typeof(DrawableRoomPlaylistItem)
+        };
+
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
@@ -26,25 +34,25 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private DrawableRoomPlaylist playlist;
 
         [Test]
-        public void TestItemsCanNotBeRemovedOrSelectedFromNonEditableAndNonSelectablePlaylist()
+        public void TestNonEditableNonSelectable()
         {
             createPlaylist(false, false);
         }
 
         [Test]
-        public void TestItemsCanBeRemovedFromEditablePlaylist()
+        public void TestEditable()
         {
             createPlaylist(true, false);
         }
 
         [Test]
-        public void TestItemsCanBeSelectedInSelectablePlaylist()
+        public void TestSelectable()
         {
             createPlaylist(false, true);
         }
 
         [Test]
-        public void TestItemsCanBeSelectedAndRemovedFromEditableAndSelectablePlaylist()
+        public void TestEditableSelectable()
         {
             createPlaylist(true, true);
         }
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
index b42a8575ec..021a8ca176 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
@@ -12,7 +12,7 @@ using osuTK;
 
 namespace osu.Game.Screens.Multi
 {
-    public class DrawableRoomPlaylist : RearrangeableListContainer<PlaylistItem>
+    public class DrawableRoomPlaylist : OsuRearrangeableListContainer<PlaylistItem>
     {
         public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
@@ -45,10 +45,10 @@ namespace osu.Game.Screens.Multi
             };
         }
 
-        protected override ScrollContainer<Drawable> CreateScrollContainer() => new OsuScrollContainer
+        protected override ScrollContainer<Drawable> CreateScrollContainer() => base.CreateScrollContainer().With(d =>
         {
-            ScrollbarVisible = false
-        };
+            d.ScrollbarVisible = false;
+        });
 
         protected override FillFlowContainer<RearrangeableListItem<PlaylistItem>> CreateListFillFlowContainer() => new FillFlowContainer<RearrangeableListItem<PlaylistItem>>
         {
@@ -57,7 +57,7 @@ namespace osu.Game.Screens.Multi
             Spacing = new Vector2(0, 2)
         };
 
-        protected override RearrangeableListItem<PlaylistItem> CreateDrawable(PlaylistItem item) => new DrawableRoomPlaylistItem(item, allowEdit, allowSelection)
+        protected override OsuRearrangeableListItem<PlaylistItem> CreateOsuDrawable(PlaylistItem item) => new DrawableRoomPlaylistItem(item, allowEdit, allowSelection)
         {
             RequestSelection = requestSelection,
             RequestDeletion = requestDeletion
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
index d2788a5c4b..2bc593d779 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
@@ -5,6 +5,7 @@ using System;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
@@ -28,7 +29,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Multi
 {
-    public class DrawableRoomPlaylistItem : RearrangeableListItem<PlaylistItem>
+    public class DrawableRoomPlaylistItem : OsuRearrangeableListItem<PlaylistItem>
     {
         public Action<PlaylistItem> RequestSelection;
         public Action<PlaylistItem> RequestDeletion;
@@ -37,7 +38,6 @@ namespace osu.Game.Screens.Multi
         private Container difficultyIconContainer;
         private LinkFlowContainer beatmapText;
         private LinkFlowContainer authorText;
-        private ItemHandle handle;
         private ModDisplay modDisplay;
 
         private readonly Bindable<BeatmapInfo> beatmap = new Bindable<BeatmapInfo>();
@@ -55,9 +55,6 @@ namespace osu.Game.Screens.Multi
             this.allowEdit = allowEdit;
             this.allowSelection = allowSelection;
 
-            RelativeSizeAxes = Axes.X;
-            Height = 50;
-
             beatmap.BindTo(item.Beatmap);
             ruleset.BindTo(item.Ruleset);
             requiredMods.BindTo(item.RequiredMods);
@@ -66,118 +63,10 @@ namespace osu.Game.Screens.Multi
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            InternalChild = new GridContainer
-            {
-                RelativeSizeAxes = Axes.Both,
-                Content = new[]
-                {
-                    new Drawable[]
-                    {
-                        new Container
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            AutoSizeAxes = Axes.Both,
-                            Alpha = allowEdit ? 1 : 0,
-                            Child = handle = new ItemHandle
-                            {
-                                Size = new Vector2(12),
-                                AlwaysPresent = true,
-                                Alpha = 0,
-                            },
-                        },
-                        maskingContainer = new Container
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Masking = true,
-                            CornerRadius = 10,
-                            BorderColour = colours.Yellow,
-                            Children = new Drawable[]
-                            {
-                                new Box // A transparent box that forces the border to be drawn if the panel background is opaque
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Alpha = 0,
-                                    AlwaysPresent = true
-                                },
-                                new PanelBackground
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Beatmap = { BindTarget = beatmap }
-                                },
-                                new FillFlowContainer
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Padding = new MarginPadding { Left = 8 },
-                                    Spacing = new Vector2(8, 0),
-                                    Direction = FillDirection.Horizontal,
-                                    Children = new Drawable[]
-                                    {
-                                        difficultyIconContainer = new Container
-                                        {
-                                            Anchor = Anchor.CentreLeft,
-                                            Origin = Anchor.CentreLeft,
-                                            AutoSizeAxes = Axes.Both,
-                                        },
-                                        new FillFlowContainer
-                                        {
-                                            Anchor = Anchor.CentreLeft,
-                                            Origin = Anchor.CentreLeft,
-                                            AutoSizeAxes = Axes.Both,
-                                            Direction = FillDirection.Vertical,
-                                            Children = new Drawable[]
-                                            {
-                                                beatmapText = new LinkFlowContainer { AutoSizeAxes = Axes.Both },
-                                                new FillFlowContainer
-                                                {
-                                                    AutoSizeAxes = Axes.Both,
-                                                    Direction = FillDirection.Horizontal,
-                                                    Spacing = new Vector2(10, 0),
-                                                    Children = new Drawable[]
-                                                    {
-                                                        authorText = new LinkFlowContainer { AutoSizeAxes = Axes.Both },
-                                                        modDisplay = new ModDisplay
-                                                        {
-                                                            Anchor = Anchor.CentreLeft,
-                                                            Origin = Anchor.CentreLeft,
-                                                            AutoSizeAxes = Axes.Both,
-                                                            Scale = new Vector2(0.4f),
-                                                            DisplayUnrankedText = false,
-                                                            ExpansionMode = ExpansionMode.AlwaysExpanded
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                },
-                                new Container
-                                {
-                                    Anchor = Anchor.CentreRight,
-                                    Origin = Anchor.CentreRight,
-                                    AutoSizeAxes = Axes.Both,
-                                    X = -18,
-                                    Children = new Drawable[]
-                                    {
-                                        new IconButton
-                                        {
-                                            Icon = FontAwesome.Solid.MinusSquare,
-                                            Alpha = allowEdit ? 1 : 0,
-                                            Action = () => RequestDeletion?.Invoke(Model),
-                                        },
-                                        new PanelDownloadButton(item.Beatmap.Value.BeatmapSet)
-                                        {
-                                            Size = new Vector2(50, 30),
-                                            Alpha = allowEdit ? 0 : 1
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    },
-                },
-                ColumnDimensions = new[] { new Dimension(GridSizeMode.AutoSize) },
-            };
+            if (!allowEdit)
+                HandleColour = HandleColour.Opacity(0);
+
+            maskingContainer.BorderColour = colours.Yellow;
         }
 
         protected override void LoadComplete()
@@ -193,6 +82,95 @@ namespace osu.Game.Screens.Multi
             refresh();
         }
 
+        protected override Drawable CreateContent() => maskingContainer = new Container
+        {
+            RelativeSizeAxes = Axes.X,
+            Height = 50,
+            Masking = true,
+            CornerRadius = 10,
+            Children = new Drawable[]
+            {
+                new Box // A transparent box that forces the border to be drawn if the panel background is opaque
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Alpha = 0,
+                    AlwaysPresent = true
+                },
+                new PanelBackground
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Beatmap = { BindTarget = beatmap }
+                },
+                new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding { Left = 8 },
+                    Spacing = new Vector2(8, 0),
+                    Direction = FillDirection.Horizontal,
+                    Children = new Drawable[]
+                    {
+                        difficultyIconContainer = new Container
+                        {
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            AutoSizeAxes = Axes.Both,
+                        },
+                        new FillFlowContainer
+                        {
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            AutoSizeAxes = Axes.Both,
+                            Direction = FillDirection.Vertical,
+                            Children = new Drawable[]
+                            {
+                                beatmapText = new LinkFlowContainer { AutoSizeAxes = Axes.Both },
+                                new FillFlowContainer
+                                {
+                                    AutoSizeAxes = Axes.Both,
+                                    Direction = FillDirection.Horizontal,
+                                    Spacing = new Vector2(10, 0),
+                                    Children = new Drawable[]
+                                    {
+                                        authorText = new LinkFlowContainer { AutoSizeAxes = Axes.Both },
+                                        modDisplay = new ModDisplay
+                                        {
+                                            Anchor = Anchor.CentreLeft,
+                                            Origin = Anchor.CentreLeft,
+                                            AutoSizeAxes = Axes.Both,
+                                            Scale = new Vector2(0.4f),
+                                            DisplayUnrankedText = false,
+                                            ExpansionMode = ExpansionMode.AlwaysExpanded
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
+                new Container
+                {
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    AutoSizeAxes = Axes.Both,
+                    X = -18,
+                    Children = new Drawable[]
+                    {
+                        new IconButton
+                        {
+                            Icon = FontAwesome.Solid.MinusSquare,
+                            Alpha = allowEdit ? 1 : 0,
+                            Action = () => RequestDeletion?.Invoke(Model),
+                        },
+                        new PanelDownloadButton(item.Beatmap.Value.BeatmapSet)
+                        {
+                            Size = new Vector2(50, 30),
+                            Alpha = allowEdit ? 0 : 1
+                        }
+                    }
+                }
+            }
+        };
+
         private ScheduledDelegate scheduledRefresh;
 
         private void scheduleRefresh()
@@ -219,16 +197,6 @@ namespace osu.Game.Screens.Multi
             modDisplay.Current.Value = requiredMods.ToArray();
         }
 
-        protected override bool IsDraggableAt(Vector2 screenSpacePos) => handle.HandlingDrag;
-
-        protected override bool OnHover(HoverEvent e)
-        {
-            handle.UpdateHoverState(true);
-            return base.OnHover(e);
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e) => handle.UpdateHoverState(false);
-
         protected override bool OnClick(ClickEvent e)
         {
             if (allowSelection)
@@ -302,46 +270,5 @@ namespace osu.Game.Screens.Multi
                 };
             }
         }
-
-        private class ItemHandle : SpriteIcon
-        {
-            public bool HandlingDrag { get; private set; }
-            private bool isHovering;
-
-            public ItemHandle()
-            {
-                Margin = new MarginPadding { Horizontal = 5 };
-
-                Icon = FontAwesome.Solid.Bars;
-            }
-
-            protected override bool OnMouseDown(MouseDownEvent e)
-            {
-                base.OnMouseDown(e);
-
-                HandlingDrag = true;
-                UpdateHoverState(isHovering);
-
-                return false;
-            }
-
-            protected override void OnMouseUp(MouseUpEvent e)
-            {
-                base.OnMouseUp(e);
-
-                HandlingDrag = false;
-                UpdateHoverState(isHovering);
-            }
-
-            public void UpdateHoverState(bool hovering)
-            {
-                isHovering = hovering;
-
-                if (isHovering || HandlingDrag)
-                    this.FadeIn(100);
-                else
-                    this.FadeOut(100);
-            }
-        }
     }
 }

From 720ceca78a3cdd5c90acf75684c8a0d65af2f67b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Feb 2020 15:38:47 +0900
Subject: [PATCH 0462/1142] Final tidy-up pass

---
 osu.Game/Online/OnlineViewContainer.cs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
index b16fbb7aed..83fbff733f 100644
--- a/osu.Game/Online/OnlineViewContainer.cs
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Online
         private readonly Placeholder placeholder;
         protected readonly LoadingAnimation LoadingAnimation;
 
-        protected const double TRANSFORM_TIME = 300.0;
+        private const double transform_duration = 300;
 
         protected override Container<Drawable> Content { get; }
 
@@ -44,8 +44,9 @@ namespace osu.Game.Online
 
         protected override void LoadComplete()
         {
-            API.Register(this);
             base.LoadComplete();
+
+            API.Register(this);
         }
 
         public virtual void APIStateChanged(IAPIProvider api, APIState state)
@@ -54,14 +55,14 @@ namespace osu.Game.Online
             {
                 case APIState.Offline:
                     PopContentOut(Content);
-                    placeholder.ScaleTo(0.8f).Then().ScaleTo(1, 3 * TRANSFORM_TIME, Easing.OutQuint);
-                    placeholder.FadeInFromZero(2 * TRANSFORM_TIME, Easing.OutQuint);
+                    placeholder.ScaleTo(0.8f).Then().ScaleTo(1, 3 * transform_duration, Easing.OutQuint);
+                    placeholder.FadeInFromZero(2 * transform_duration, Easing.OutQuint);
                     LoadingAnimation.Hide();
                     break;
 
                 case APIState.Online:
                     PopContentIn(Content);
-                    placeholder.FadeOut(TRANSFORM_TIME / 2, Easing.OutQuint);
+                    placeholder.FadeOut(transform_duration / 2, Easing.OutQuint);
                     LoadingAnimation.Hide();
                     break;
 
@@ -69,7 +70,7 @@ namespace osu.Game.Online
                 case APIState.Connecting:
                     PopContentOut(Content);
                     LoadingAnimation.Show();
-                    placeholder.FadeOut(TRANSFORM_TIME / 2, Easing.OutQuint);
+                    placeholder.FadeOut(transform_duration / 2, Easing.OutQuint);
                     break;
             }
         }
@@ -77,12 +78,12 @@ namespace osu.Game.Online
         /// <summary>
         /// Applies a transform to the online content to make it hidden.
         /// </summary>
-        protected virtual void PopContentOut(Drawable content) => content.FadeOut(TRANSFORM_TIME / 2, Easing.OutQuint);
+        protected virtual void PopContentOut(Drawable content) => content.FadeOut(transform_duration / 2, Easing.OutQuint);
 
         /// <summary>
         /// Applies a transform to the online content to make it visible.
         /// </summary>
-        protected virtual void PopContentIn(Drawable content) => content.FadeIn(TRANSFORM_TIME, Easing.OutQuint);
+        protected virtual void PopContentIn(Drawable content) => content.FadeIn(transform_duration, Easing.OutQuint);
 
         protected override void Dispose(bool isDisposing)
         {

From a75715607b3882c14ccab7984cc9ee4a97534522 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Feb 2020 15:41:46 +0900
Subject: [PATCH 0463/1142] Move drawable load to asynchronous context

---
 osu.Game/Online/OnlineViewContainer.cs | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
index 83fbff733f..689c1c0afb 100644
--- a/osu.Game/Online/OnlineViewContainer.cs
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -16,24 +16,30 @@ namespace osu.Game.Online
     /// </summary>
     public abstract class OnlineViewContainer : Container, IOnlineComponent
     {
-        private readonly Placeholder placeholder;
-        protected readonly LoadingAnimation LoadingAnimation;
+        protected LoadingAnimation LoadingAnimation { get; private set; }
+
+        protected override Container<Drawable> Content { get; } = new Container { RelativeSizeAxes = Axes.Both };
+
+        private readonly string placeholderMessage;
+
+        private Placeholder placeholder;
 
         private const double transform_duration = 300;
 
-        protected override Container<Drawable> Content { get; }
-
         [Resolved]
         protected IAPIProvider API { get; private set; }
 
         protected OnlineViewContainer(string placeholderMessage)
+        {
+            this.placeholderMessage = placeholderMessage;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
         {
             InternalChildren = new Drawable[]
             {
-                Content = new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                },
+                Content,
                 placeholder = new LoginPlaceholder(placeholderMessage),
                 LoadingAnimation = new LoadingAnimation
                 {

From 9cbb37b682fe35508c1aa030b4a97dad3ece41f4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Feb 2020 15:59:59 +0900
Subject: [PATCH 0464/1142] Fix bindable being created far too late in
 construction

---
 osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
index 7ebc26ebfb..28600ef55b 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
@@ -30,7 +30,8 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
         private readonly Drawable cursorTrail;
 
-        public Bindable<float> CursorScale;
+        public Bindable<float> CursorScale = new BindableFloat(1);
+
         private Bindable<float> userCursorScale;
         private Bindable<bool> autoCursorScale;
 
@@ -57,6 +58,8 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
         protected override void LoadComplete()
         {
+            base.LoadComplete();
+
             showTrail.BindValueChanged(v => cursorTrail.FadeTo(v.NewValue ? 1 : 0, 200), true);
 
             userCursorScale = config.GetBindable<float>(OsuSetting.GameplayCursorSize);
@@ -65,7 +68,6 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             autoCursorScale = config.GetBindable<bool>(OsuSetting.AutoCursorSize);
             autoCursorScale.ValueChanged += _ => calculateScale();
 
-            CursorScale = new BindableFloat();
             CursorScale.ValueChanged += e =>
             {
                 var newScale = new Vector2(e.NewValue);
@@ -75,8 +77,6 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             };
 
             calculateScale();
-
-            base.LoadComplete();
         }
 
         /// <summary>

From 1909ea2bd3a17cd3d6a877dd4b01c1585d4f631c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 16:09:15 +0900
Subject: [PATCH 0465/1142] Add a way to hide the drag handle

---
 .../Containers/OsuRearrangeableListItem.cs      | 17 +++++++++++++++--
 .../Screens/Multi/DrawableRoomPlaylistItem.cs   |  2 ++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/Containers/OsuRearrangeableListItem.cs b/osu.Game/Graphics/Containers/OsuRearrangeableListItem.cs
index f75a3330e2..29553954fe 100644
--- a/osu.Game/Graphics/Containers/OsuRearrangeableListItem.cs
+++ b/osu.Game/Graphics/Containers/OsuRearrangeableListItem.cs
@@ -23,6 +23,9 @@ namespace osu.Game.Graphics.Containers
 
         private Color4 handleColour = Color4.White;
 
+        /// <summary>
+        /// The colour of the drag handle.
+        /// </summary>
         protected Color4 HandleColour
         {
             get => handleColour;
@@ -38,6 +41,11 @@ namespace osu.Game.Graphics.Containers
             }
         }
 
+        /// <summary>
+        /// Whether the drag handle should be shown.
+        /// </summary>
+        protected virtual bool ShowDragHandle => true;
+
         private PlaylistItemHandle handle;
 
         protected OsuRearrangeableListItem(TModel item)
@@ -50,6 +58,8 @@ namespace osu.Game.Graphics.Containers
         [BackgroundDependencyLoader]
         private void load()
         {
+            Container handleContainer;
+
             InternalChild = new GridContainer
             {
                 RelativeSizeAxes = Axes.X,
@@ -58,7 +68,7 @@ namespace osu.Game.Graphics.Containers
                 {
                     new[]
                     {
-                        new Container
+                        handleContainer = new Container
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
@@ -78,6 +88,9 @@ namespace osu.Game.Graphics.Containers
                 ColumnDimensions = new[] { new Dimension(GridSizeMode.AutoSize) },
                 RowDimensions = new[] { new Dimension(GridSizeMode.AutoSize) }
             };
+
+            if (!ShowDragHandle)
+                handleContainer.Alpha = 0;
         }
 
         protected override bool OnDragStart(DragStartEvent e)
@@ -107,7 +120,7 @@ namespace osu.Game.Graphics.Containers
 
         protected abstract Drawable CreateContent();
 
-        private class PlaylistItemHandle : SpriteIcon
+        public class PlaylistItemHandle : SpriteIcon
         {
             public bool HandlingDrag { get; private set; }
             private bool isHovering;
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
index 2bc593d779..7156839dfc 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
@@ -34,6 +34,8 @@ namespace osu.Game.Screens.Multi
         public Action<PlaylistItem> RequestSelection;
         public Action<PlaylistItem> RequestDeletion;
 
+        protected override bool ShowDragHandle => allowEdit;
+
         private Container maskingContainer;
         private Container difficultyIconContainer;
         private LinkFlowContainer beatmapText;

From d6768bba628c2feafac4c28b5719cc83ed83e48a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 16:09:30 +0900
Subject: [PATCH 0466/1142] Make test playlist items unique

---
 .../Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index 393fd281d4..d43bf9edea 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -79,6 +79,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
                 playlist.Items.Add(new PlaylistItem
                 {
+                    ID = i,
                     Beatmap = { Value = beatmap },
                     Ruleset = { Value = rulesets[RNG.Next(0, rulesets.Count)] },
                     RequiredMods =

From afd3e4604b5649e4f27e52afa6869e64249e8e2a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 16:48:23 +0900
Subject: [PATCH 0467/1142] Fix race condition causing selection to be reset
 incorrectly

---
 osu.Game/Screens/Multi/DrawableRoomPlaylist.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
index 021a8ca176..01f173db4e 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
@@ -38,11 +37,11 @@ namespace osu.Game.Screens.Multi
                     ((DrawableRoomPlaylistItem)newItem).Select();
             }, true);
 
-            Items.ItemsRemoved += items =>
+            Items.ItemsRemoved += items => Schedule(() =>
             {
-                if (items.Any(i => i == SelectedItem.Value))
+                if (!Items.Contains(SelectedItem.Value))
                     SelectedItem.Value = null;
-            };
+            });
         }
 
         protected override ScrollContainer<Drawable> CreateScrollContainer() => base.CreateScrollContainer().With(d =>

From 6a466ea2f584e8c8c74ed8e92414ea00c5532dce Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 16:48:30 +0900
Subject: [PATCH 0468/1142] Improve test cases

---
 .../TestSceneDrawableRoomPlaylist.cs          | 148 +++++++++++++++++-
 1 file changed, 147 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index d43bf9edea..267496bba2 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -7,17 +7,22 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.Multi;
 using osuTK;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneDrawableRoomPlaylist : OsuTestScene
+    public class TestSceneDrawableRoomPlaylist : ManualInputManagerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -37,26 +42,167 @@ namespace osu.Game.Tests.Visual.Multiplayer
         public void TestNonEditableNonSelectable()
         {
             createPlaylist(false, false);
+
+            moveToItem(0);
+            assertHandleVisibility(0, false);
+            assertDeleteButtonVisibility(0, false);
         }
 
         [Test]
         public void TestEditable()
         {
             createPlaylist(true, false);
+
+            moveToItem(0);
+            assertHandleVisibility(0, true);
+            assertDeleteButtonVisibility(0, true);
         }
 
         [Test]
         public void TestSelectable()
         {
             createPlaylist(false, true);
+
+            moveToItem(0);
+            assertHandleVisibility(0, false);
+            assertDeleteButtonVisibility(0, false);
+
+            AddStep("click", () => InputManager.Click(MouseButton.Left));
+
+            AddAssert("item 0 is selected", () => playlist.SelectedItem.Value == playlist.Items[0]);
         }
 
         [Test]
         public void TestEditableSelectable()
         {
             createPlaylist(true, true);
+
+            moveToItem(0);
+            assertHandleVisibility(0, true);
+            assertDeleteButtonVisibility(0, true);
+
+            AddStep("click", () => InputManager.Click(MouseButton.Left));
+
+            AddAssert("item 0 is selected", () => playlist.SelectedItem.Value == playlist.Items[0]);
         }
 
+        [Test]
+        public void TestSelectionNotLostAfterRearrangement()
+        {
+            createPlaylist(true, true);
+
+            moveToItem(0);
+            AddStep("click", () => InputManager.Click(MouseButton.Left));
+
+            moveToDragger(0);
+            AddStep("begin drag", () => InputManager.PressButton(MouseButton.Left));
+            moveToDragger(1, new Vector2(0, 5));
+            AddStep("end drag", () => InputManager.ReleaseButton(MouseButton.Left));
+
+            AddAssert("item 1 is selected", () => playlist.SelectedItem.Value == playlist.Items[1]);
+        }
+
+        [Test]
+        public void TestItemRemovedOnDeletion()
+        {
+            PlaylistItem selectedItem = null;
+
+            createPlaylist(true, true);
+
+            moveToItem(0);
+            AddStep("click", () => InputManager.Click(MouseButton.Left));
+            AddStep("retrieve selection", () => selectedItem = playlist.SelectedItem.Value);
+
+            moveToDeleteButton(0);
+            AddStep("click delete button", () => InputManager.Click(MouseButton.Left));
+
+            AddAssert("item removed", () => !playlist.Items.Contains(selectedItem));
+        }
+
+        [Test]
+        public void TestNextItemSelectedAfterDeletion()
+        {
+            createPlaylist(true, true);
+
+            moveToItem(0);
+            AddStep("click", () => InputManager.Click(MouseButton.Left));
+
+            moveToDeleteButton(0);
+            AddStep("click delete button", () => InputManager.Click(MouseButton.Left));
+
+            AddAssert("item 0 is selected", () => playlist.SelectedItem.Value == playlist.Items[0]);
+        }
+
+        [Test]
+        public void TestLastItemSelectedAfterLastItemDeleted()
+        {
+            createPlaylist(true, true);
+
+            AddWaitStep("wait for flow", 5); // Items may take 1 update frame to flow. A wait count of 5 is guaranteed to result in the flow being updated as desired.
+            AddStep("scroll to bottom", () => playlist.ChildrenOfType<ScrollContainer<Drawable>>().First().ScrollToEnd(false));
+
+            moveToItem(19);
+            AddStep("click", () => InputManager.Click(MouseButton.Left));
+
+            moveToDeleteButton(19);
+            AddStep("click delete button", () => InputManager.Click(MouseButton.Left));
+
+            AddAssert("item 18 is selected", () => playlist.SelectedItem.Value == playlist.Items[18]);
+        }
+
+        [Test]
+        public void TestSelectionResetWhenAllItemsDeleted()
+        {
+            createPlaylist(true, true);
+
+            AddStep("remove all but one item", () =>
+            {
+                playlist.Items.RemoveRange(1, playlist.Items.Count - 1);
+            });
+
+            moveToItem(0);
+            AddStep("click", () => InputManager.Click(MouseButton.Left));
+            moveToDeleteButton(0);
+            AddStep("click delete button", () => InputManager.Click(MouseButton.Left));
+
+            AddAssert("selected item is null", () => playlist.SelectedItem.Value == null);
+        }
+
+        // Todo: currently not possible due to bindable list shortcomings (https://github.com/ppy/osu-framework/issues/3081)
+        // [Test]
+        public void TestNextItemSelectedAfterExternalDeletion()
+        {
+            createPlaylist(true, true);
+
+            moveToItem(0);
+            AddStep("click", () => InputManager.Click(MouseButton.Left));
+            AddStep("remove item 0", () => playlist.Items.RemoveAt(0));
+
+            AddAssert("item 0 is selected", () => playlist.SelectedItem.Value == playlist.Items[0]);
+        }
+
+        private void moveToItem(int index, Vector2? offset = null)
+            => AddStep($"move mouse to item {index}", () => InputManager.MoveMouseTo(playlist.ChildrenOfType<OsuRearrangeableListItem<PlaylistItem>>().ElementAt(index), offset));
+
+        private void moveToDragger(int index, Vector2? offset = null) => AddStep($"move mouse to dragger {index}", () =>
+        {
+            var item = playlist.ChildrenOfType<OsuRearrangeableListItem<PlaylistItem>>().ElementAt(index);
+            InputManager.MoveMouseTo(item.ChildrenOfType<OsuRearrangeableListItem<PlaylistItem>.PlaylistItemHandle>().Single(), offset);
+        });
+
+        private void moveToDeleteButton(int index, Vector2? offset = null) => AddStep($"move mouse to delete button {index}", () =>
+        {
+            var item = playlist.ChildrenOfType<OsuRearrangeableListItem<PlaylistItem>>().ElementAt(index);
+            InputManager.MoveMouseTo(item.ChildrenOfType<IconButton>().ElementAt(0), offset);
+        });
+
+        private void assertHandleVisibility(int index, bool visible)
+            => AddAssert($"handle {index} {(visible ? "is" : "is not")} visible",
+                () => (playlist.ChildrenOfType<OsuRearrangeableListItem<PlaylistItem>.PlaylistItemHandle>().ElementAt(index).Alpha > 0) == visible);
+
+        private void assertDeleteButtonVisibility(int index, bool visible)
+            => AddAssert($"delete button {index} {(visible ? "is" : "is not")} visible", () => (playlist.ChildrenOfType<IconButton>().ElementAt(2 + index * 2).Alpha > 0) == visible);
+
         private void createPlaylist(bool allowEdit, bool allowSelection) => AddStep("create playlist", () =>
         {
             Child = playlist = new DrawableRoomPlaylist(allowEdit, allowSelection)

From aceba8791c2e3bbbb1a541351257900ae3a56fa0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 16:55:05 +0900
Subject: [PATCH 0469/1142] Clean up selection handling

---
 .../TestSceneDrawableRoomPlaylist.cs          |  8 ++-
 .../Screens/Multi/DrawableRoomPlaylist.cs     | 12 +---
 .../Screens/Multi/DrawableRoomPlaylistItem.cs | 63 +++++++++----------
 3 files changed, 40 insertions(+), 43 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index 267496bba2..c93d59acdf 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -46,6 +46,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
             moveToItem(0);
             assertHandleVisibility(0, false);
             assertDeleteButtonVisibility(0, false);
+
+            AddStep("click", () => InputManager.Click(MouseButton.Left));
+            AddAssert("no item selected", () => playlist.SelectedItem.Value == null);
         }
 
         [Test]
@@ -56,6 +59,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
             moveToItem(0);
             assertHandleVisibility(0, true);
             assertDeleteButtonVisibility(0, true);
+
+            AddStep("click", () => InputManager.Click(MouseButton.Left));
+            AddAssert("no item selected", () => playlist.SelectedItem.Value == null);
         }
 
         [Test]
@@ -165,7 +171,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             moveToDeleteButton(0);
             AddStep("click delete button", () => InputManager.Click(MouseButton.Left));
 
-            AddAssert("selected item is null", () => playlist.SelectedItem.Value == null);
+            AddAssert("no item selected", () => playlist.SelectedItem.Value == null);
         }
 
         // Todo: currently not possible due to bindable list shortcomings (https://github.com/ppy/osu-framework/issues/3081)
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
index 01f173db4e..b139c61166 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
@@ -28,15 +28,7 @@ namespace osu.Game.Screens.Multi
         {
             base.LoadComplete();
 
-            SelectedItem.BindValueChanged(item =>
-            {
-                if (item.OldValue != null && ItemMap.TryGetValue(item.OldValue, out var oldItem))
-                    ((DrawableRoomPlaylistItem)oldItem).Deselect();
-
-                if (item.NewValue != null && ItemMap.TryGetValue(item.NewValue, out var newItem))
-                    ((DrawableRoomPlaylistItem)newItem).Select();
-            }, true);
-
+            // Scheduled since items are removed and re-added upon rearrangement
             Items.ItemsRemoved += items => Schedule(() =>
             {
                 if (!Items.Contains(SelectedItem.Value))
@@ -58,7 +50,7 @@ namespace osu.Game.Screens.Multi
 
         protected override OsuRearrangeableListItem<PlaylistItem> CreateOsuDrawable(PlaylistItem item) => new DrawableRoomPlaylistItem(item, allowEdit, allowSelection)
         {
-            RequestSelection = requestSelection,
+            SelectedItem = { BindTarget = SelectedItem },
             RequestDeletion = requestDeletion
         };
 
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
index 7156839dfc..b1e69e4c4f 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
@@ -31,9 +31,10 @@ namespace osu.Game.Screens.Multi
 {
     public class DrawableRoomPlaylistItem : OsuRearrangeableListItem<PlaylistItem>
     {
-        public Action<PlaylistItem> RequestSelection;
         public Action<PlaylistItem> RequestDeletion;
 
+        public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
+
         protected override bool ShowDragHandle => allowEdit;
 
         private Container maskingContainer;
@@ -75,6 +76,8 @@ namespace osu.Game.Screens.Multi
         {
             base.LoadComplete();
 
+            SelectedItem.BindValueChanged(selected => maskingContainer.BorderThickness = selected.NewValue == Model ? 5 : 0);
+
             beatmap.BindValueChanged(_ => scheduleRefresh());
             ruleset.BindValueChanged(_ => scheduleRefresh());
 
@@ -84,6 +87,32 @@ namespace osu.Game.Screens.Multi
             refresh();
         }
 
+        private ScheduledDelegate scheduledRefresh;
+
+        private void scheduleRefresh()
+        {
+            scheduledRefresh?.Cancel();
+            scheduledRefresh = Schedule(refresh);
+        }
+
+        private void refresh()
+        {
+            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());
+
+            authorText.Clear();
+
+            if (item.Beatmap?.Value?.Metadata?.Author != null)
+            {
+                authorText.AddText("mapped by ");
+                authorText.AddUserLink(item.Beatmap.Value?.Metadata.Author);
+            }
+
+            modDisplay.Current.Value = requiredMods.ToArray();
+        }
+
         protected override Drawable CreateContent() => maskingContainer = new Container
         {
             RelativeSizeAxes = Axes.X,
@@ -173,43 +202,13 @@ namespace osu.Game.Screens.Multi
             }
         };
 
-        private ScheduledDelegate scheduledRefresh;
-
-        private void scheduleRefresh()
-        {
-            scheduledRefresh?.Cancel();
-            scheduledRefresh = Schedule(refresh);
-        }
-
-        private void refresh()
-        {
-            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());
-
-            authorText.Clear();
-
-            if (item.Beatmap?.Value?.Metadata?.Author != null)
-            {
-                authorText.AddText("mapped by ");
-                authorText.AddUserLink(item.Beatmap.Value?.Metadata.Author);
-            }
-
-            modDisplay.Current.Value = requiredMods.ToArray();
-        }
-
         protected override bool OnClick(ClickEvent e)
         {
             if (allowSelection)
-                RequestSelection?.Invoke(Model);
+                SelectedItem.Value = Model;
             return true;
         }
 
-        public void Select() => maskingContainer.BorderThickness = 5;
-
-        public void Deselect() => maskingContainer.BorderThickness = 0;
-
         // For now, this is the same implementation as in PanelBackground, but supports a beatmap info rather than a working beatmap
         private class PanelBackground : Container // todo: should be a buffered container (https://github.com/ppy/osu-framework/issues/3222)
         {

From 9ea6912520954aa28e6a5b1eb23d16da90716f95 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Feb 2020 16:58:56 +0900
Subject: [PATCH 0470/1142] Improve overall readability of OsuModeRelax

---
 osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs | 45 +++++++++++++++--------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
index 649b01c132..7ebb6fd76d 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
@@ -19,33 +19,46 @@ namespace osu.Game.Rulesets.Osu.Mods
         public override string Description => @"You don't need to click. Give your clicking/tapping fingers a break from the heat of things.";
         public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(OsuModAutopilot)).ToArray();
 
+        /// <summary>
+        /// How early before a hitobject's start time to trigger a hit.
+        /// </summary>
+        private const float relax_leniency = 3;
+
         public void Update(Playfield playfield)
         {
             bool requiresHold = false;
             bool requiresHit = false;
 
-            const float relax_leniency = 3;
+            double time = playfield.Clock.CurrentTime;
 
-            foreach (var drawable in playfield.HitObjectContainer.AliveObjects)
+            foreach (var h in playfield.HitObjectContainer.AliveObjects.OfType<DrawableOsuHitObject>())
             {
-                if (!(drawable is DrawableOsuHitObject osuHit))
+                // we are not yet close enough to the object.
+                if (time < h.HitObject.StartTime - relax_leniency)
+                    break;
+
+                // already hit or beyond the hittable end time.
+                if (h.IsHit || (h.HitObject is IHasEndTime hasEnd && time > hasEnd.EndTime))
                     continue;
 
-                double time = osuHit.Clock.CurrentTime;
-                double relativetime = time - osuHit.HitObject.StartTime;
-
-                if (time < osuHit.HitObject.StartTime - relax_leniency) continue;
-
-                if ((osuHit.HitObject is IHasEndTime hasEnd && time > hasEnd.EndTime) || osuHit.IsHit)
-                    continue;
-
-                if (osuHit is DrawableHitCircle && osuHit.IsHovered)
+                switch (h)
                 {
-                    Debug.Assert(osuHit.HitObject.HitWindows != null);
-                    requiresHit |= osuHit.HitObject.HitWindows.CanBeHit(relativetime);
-                }
+                    case DrawableHitCircle _:
+                        if (!h.IsHovered)
+                            break;
 
-                requiresHold |= (osuHit is DrawableSlider slider && (slider.Ball.IsHovered || osuHit.IsHovered)) || osuHit is DrawableSpinner;
+                        Debug.Assert(h.HitObject.HitWindows != null);
+                        requiresHit |= h.HitObject.HitWindows.CanBeHit(time - h.HitObject.StartTime);
+                        break;
+
+                    case DrawableSlider slider:
+                        requiresHold |= slider.Ball.IsHovered || h.IsHovered;
+                        break;
+
+                    case DrawableSpinner _:
+                        requiresHold = true;
+                        break;
+                }
             }
 
             if (requiresHit)

From cd2d1b06697d5b49fda11240425b8982d2af66b1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Feb 2020 17:00:55 +0900
Subject: [PATCH 0471/1142] Fix 2B maps not playing correctly with relax mod
 enabled

---
 osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
index 7ebb6fd76d..d971e777ec 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
@@ -43,15 +43,15 @@ namespace osu.Game.Rulesets.Osu.Mods
 
                 switch (h)
                 {
-                    case DrawableHitCircle _:
-                        if (!h.IsHovered)
-                            break;
-
-                        Debug.Assert(h.HitObject.HitWindows != null);
-                        requiresHit |= h.HitObject.HitWindows.CanBeHit(time - h.HitObject.StartTime);
+                    case DrawableHitCircle circle:
+                        handleHitCircle(circle);
                         break;
 
                     case DrawableSlider slider:
+                        // Handles cases like "2B" beatmaps, where sliders may be overlapping and simply holding is not enough.
+                        if (!slider.HeadCircle.IsHit)
+                            handleHitCircle(slider.HeadCircle);
+
                         requiresHold |= slider.Ball.IsHovered || h.IsHovered;
                         break;
 
@@ -68,6 +68,15 @@ namespace osu.Game.Rulesets.Osu.Mods
             }
 
             addAction(requiresHold);
+
+            void handleHitCircle(DrawableHitCircle circle)
+            {
+                if (!circle.IsHovered)
+                    return;
+
+                Debug.Assert(circle.HitObject.HitWindows != null);
+                requiresHit |= circle.HitObject.HitWindows.CanBeHit(time - circle.HitObject.StartTime);
+            }
         }
 
         private bool wasHit;

From 4ce687d608badbf3828992852e4070dcfb978cf4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Feb 2020 17:03:23 +0900
Subject: [PATCH 0472/1142] Move public methods up

---
 osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs | 24 +++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
index d971e777ec..f874bc271f 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
@@ -24,6 +24,18 @@ namespace osu.Game.Rulesets.Osu.Mods
         /// </summary>
         private const float relax_leniency = 3;
 
+        private bool wasHit;
+        private bool wasLeft;
+
+        private OsuInputManager osuInputManager;
+
+        public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
+        {
+            // grab the input manager for future use.
+            osuInputManager = (OsuInputManager)drawableRuleset.KeyBindingInputManager;
+            osuInputManager.AllowUserPresses = false;
+        }
+
         public void Update(Playfield playfield)
         {
             bool requiresHold = false;
@@ -79,11 +91,6 @@ namespace osu.Game.Rulesets.Osu.Mods
             }
         }
 
-        private bool wasHit;
-        private bool wasLeft;
-
-        private OsuInputManager osuInputManager;
-
         private void addAction(bool hitting)
         {
             if (wasHit == hitting)
@@ -104,12 +111,5 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             state.Apply(osuInputManager.CurrentState, osuInputManager);
         }
-
-        public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
-        {
-            // grab the input manager for future use.
-            osuInputManager = (OsuInputManager)drawableRuleset.KeyBindingInputManager;
-            osuInputManager.AllowUserPresses = false;
-        }
     }
 }

From 61a7f04efb7036a9998160b73d3f6166a671005c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Feb 2020 17:13:50 +0900
Subject: [PATCH 0473/1142] Add a sane key up delay to relax mod

---
 osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs  | 50 +++++++++++++---------
 osu.Game/Rulesets/Replays/AutoGenerator.cs |  2 +-
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
index f874bc271f..6286c80d7c 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs
@@ -9,6 +9,7 @@ using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.UI;
 using static osu.Game.Input.Handlers.ReplayInputHandler;
 
@@ -24,11 +25,14 @@ namespace osu.Game.Rulesets.Osu.Mods
         /// </summary>
         private const float relax_leniency = 3;
 
-        private bool wasHit;
+        private bool isDownState;
         private bool wasLeft;
 
         private OsuInputManager osuInputManager;
 
+        private ReplayState<OsuAction> state;
+        private double lastStateChangeTime;
+
         public void ApplyToDrawableRuleset(DrawableRuleset<OsuHitObject> drawableRuleset)
         {
             // grab the input manager for future use.
@@ -75,11 +79,14 @@ namespace osu.Game.Rulesets.Osu.Mods
 
             if (requiresHit)
             {
-                addAction(false);
-                addAction(true);
+                changeState(false);
+                changeState(true);
             }
 
-            addAction(requiresHold);
+            if (requiresHold)
+                changeState(true);
+            else if (isDownState && time - lastStateChangeTime > AutoGenerator.KEY_UP_DELAY)
+                changeState(false);
 
             void handleHitCircle(DrawableHitCircle circle)
             {
@@ -89,27 +96,28 @@ namespace osu.Game.Rulesets.Osu.Mods
                 Debug.Assert(circle.HitObject.HitWindows != null);
                 requiresHit |= circle.HitObject.HitWindows.CanBeHit(time - circle.HitObject.StartTime);
             }
-        }
 
-        private void addAction(bool hitting)
-        {
-            if (wasHit == hitting)
-                return;
-
-            wasHit = hitting;
-
-            var state = new ReplayState<OsuAction>
+            void changeState(bool down)
             {
-                PressedActions = new List<OsuAction>()
-            };
+                if (isDownState == down)
+                    return;
 
-            if (hitting)
-            {
-                state.PressedActions.Add(wasLeft ? OsuAction.LeftButton : OsuAction.RightButton);
-                wasLeft = !wasLeft;
+                isDownState = down;
+                lastStateChangeTime = time;
+
+                state = new ReplayState<OsuAction>
+                {
+                    PressedActions = new List<OsuAction>()
+                };
+
+                if (down)
+                {
+                    state.PressedActions.Add(wasLeft ? OsuAction.LeftButton : OsuAction.RightButton);
+                    wasLeft = !wasLeft;
+                }
+
+                state?.Apply(osuInputManager.CurrentState, osuInputManager);
             }
-
-            state.Apply(osuInputManager.CurrentState, osuInputManager);
         }
     }
 }
diff --git a/osu.Game/Rulesets/Replays/AutoGenerator.cs b/osu.Game/Rulesets/Replays/AutoGenerator.cs
index 3319f30a6f..b3c609f2f4 100644
--- a/osu.Game/Rulesets/Replays/AutoGenerator.cs
+++ b/osu.Game/Rulesets/Replays/AutoGenerator.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Replays
         #region Constants
 
         // Shared amongst all modes
-        protected const double KEY_UP_DELAY = 50;
+        public const double KEY_UP_DELAY = 50;
 
         #endregion
 

From 5ec9f454d5f5caf792d287bf34e1524b6410123e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 17:20:38 +0900
Subject: [PATCH 0474/1142] Implement the match beatmap detail area

---
 .../TestSceneMatchBeatmapDetailArea.cs        | 67 +++++++++++++
 .../Multiplayer/TestSceneMatchSongSelect.cs   | 37 +++++++
 .../BeatmapDetailAreaPlaylistTabItem.cs       | 12 +++
 .../Components/MatchBeatmapDetailArea.cs      | 98 +++++++++++++++++++
 osu.Game/Screens/Select/MatchSongSelect.cs    |  3 +-
 5 files changed, 216 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
 create mode 100644 osu.Game/Screens/Multi/Components/BeatmapDetailAreaPlaylistTabItem.cs
 create mode 100644 osu.Game/Screens/Multi/Components/MatchBeatmapDetailArea.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
new file mode 100644
index 0000000000..09d882a265
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
@@ -0,0 +1,67 @@
+// 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.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Screens.Multi.Components;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneMatchBeatmapDetailArea : MultiplayerTestScene
+    {
+        [Resolved]
+        private BeatmapManager beatmapManager { get; set; }
+
+        [Resolved]
+
+        private RulesetStore rulesetStore { get; set; }
+
+        private MatchBeatmapDetailArea detailArea;
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            Room.Playlist.Clear();
+
+            Child = detailArea = new MatchBeatmapDetailArea
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(500),
+                CreateNewItem = createNewItem
+            };
+        });
+
+        private void createNewItem()
+        {
+            var set = beatmapManager.GetAllUsableBeatmapSetsEnumerable().First();
+            var rulesets = rulesetStore.AvailableRulesets.ToList();
+
+            var beatmap = set.Beatmaps[RNG.Next(0, set.Beatmaps.Count)];
+
+            beatmap.BeatmapSet = set;
+            beatmap.Metadata = set.Metadata;
+
+            Room.Playlist.Add(new PlaylistItem
+            {
+                ID = Room.Playlist.Count,
+                Beatmap = { Value = beatmap },
+                Ruleset = { Value = rulesets[RNG.Next(0, rulesets.Count)] },
+                RequiredMods =
+                {
+                    new OsuModHardRock(),
+                    new OsuModDoubleTime(),
+                    new OsuModAutoplay()
+                }
+            });
+        }
+    }
+}
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
new file mode 100644
index 0000000000..f6e4715182
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
@@ -0,0 +1,37 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Game.Beatmaps;
+using osu.Game.Screens.Multi.Components;
+using osu.Game.Screens.Select;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneMatchSongSelect : MultiplayerTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(MatchSongSelect),
+            typeof(MatchBeatmapDetailArea),
+        };
+
+        [Resolved]
+        private BeatmapManager beatmapManager { get; set; }
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            Room.Playlist.Clear();
+        });
+
+        [Test]
+        public void TestLoadSongSelect()
+        {
+            AddStep("create song select", () => LoadScreen(new MatchSongSelect()));
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/Components/BeatmapDetailAreaPlaylistTabItem.cs b/osu.Game/Screens/Multi/Components/BeatmapDetailAreaPlaylistTabItem.cs
new file mode 100644
index 0000000000..3f2ab28f1a
--- /dev/null
+++ b/osu.Game/Screens/Multi/Components/BeatmapDetailAreaPlaylistTabItem.cs
@@ -0,0 +1,12 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Screens.Select;
+
+namespace osu.Game.Screens.Multi.Components
+{
+    public class BeatmapDetailAreaPlaylistTabItem : BeatmapDetailAreaTabItem
+    {
+        public override string Name => "Playlist";
+    }
+}
diff --git a/osu.Game/Screens/Multi/Components/MatchBeatmapDetailArea.cs b/osu.Game/Screens/Multi/Components/MatchBeatmapDetailArea.cs
new file mode 100644
index 0000000000..8e085d6979
--- /dev/null
+++ b/osu.Game/Screens/Multi/Components/MatchBeatmapDetailArea.cs
@@ -0,0 +1,98 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Screens.Select;
+using osuTK;
+
+namespace osu.Game.Screens.Multi.Components
+{
+    public class MatchBeatmapDetailArea : BeatmapDetailArea
+    {
+        public Action CreateNewItem;
+
+        public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
+
+        [Resolved(typeof(Room))]
+        protected BindableList<PlaylistItem> Playlist { get; private set; }
+
+        private readonly Drawable playlistArea;
+        private readonly DrawableRoomPlaylist playlist;
+
+        public MatchBeatmapDetailArea()
+        {
+            Add(playlistArea = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Padding = new MarginPadding { Vertical = 10 },
+                Child = new GridContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Content = new[]
+                    {
+                        new Drawable[]
+                        {
+                            new Container
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Padding = new MarginPadding { Bottom = 10 },
+                                Child = playlist = new DrawableRoomPlaylist(true, false)
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                }
+                            }
+                        },
+                        new Drawable[]
+                        {
+                            new TriangleButton
+                            {
+                                Text = "create new item",
+                                RelativeSizeAxes = Axes.Both,
+                                Size = Vector2.One,
+                                Action = () => CreateNewItem?.Invoke()
+                            }
+                        },
+                    },
+                    RowDimensions = new[]
+                    {
+                        new Dimension(),
+                        new Dimension(GridSizeMode.Absolute, 50),
+                    }
+                }
+            });
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            playlist.Items.BindTo(Playlist);
+            playlist.SelectedItem.BindTo(SelectedItem);
+        }
+
+        protected override void OnTabChanged(BeatmapDetailAreaTabItem tab, bool selectedMods)
+        {
+            base.OnTabChanged(tab, selectedMods);
+
+            switch (tab)
+            {
+                case BeatmapDetailAreaPlaylistTabItem _:
+                    playlistArea.Show();
+                    break;
+
+                default:
+                    playlistArea.Hide();
+                    break;
+            }
+        }
+
+        protected override BeatmapDetailAreaTabItem[] CreateTabItems() => base.CreateTabItems().Prepend(new BeatmapDetailAreaPlaylistTabItem()).ToArray();
+    }
+}
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index 826677ee30..94d65889d1 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -12,6 +12,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Multi;
+using osu.Game.Screens.Multi.Components;
 
 namespace osu.Game.Screens.Select
 {
@@ -35,7 +36,7 @@ namespace osu.Game.Screens.Select
             Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
         }
 
-        protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea(); // Todo: Temporary
+        protected override BeatmapDetailArea CreateBeatmapDetailArea() => new MatchBeatmapDetailArea();
 
         protected override bool OnStart()
         {

From 66910f1ee3489ed83890b772599e6ce02475a30e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Feb 2020 17:50:53 +0900
Subject: [PATCH 0475/1142] Remove unnecessary bindable setter

---
 osu.Game/Screens/Select/BeatmapDetailArea.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapDetailArea.cs b/osu.Game/Screens/Select/BeatmapDetailArea.cs
index 1aae0cc243..2e78b1aed2 100644
--- a/osu.Game/Screens/Select/BeatmapDetailArea.cs
+++ b/osu.Game/Screens/Select/BeatmapDetailArea.cs
@@ -28,11 +28,7 @@ namespace osu.Game.Screens.Select
 
         public readonly BeatmapDetails Details;
 
-        protected Bindable<BeatmapDetailAreaTabItem> CurrentTab
-        {
-            get => tabControl.Current;
-            set => tabControl.Current = value;
-        }
+        protected Bindable<BeatmapDetailAreaTabItem> CurrentTab => tabControl.Current;
 
         private readonly Container content;
         protected override Container<Drawable> Content => content;

From f0f739707f2e9a91cc4d64096afe4aae1e8a5ab0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 17:51:42 +0900
Subject: [PATCH 0476/1142] Add playlist support to match song select

---
 .../Multiplayer/TestSceneMatchSongSelect.cs   | 101 +++++++++++++++++-
 osu.Game/Screens/Select/MatchSongSelect.cs    |  42 +++-----
 2 files changed, 114 insertions(+), 29 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
index f6e4715182..434b265f9c 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
@@ -3,9 +3,19 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Extensions;
+using osu.Framework.Platform;
+using osu.Framework.Screens;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Select;
 
@@ -22,6 +32,72 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
+        private BeatmapManager manager;
+
+        private RulesetStore rulesets;
+
+        private TestMatchSongSelect songSelect;
+
+        [BackgroundDependencyLoader]
+        private void load(GameHost host, AudioManager audio)
+        {
+            Dependencies.Cache(rulesets = new RulesetStore(ContextFactory));
+            Dependencies.Cache(manager = new BeatmapManager(LocalStorage, ContextFactory, rulesets, null, audio, host, Beatmap.Default));
+
+            var beatmaps = new List<BeatmapInfo>();
+
+            for (int i = 0; i < 6; i++)
+            {
+                int beatmapId = 10 * 10 + i;
+
+                int length = RNG.Next(30000, 200000);
+                double bpm = RNG.NextSingle(80, 200);
+
+                beatmaps.Add(new BeatmapInfo
+                {
+                    Ruleset = new OsuRuleset().RulesetInfo,
+                    OnlineBeatmapID = beatmapId,
+                    Path = "normal.osu",
+                    Version = $"{beatmapId} (length {TimeSpan.FromMilliseconds(length):m\\:ss}, bpm {bpm:0.#})",
+                    Length = length,
+                    BPM = bpm,
+                    BaseDifficulty = new BeatmapDifficulty
+                    {
+                        OverallDifficulty = 3.5f,
+                    },
+                });
+            }
+
+            manager.Import(new BeatmapSetInfo
+            {
+                OnlineBeatmapSetID = 10,
+                Hash = new MemoryStream(Encoding.UTF8.GetBytes(Guid.NewGuid().ToString())).ComputeMD5Hash(),
+                Metadata = new BeatmapMetadata
+                {
+                    // Create random metadata, then we can check if sorting works based on these
+                    Artist = "Some Artist " + RNG.Next(0, 9),
+                    Title = $"Some Song (set id 10), max bpm {beatmaps.Max(b => b.BPM):0.#})",
+                    AuthorString = "Some Guy " + RNG.Next(0, 9),
+                },
+                Beatmaps = beatmaps,
+                DateAdded = DateTimeOffset.UtcNow,
+            }).Wait();
+        }
+
+        public override void SetUpSteps()
+        {
+            base.SetUpSteps();
+
+            AddStep("reset", () =>
+            {
+                Ruleset.Value = new OsuRuleset().RulesetInfo;
+                Beatmap.SetDefault();
+            });
+
+            AddStep("create song select", () => LoadScreen(songSelect = new TestMatchSongSelect()));
+            AddUntilStep("wait for present", () => songSelect.IsCurrentScreen());
+        }
+
         [SetUp]
         public void Setup() => Schedule(() =>
         {
@@ -29,9 +105,30 @@ namespace osu.Game.Tests.Visual.Multiplayer
         });
 
         [Test]
-        public void TestLoadSongSelect()
+        public void TestItemAddedIfEmptyOnStart()
         {
-            AddStep("create song select", () => LoadScreen(new MatchSongSelect()));
+            AddStep("finalise selection", () => songSelect.FinaliseSelection());
+            AddAssert("playlist has 1 item", () => Room.Playlist.Count == 1);
+        }
+
+        [Test]
+        public void TestItemAddedWhenCreateNewItemClicked()
+        {
+            AddStep("create new item", () => songSelect.BeatmapDetails.CreateNewItem());
+            AddAssert("playlist has 1 item", () => Room.Playlist.Count == 1);
+        }
+
+        [Test]
+        public void TestItemNotAddedIfExistingOnStart()
+        {
+            AddStep("create new item", () => songSelect.BeatmapDetails.CreateNewItem());
+            AddStep("finalise selection", () => songSelect.FinaliseSelection());
+            AddAssert("playlist has 1 item", () => Room.Playlist.Count == 1);
+        }
+
+        private class TestMatchSongSelect : MatchSongSelect
+        {
+            public new MatchBeatmapDetailArea BeatmapDetails => (MatchBeatmapDetailArea)base.BeatmapDetails;
         }
     }
 }
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index 94d65889d1..4edc968e8a 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Linq;
 using Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -10,7 +9,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Multi;
 using osu.Game.Screens.Multi.Components;
 
@@ -36,42 +34,32 @@ namespace osu.Game.Screens.Select
             Padding = new MarginPadding { Horizontal = HORIZONTAL_OVERFLOW_PADDING };
         }
 
-        protected override BeatmapDetailArea CreateBeatmapDetailArea() => new MatchBeatmapDetailArea();
+        protected override BeatmapDetailArea CreateBeatmapDetailArea() => new MatchBeatmapDetailArea
+        {
+            CreateNewItem = createNewItem
+        };
 
         protected override bool OnStart()
         {
-            var item = new PlaylistItem
-            {
-                Beatmap = { Value = Beatmap.Value.BeatmapInfo },
-                Ruleset = { Value = Ruleset.Value },
-                RulesetID = Ruleset.Value.ID ?? 0
-            };
+            if (Playlist.Count == 0)
+                createNewItem();
 
-            item.RequiredMods.AddRange(Mods.Value);
-
-            Selected?.Invoke(item);
-
-            if (this.IsCurrentScreen())
-                this.Exit();
+            this.Exit();
 
             return true;
         }
 
-        public override bool OnExiting(IScreen next)
+        private void createNewItem()
         {
-            if (base.OnExiting(next))
-                return true;
-
-            var firstItem = Playlist.FirstOrDefault();
-
-            if (firstItem != null)
+            PlaylistItem item = new PlaylistItem
             {
-                Ruleset.Value = firstItem.Ruleset.Value;
-                Beatmap.Value = beatmaps.GetWorkingBeatmap(firstItem.Beatmap.Value);
-                Mods.Value = firstItem.RequiredMods?.ToArray() ?? Array.Empty<Mod>();
-            }
+                Beatmap = { Value = Beatmap.Value.BeatmapInfo },
+                Ruleset = { Value = Ruleset.Value }
+            };
 
-            return false;
+            item.RequiredMods.AddRange(Mods.Value);
+
+            Playlist.Add(item);
         }
     }
 }

From 32fd713a9d4c4d40a5066e155efc463c207e3701 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 17:57:25 +0900
Subject: [PATCH 0477/1142] Use test beatmap instead of beatmap manager

---
 .../Multiplayer/TestSceneDrawableRoomPlaylist.cs | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index c93d59acdf..4ba802730f 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -9,14 +9,15 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
-using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.Multi;
+using osu.Game.Tests.Beatmaps;
 using osuTK;
 using osuTK.Input;
 
@@ -218,22 +219,13 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 Size = new Vector2(500, 300)
             };
 
-            var beatmapSets = beatmapManager.GetAllUsableBeatmapSets();
-            var rulesets = rulesetStore.AvailableRulesets.ToList();
-
             for (int i = 0; i < 20; i++)
             {
-                var set = beatmapSets[RNG.Next(0, beatmapSets.Count)];
-                var beatmap = set.Beatmaps[RNG.Next(0, set.Beatmaps.Count)];
-
-                beatmap.BeatmapSet = set;
-                beatmap.Metadata = set.Metadata;
-
                 playlist.Items.Add(new PlaylistItem
                 {
                     ID = i,
-                    Beatmap = { Value = beatmap },
-                    Ruleset = { Value = rulesets[RNG.Next(0, rulesets.Count)] },
+                    Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
+                    Ruleset = { Value = new OsuRuleset().RulesetInfo },
                     RequiredMods =
                     {
                         new OsuModHardRock(),

From de646649def7d7ca2d0322ab925f386c46343e63 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 17:59:14 +0900
Subject: [PATCH 0478/1142] Use test beatmap instead of beatmap manager

---
 .../TestSceneMatchBeatmapDetailArea.cs        | 30 ++++---------------
 1 file changed, 5 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
index 09d882a265..13fcc18e56 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
@@ -1,37 +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 System.Linq;
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-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.Rulesets.Osu.Mods;
 using osu.Game.Screens.Multi.Components;
+using osu.Game.Tests.Beatmaps;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneMatchBeatmapDetailArea : MultiplayerTestScene
     {
-        [Resolved]
-        private BeatmapManager beatmapManager { get; set; }
-
-        [Resolved]
-
-        private RulesetStore rulesetStore { get; set; }
-
-        private MatchBeatmapDetailArea detailArea;
-
         [SetUp]
         public void Setup() => Schedule(() =>
         {
             Room.Playlist.Clear();
 
-            Child = detailArea = new MatchBeatmapDetailArea
+            Child = new MatchBeatmapDetailArea
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
@@ -42,19 +30,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private void createNewItem()
         {
-            var set = beatmapManager.GetAllUsableBeatmapSetsEnumerable().First();
-            var rulesets = rulesetStore.AvailableRulesets.ToList();
-
-            var beatmap = set.Beatmaps[RNG.Next(0, set.Beatmaps.Count)];
-
-            beatmap.BeatmapSet = set;
-            beatmap.Metadata = set.Metadata;
-
             Room.Playlist.Add(new PlaylistItem
             {
                 ID = Room.Playlist.Count,
-                Beatmap = { Value = beatmap },
-                Ruleset = { Value = rulesets[RNG.Next(0, rulesets.Count)] },
+                Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
+                Ruleset = { Value = new OsuRuleset().RulesetInfo },
                 RequiredMods =
                 {
                     new OsuModHardRock(),

From fbc5ffbadbd27e5856b8c94c6d046a3513b5df16 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 17:59:47 +0900
Subject: [PATCH 0479/1142] Remove now unused members

---
 .../Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs  | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index 4ba802730f..d2d02412cd 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -5,15 +5,12 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
-using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.Multi;
@@ -31,12 +28,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
             typeof(DrawableRoomPlaylistItem)
         };
 
-        [Resolved]
-        private BeatmapManager beatmapManager { get; set; }
-
-        [Resolved]
-        private RulesetStore rulesetStore { get; set; }
-
         private DrawableRoomPlaylist playlist;
 
         [Test]

From be30ef3cca69c1b00beebdf1a579edc5f47f84f9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Feb 2020 18:13:52 +0900
Subject: [PATCH 0480/1142] Move BeatmapMetadataDisplay to its own class

---
 .../Screens/Play/BeatmapMetadataDisplay.cs    | 180 ++++++++++++++++++
 osu.Game/Screens/Play/PlayerLoader.cs         | 163 ----------------
 2 files changed, 180 insertions(+), 163 deletions(-)
 create mode 100644 osu.Game/Screens/Play/BeatmapMetadataDisplay.cs

diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
new file mode 100644
index 0000000000..074341226e
--- /dev/null
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -0,0 +1,180 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Play.HUD;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Play
+{
+    /// <summary>
+    /// Displays beatmap metadata inside <see cref="PlayerLoader"/>
+    /// </summary>
+    public class BeatmapMetadataDisplay : Container
+    {
+        private class MetadataLine : Container
+        {
+            public MetadataLine(string left, string right)
+            {
+                AutoSizeAxes = Axes.Both;
+                Children = new Drawable[]
+                {
+                    new OsuSpriteText
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopRight,
+                        Margin = new MarginPadding { Right = 5 },
+                        Colour = OsuColour.Gray(0.8f),
+                        Text = left,
+                    },
+                    new OsuSpriteText
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopLeft,
+                        Margin = new MarginPadding { Left = 5 },
+                        Text = string.IsNullOrEmpty(right) ? @"-" : right,
+                    }
+                };
+            }
+        }
+
+        private readonly WorkingBeatmap beatmap;
+        private readonly Bindable<IReadOnlyList<Mod>> mods;
+        private readonly Drawable facade;
+        private LoadingAnimation loading;
+        private Sprite backgroundSprite;
+
+        public IBindable<IReadOnlyList<Mod>> Mods => mods;
+
+        public bool Loading
+        {
+            set
+            {
+                if (value)
+                {
+                    loading.Show();
+                    backgroundSprite.FadeColour(OsuColour.Gray(0.5f), 400, Easing.OutQuint);
+                }
+                else
+                {
+                    loading.Hide();
+                    backgroundSprite.FadeColour(Color4.White, 400, Easing.OutQuint);
+                }
+            }
+        }
+
+        public BeatmapMetadataDisplay(WorkingBeatmap beatmap, Bindable<IReadOnlyList<Mod>> mods, Drawable facade)
+        {
+            this.beatmap = beatmap;
+            this.facade = facade;
+
+            this.mods = new Bindable<IReadOnlyList<Mod>>();
+            this.mods.BindTo(mods);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            var metadata = beatmap.BeatmapInfo?.Metadata ?? new BeatmapMetadata();
+
+            AutoSizeAxes = Axes.Both;
+            Children = new Drawable[]
+            {
+                new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Origin = Anchor.TopCentre,
+                    Anchor = Anchor.TopCentre,
+                    Direction = FillDirection.Vertical,
+                    Children = new[]
+                    {
+                        facade.With(d =>
+                        {
+                            d.Anchor = Anchor.TopCentre;
+                            d.Origin = Anchor.TopCentre;
+                        }),
+                        new OsuSpriteText
+                        {
+                            Text = new LocalisedString((metadata.TitleUnicode, metadata.Title)),
+                            Font = OsuFont.GetFont(size: 36, italics: true),
+                            Origin = Anchor.TopCentre,
+                            Anchor = Anchor.TopCentre,
+                            Margin = new MarginPadding { Top = 15 },
+                        },
+                        new OsuSpriteText
+                        {
+                            Text = new LocalisedString((metadata.ArtistUnicode, metadata.Artist)),
+                            Font = OsuFont.GetFont(size: 26, italics: true),
+                            Origin = Anchor.TopCentre,
+                            Anchor = Anchor.TopCentre,
+                        },
+                        new Container
+                        {
+                            Size = new Vector2(300, 60),
+                            Margin = new MarginPadding(10),
+                            Origin = Anchor.TopCentre,
+                            Anchor = Anchor.TopCentre,
+                            CornerRadius = 10,
+                            Masking = true,
+                            Children = new Drawable[]
+                            {
+                                backgroundSprite = new Sprite
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Texture = beatmap?.Background,
+                                    Origin = Anchor.Centre,
+                                    Anchor = Anchor.Centre,
+                                    FillMode = FillMode.Fill,
+                                },
+                                loading = new LoadingAnimation { Scale = new Vector2(1.3f) }
+                            }
+                        },
+                        new OsuSpriteText
+                        {
+                            Text = beatmap?.BeatmapInfo?.Version,
+                            Font = OsuFont.GetFont(size: 26, italics: true),
+                            Origin = Anchor.TopCentre,
+                            Anchor = Anchor.TopCentre,
+                            Margin = new MarginPadding
+                            {
+                                Bottom = 40
+                            },
+                        },
+                        new MetadataLine("Source", metadata.Source)
+                        {
+                            Origin = Anchor.TopCentre,
+                            Anchor = Anchor.TopCentre,
+                        },
+                        new MetadataLine("Mapper", metadata.AuthorString)
+                        {
+                            Origin = Anchor.TopCentre,
+                            Anchor = Anchor.TopCentre,
+                        },
+                        new ModDisplay
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            AutoSizeAxes = Axes.Both,
+                            Margin = new MarginPadding { Top = 20 },
+                            Current = mods
+                        }
+                    },
+                }
+            };
+
+            Loading = true;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index f37faac988..ebc2422dc5 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
@@ -12,21 +11,15 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
-using osu.Framework.Localisation;
 using osu.Framework.Screens;
 using osu.Framework.Threading;
-using osu.Game.Beatmaps;
 using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Input;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
-using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Menu;
-using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Play.PlayerSettings;
 using osu.Game.Users;
 using osuTK;
@@ -350,162 +343,6 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        protected class BeatmapMetadataDisplay : Container
-        {
-            private class MetadataLine : Container
-            {
-                public MetadataLine(string left, string right)
-                {
-                    AutoSizeAxes = Axes.Both;
-                    Children = new Drawable[]
-                    {
-                        new OsuSpriteText
-                        {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopRight,
-                            Margin = new MarginPadding { Right = 5 },
-                            Colour = OsuColour.Gray(0.8f),
-                            Text = left,
-                        },
-                        new OsuSpriteText
-                        {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopLeft,
-                            Margin = new MarginPadding { Left = 5 },
-                            Text = string.IsNullOrEmpty(right) ? @"-" : right,
-                        }
-                    };
-                }
-            }
-
-            private readonly WorkingBeatmap beatmap;
-            private readonly Bindable<IReadOnlyList<Mod>> mods;
-            private readonly Drawable facade;
-            private LoadingAnimation loading;
-            private Sprite backgroundSprite;
-
-            public IBindable<IReadOnlyList<Mod>> Mods => mods;
-
-            public bool Loading
-            {
-                set
-                {
-                    if (value)
-                    {
-                        loading.Show();
-                        backgroundSprite.FadeColour(OsuColour.Gray(0.5f), 400, Easing.OutQuint);
-                    }
-                    else
-                    {
-                        loading.Hide();
-                        backgroundSprite.FadeColour(Color4.White, 400, Easing.OutQuint);
-                    }
-                }
-            }
-
-            public BeatmapMetadataDisplay(WorkingBeatmap beatmap, Bindable<IReadOnlyList<Mod>> mods, Drawable facade)
-            {
-                this.beatmap = beatmap;
-                this.facade = facade;
-
-                this.mods = new Bindable<IReadOnlyList<Mod>>();
-                this.mods.BindTo(mods);
-            }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                var metadata = beatmap.BeatmapInfo?.Metadata ?? new BeatmapMetadata();
-
-                AutoSizeAxes = Axes.Both;
-                Children = new Drawable[]
-                {
-                    new FillFlowContainer
-                    {
-                        AutoSizeAxes = Axes.Both,
-                        Origin = Anchor.TopCentre,
-                        Anchor = Anchor.TopCentre,
-                        Direction = FillDirection.Vertical,
-                        Children = new[]
-                        {
-                            facade.With(d =>
-                            {
-                                d.Anchor = Anchor.TopCentre;
-                                d.Origin = Anchor.TopCentre;
-                            }),
-                            new OsuSpriteText
-                            {
-                                Text = new LocalisedString((metadata.TitleUnicode, metadata.Title)),
-                                Font = OsuFont.GetFont(size: 36, italics: true),
-                                Origin = Anchor.TopCentre,
-                                Anchor = Anchor.TopCentre,
-                                Margin = new MarginPadding { Top = 15 },
-                            },
-                            new OsuSpriteText
-                            {
-                                Text = new LocalisedString((metadata.ArtistUnicode, metadata.Artist)),
-                                Font = OsuFont.GetFont(size: 26, italics: true),
-                                Origin = Anchor.TopCentre,
-                                Anchor = Anchor.TopCentre,
-                            },
-                            new Container
-                            {
-                                Size = new Vector2(300, 60),
-                                Margin = new MarginPadding(10),
-                                Origin = Anchor.TopCentre,
-                                Anchor = Anchor.TopCentre,
-                                CornerRadius = 10,
-                                Masking = true,
-                                Children = new Drawable[]
-                                {
-                                    backgroundSprite = new Sprite
-                                    {
-                                        RelativeSizeAxes = Axes.Both,
-                                        Texture = beatmap?.Background,
-                                        Origin = Anchor.Centre,
-                                        Anchor = Anchor.Centre,
-                                        FillMode = FillMode.Fill,
-                                    },
-                                    loading = new LoadingAnimation { Scale = new Vector2(1.3f) }
-                                }
-                            },
-                            new OsuSpriteText
-                            {
-                                Text = beatmap?.BeatmapInfo?.Version,
-                                Font = OsuFont.GetFont(size: 26, italics: true),
-                                Origin = Anchor.TopCentre,
-                                Anchor = Anchor.TopCentre,
-                                Margin = new MarginPadding
-                                {
-                                    Bottom = 40
-                                },
-                            },
-                            new MetadataLine("Source", metadata.Source)
-                            {
-                                Origin = Anchor.TopCentre,
-                                Anchor = Anchor.TopCentre,
-                            },
-                            new MetadataLine("Mapper", metadata.AuthorString)
-                            {
-                                Origin = Anchor.TopCentre,
-                                Anchor = Anchor.TopCentre,
-                            },
-                            new ModDisplay
-                            {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
-                                AutoSizeAxes = Axes.Both,
-                                Margin = new MarginPadding { Top = 20 },
-                                Current = mods
-                            }
-                        },
-                    }
-                };
-
-                Loading = true;
-            }
-        }
-
         private class MutedNotification : SimpleNotification
         {
             public MutedNotification()

From b69d1ad678b9052091777aad6669ac4e643d3513 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Feb 2020 18:22:57 +0900
Subject: [PATCH 0481/1142] Reorder and clean up PlayerLoader

---
 osu.Game/Screens/Play/PlayerLoader.cs | 308 +++++++++++++-------------
 1 file changed, 158 insertions(+), 150 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index ebc2422dc5..6e968de397 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -31,30 +31,60 @@ namespace osu.Game.Screens.Play
     {
         protected const float BACKGROUND_BLUR = 15;
 
+        public override bool HideOverlaysOnEnter => hideOverlays;
+
+        public override bool DisallowExternalBeatmapRulesetChanges => true;
+
+        // Here because IsHovered will not update unless we do so.
+        public override bool HandlePositionalInput => true;
+
+        // We show the previous screen status
+        protected override UserActivity InitialActivity => null;
+
+        protected override bool PlayResumeSound => false;
+
+        protected BeatmapMetadataDisplay MetadataInfo;
+
+        protected VisualSettings VisualSettings;
+
+        protected Task LoadTask { get; private set; }
+
+        protected Task DisposalTask { get; private set; }
+
+        private bool backgroundBrightnessReduction;
+
+        protected bool BackgroundBrightnessReduction
+        {
+            set
+            {
+                if (value == backgroundBrightnessReduction)
+                    return;
+
+                backgroundBrightnessReduction = value;
+
+                Background.FadeColour(OsuColour.Gray(backgroundBrightnessReduction ? 0.8f : 1), 200);
+            }
+        }
+
+        private bool readyForPush =>
+            player.LoadState == LoadState.Ready && (IsHovered || idleTracker.IsIdle.Value) && inputManager?.DraggedDrawable == null;
+
         private readonly Func<Player> createPlayer;
 
         private Player player;
 
         private LogoTrackingContainer content;
 
-        protected BeatmapMetadataDisplay MetadataInfo;
-
         private bool hideOverlays;
-        public override bool HideOverlaysOnEnter => hideOverlays;
-
-        protected override UserActivity InitialActivity => null; //shows the previous screen status
-
-        public override bool DisallowExternalBeatmapRulesetChanges => true;
-
-        protected override bool PlayResumeSound => false;
-
-        protected Task LoadTask { get; private set; }
-
-        protected Task DisposalTask { get; private set; }
 
         private InputManager inputManager;
+
         private IdleTracker idleTracker;
 
+        private Bindable<bool> muteWarningShownOnce;
+
+        private ScheduledDelegate scheduledPushPlayer;
+
         [Resolved(CanBeNull = true)]
         private NotificationOverlay notificationOverlay { get; set; }
 
@@ -64,19 +94,11 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private AudioManager audioManager { get; set; }
 
-        private Bindable<bool> muteWarningShownOnce;
-
         public PlayerLoader(Func<Player> createPlayer)
         {
             this.createPlayer = createPlayer;
         }
 
-        private void restartRequested()
-        {
-            hideOverlays = true;
-            ValidForResume = true;
-        }
-
         [BackgroundDependencyLoader]
         private void load(SessionStatics sessionStatics)
         {
@@ -124,7 +146,7 @@ namespace osu.Game.Screens.Play
         {
             base.OnEntering(last);
 
-            loadNewPlayer();
+            prepareNewPlayer();
 
             content.ScaleTo(0.7f);
             Background?.FadeColour(Color4.White, 800, Easing.OutQuint);
@@ -153,36 +175,32 @@ namespace osu.Game.Screens.Play
 
             MetadataInfo.Loading = true;
 
-            //we will only be resumed if the player has requested a re-run (see ValidForResume setting above)
-            loadNewPlayer();
+            // we will only be resumed if the player has requested a re-run (see restartRequested).
+            prepareNewPlayer();
 
             this.Delay(400).Schedule(pushWhenLoaded);
         }
 
-        private void loadNewPlayer()
+        public override void OnSuspending(IScreen next)
         {
-            var restartCount = player?.RestartCount + 1 ?? 0;
+            base.OnSuspending(next);
 
-            player = createPlayer();
-            player.RestartCount = restartCount;
-            player.RestartRequested = restartRequested;
+            cancelLoad();
 
-            LoadTask = LoadComponentAsync(player, _ => MetadataInfo.Loading = false);
+            BackgroundBrightnessReduction = false;
         }
 
-        private void contentIn()
+        public override bool OnExiting(IScreen next)
         {
-            content.ScaleTo(1, 650, Easing.OutQuint);
-            content.FadeInFromZero(400);
-        }
+            cancelLoad();
 
-        private void contentOut()
-        {
-            // Ensure the logo is no longer tracking before we scale the content
-            content.StopTracking();
+            content.ScaleTo(0.7f, 150, Easing.InQuint);
+            this.FadeOut(150);
 
-            content.ScaleTo(0.7f, 300, Easing.InQuint);
-            content.FadeOut(250);
+            Background.EnableUserDim.Value = false;
+            BackgroundBrightnessReduction = false;
+
+            return base.OnExiting(next);
         }
 
         protected override void LogoArriving(OsuLogo logo, bool resuming)
@@ -191,10 +209,7 @@ namespace osu.Game.Screens.Play
 
             const double duration = 300;
 
-            if (!resuming)
-            {
-                logo.MoveTo(new Vector2(0.5f), duration, Easing.In);
-            }
+            if (!resuming) logo.MoveTo(new Vector2(0.5f), duration, Easing.In);
 
             logo.ScaleTo(new Vector2(0.15f), duration, Easing.In);
             logo.FadeIn(350);
@@ -212,110 +227,6 @@ namespace osu.Game.Screens.Play
             content.StopTracking();
         }
 
-        private ScheduledDelegate pushDebounce;
-        protected VisualSettings VisualSettings;
-
-        // Here because IsHovered will not update unless we do so.
-        public override bool HandlePositionalInput => true;
-
-        private bool readyForPush => player.LoadState == LoadState.Ready && (IsHovered || idleTracker.IsIdle.Value) && inputManager?.DraggedDrawable == null;
-
-        private void pushWhenLoaded()
-        {
-            if (!this.IsCurrentScreen()) return;
-
-            try
-            {
-                if (!readyForPush)
-                {
-                    // as the pushDebounce below has a delay, we need to keep checking and cancel a future debounce
-                    // if we become unready for push during the delay.
-                    cancelLoad();
-                    return;
-                }
-
-                if (pushDebounce != null)
-                    return;
-
-                pushDebounce = Scheduler.AddDelayed(() =>
-                {
-                    contentOut();
-
-                    this.Delay(250).Schedule(() =>
-                    {
-                        if (!this.IsCurrentScreen()) return;
-
-                        LoadTask = null;
-
-                        //By default, we want to load the player and never be returned to.
-                        //Note that this may change if the player we load requested a re-run.
-                        ValidForResume = false;
-
-                        if (player.LoadedBeatmapSuccessfully)
-                            this.Push(player);
-                        else
-                            this.Exit();
-                    });
-                }, 500);
-            }
-            finally
-            {
-                Schedule(pushWhenLoaded);
-            }
-        }
-
-        private void cancelLoad()
-        {
-            pushDebounce?.Cancel();
-            pushDebounce = null;
-        }
-
-        public override void OnSuspending(IScreen next)
-        {
-            BackgroundBrightnessReduction = false;
-            base.OnSuspending(next);
-            cancelLoad();
-        }
-
-        public override bool OnExiting(IScreen next)
-        {
-            content.ScaleTo(0.7f, 150, Easing.InQuint);
-            this.FadeOut(150);
-            cancelLoad();
-
-            Background.EnableUserDim.Value = false;
-            BackgroundBrightnessReduction = false;
-
-            return base.OnExiting(next);
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            if (isDisposing)
-            {
-                // if the player never got pushed, we should explicitly dispose it.
-                DisposalTask = LoadTask?.ContinueWith(_ => player.Dispose());
-            }
-        }
-
-        private bool backgroundBrightnessReduction;
-
-        protected bool BackgroundBrightnessReduction
-        {
-            get => backgroundBrightnessReduction;
-            set
-            {
-                if (value == backgroundBrightnessReduction)
-                    return;
-
-                backgroundBrightnessReduction = value;
-
-                Background.FadeColour(OsuColour.Gray(backgroundBrightnessReduction ? 0.8f : 1), 200);
-            }
-        }
-
         protected override void Update()
         {
             base.Update();
@@ -343,15 +254,112 @@ namespace osu.Game.Screens.Play
             }
         }
 
+        private void prepareNewPlayer()
+        {
+            var restartCount = player?.RestartCount + 1 ?? 0;
+
+            player = createPlayer();
+            player.RestartCount = restartCount;
+            player.RestartRequested = restartRequested;
+
+            LoadTask = LoadComponentAsync(player, _ => MetadataInfo.Loading = false);
+        }
+
+        private void restartRequested()
+        {
+            hideOverlays = true;
+            ValidForResume = true;
+        }
+
+        private void contentIn()
+        {
+            content.ScaleTo(1, 650, Easing.OutQuint);
+            content.FadeInFromZero(400);
+        }
+
+        private void contentOut()
+        {
+            // Ensure the logo is no longer tracking before we scale the content
+            content.StopTracking();
+
+            content.ScaleTo(0.7f, 300, Easing.InQuint);
+            content.FadeOut(250);
+        }
+
+        private void pushWhenLoaded()
+        {
+            if (!this.IsCurrentScreen()) return;
+
+            try
+            {
+                if (!readyForPush)
+                {
+                    // as the pushDebounce below has a delay, we need to keep checking and cancel a future debounce
+                    // if we become unready for push during the delay.
+                    cancelLoad();
+                    return;
+                }
+
+                if (scheduledPushPlayer != null)
+                    return;
+
+                scheduledPushPlayer = Scheduler.AddDelayed(() =>
+                {
+                    contentOut();
+
+                    this.Delay(250).Schedule(() =>
+                    {
+                        if (!this.IsCurrentScreen()) return;
+
+                        LoadTask = null;
+
+                        //By default, we want to load the player and never be returned to.
+                        //Note that this may change if the player we load requested a re-run.
+                        ValidForResume = false;
+
+                        if (player.LoadedBeatmapSuccessfully)
+                            this.Push(player);
+                        else
+                            this.Exit();
+                    });
+                }, 500);
+            }
+            finally
+            {
+                Schedule(pushWhenLoaded);
+            }
+        }
+
+        private void cancelLoad()
+        {
+            scheduledPushPlayer?.Cancel();
+            scheduledPushPlayer = null;
+        }
+
+        #region Disposal
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (isDisposing)
+            {
+                // if the player never got pushed, we should explicitly dispose it.
+                DisposalTask = LoadTask?.ContinueWith(_ => player.Dispose());
+            }
+        }
+
+        #endregion
+
         private class MutedNotification : SimpleNotification
         {
+            public override bool IsImportant => true;
+
             public MutedNotification()
             {
                 Text = "Your music volume is set to 0%! Click here to restore it.";
             }
 
-            public override bool IsImportant => true;
-
             [BackgroundDependencyLoader]
             private void load(OsuColour colours, AudioManager audioManager, NotificationOverlay notificationOverlay, VolumeOverlay volumeOverlay)
             {

From 2808f8167dd40866481315156fd3b1954614f6ef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Feb 2020 18:28:58 +0900
Subject: [PATCH 0482/1142] Use more regions

---
 osu.Game/Screens/Play/PlayerLoader.cs | 35 ++++++++++++++++++---------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 6e968de397..01873f7114 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -81,8 +81,6 @@ namespace osu.Game.Screens.Play
 
         private IdleTracker idleTracker;
 
-        private Bindable<bool> muteWarningShownOnce;
-
         private ScheduledDelegate scheduledPushPlayer;
 
         [Resolved(CanBeNull = true)]
@@ -142,6 +140,8 @@ namespace osu.Game.Screens.Play
             inputManager = GetContainingInputManager();
         }
 
+        #region Screen handling
+
         public override void OnEntering(IScreen last)
         {
             base.OnEntering(last);
@@ -156,15 +156,7 @@ namespace osu.Game.Screens.Play
             MetadataInfo.Delay(750).FadeIn(500);
             this.Delay(1800).Schedule(pushWhenLoaded);
 
-            if (!muteWarningShownOnce.Value)
-            {
-                //Checks if the notification has not been shown yet and also if master volume is muted, track/music volume is muted or if the whole game is muted.
-                if (volumeOverlay?.IsMuted.Value == true || audioManager.Volume.Value <= audioManager.Volume.MinValue || audioManager.VolumeTrack.Value <= audioManager.VolumeTrack.MinValue)
-                {
-                    notificationOverlay?.Post(new MutedNotification());
-                    muteWarningShownOnce.Value = true;
-                }
-            }
+            showMuteWarningIfNeeded();
         }
 
         public override void OnResuming(IScreen last)
@@ -227,6 +219,8 @@ namespace osu.Game.Screens.Play
             content.StopTracking();
         }
 
+        #endregion
+
         protected override void Update()
         {
             base.Update();
@@ -351,6 +345,23 @@ namespace osu.Game.Screens.Play
 
         #endregion
 
+        #region Mute warning
+
+        private Bindable<bool> muteWarningShownOnce;
+
+        private void showMuteWarningIfNeeded()
+        {
+            if (!muteWarningShownOnce.Value)
+            {
+                //Checks if the notification has not been shown yet and also if master volume is muted, track/music volume is muted or if the whole game is muted.
+                if (volumeOverlay?.IsMuted.Value == true || audioManager.Volume.Value <= audioManager.Volume.MinValue || audioManager.VolumeTrack.Value <= audioManager.VolumeTrack.MinValue)
+                {
+                    notificationOverlay?.Post(new MutedNotification());
+                    muteWarningShownOnce.Value = true;
+                }
+            }
+        }
+
         private class MutedNotification : SimpleNotification
         {
             public override bool IsImportant => true;
@@ -378,5 +389,7 @@ namespace osu.Game.Screens.Play
                 };
             }
         }
+
+        #endregion
     }
 }

From 47325601f42a293d6b259e27489cfedf7b72e807 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Feb 2020 19:02:11 +0900
Subject: [PATCH 0483/1142] Add failing test

---
 .../Visual/Gameplay/TestScenePlayerLoader.cs  | 37 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 33ecbed62e..4f19067126 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -91,9 +91,44 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddStep("load dummy beatmap", () => ResetPlayer(false));
             AddUntilStep("wait for current", () => loader.IsCurrentScreen());
-            AddRepeatStep("move mouse", () => InputManager.MoveMouseTo(loader.VisualSettings.ScreenSpaceDrawQuad.TopLeft + (loader.VisualSettings.ScreenSpaceDrawQuad.BottomRight - loader.VisualSettings.ScreenSpaceDrawQuad.TopLeft) * RNG.NextSingle()), 20);
+
+            AddUntilStep("wait for load ready", () =>
+            {
+                moveMouse();
+                return player.LoadState == LoadState.Ready;
+            });
+            AddRepeatStep("move mouse", moveMouse, 20);
+
             AddAssert("loader still active", () => loader.IsCurrentScreen());
             AddUntilStep("loads after idle", () => !loader.IsCurrentScreen());
+
+            void moveMouse()
+            {
+                InputManager.MoveMouseTo(
+                    loader.VisualSettings.ScreenSpaceDrawQuad.TopLeft
+                    + (loader.VisualSettings.ScreenSpaceDrawQuad.BottomRight - loader.VisualSettings.ScreenSpaceDrawQuad.TopLeft)
+                    * RNG.NextSingle());
+            }
+        }
+
+        [Test]
+        public void TestBlockLoadViaFocus()
+        {
+            OsuFocusedOverlayContainer overlay = null;
+
+            AddStep("load dummy beatmap", () => ResetPlayer(false));
+            AddUntilStep("wait for current", () => loader.IsCurrentScreen());
+
+            AddStep("show focused overlay", () => { container.Add(overlay = new ChangelogOverlay { State = { Value = Visibility.Visible } }); });
+            AddUntilStep("overlay visible", () => overlay.IsPresent);
+
+            AddUntilStep("wait for load ready", () => player.LoadState == LoadState.Ready);
+            AddRepeatStep("twiddle thumbs", () => { }, 20);
+
+            AddAssert("loader still active", () => loader.IsCurrentScreen());
+
+            AddStep("hide overlay", () => overlay.Hide());
+            AddUntilStep("loads after idle", () => !loader.IsCurrentScreen());
         }
 
         [Test]

From 4d4ec3515d50bb184d33ab053d06b5d0ff17ca36 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Feb 2020 19:02:37 +0900
Subject: [PATCH 0484/1142] Fix player loading sequence continuing even when a
 priority overlay is visible

---
 osu.Game/Screens/Play/PlayerLoader.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/PlayerLoader.cs b/osu.Game/Screens/Play/PlayerLoader.cs
index 01873f7114..c0d88feda2 100644
--- a/osu.Game/Screens/Play/PlayerLoader.cs
+++ b/osu.Game/Screens/Play/PlayerLoader.cs
@@ -67,7 +67,14 @@ namespace osu.Game.Screens.Play
         }
 
         private bool readyForPush =>
-            player.LoadState == LoadState.Ready && (IsHovered || idleTracker.IsIdle.Value) && inputManager?.DraggedDrawable == null;
+            // don't push unless the player is completely loaded
+            player.LoadState == LoadState.Ready
+            // don't push if the user is hovering one of the panes, unless they are idle.
+            && (IsHovered || idleTracker.IsIdle.Value)
+            // don't push if the user is dragging a slider or otherwise.
+            && inputManager?.DraggedDrawable == null
+            // don't push if a focused overlay is visible, like settings.
+            && inputManager?.FocusedDrawable == null;
 
         private readonly Func<Player> createPlayer;
 

From 05c48cd92950b604cff21490f2ead15a91b15c78 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Feb 2020 19:27:32 +0900
Subject: [PATCH 0485/1142] Fix volume mute tests regressing

---
 .../Visual/Gameplay/TestScenePlayerLoader.cs  | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 4f19067126..100f99d130 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -194,13 +194,22 @@ namespace osu.Game.Tests.Visual.Gameplay
         }
 
         [Test]
-        public void TestMutedNotificationMasterVolume() => addVolumeSteps("master volume", () => audioManager.Volume.Value = 0, null, () => audioManager.Volume.IsDefault);
+        public void TestMutedNotificationMasterVolume()
+        {
+            addVolumeSteps("master volume", () => audioManager.Volume.Value = 0, null, () => audioManager.Volume.IsDefault);
+        }
 
         [Test]
-        public void TestMutedNotificationTrackVolume() => addVolumeSteps("music volume", () => audioManager.VolumeTrack.Value = 0, null, () => audioManager.VolumeTrack.IsDefault);
+        public void TestMutedNotificationTrackVolume()
+        {
+            addVolumeSteps("music volume", () => audioManager.VolumeTrack.Value = 0, null, () => audioManager.VolumeTrack.IsDefault);
+        }
 
         [Test]
-        public void TestMutedNotificationMuteButton() => addVolumeSteps("mute button", null, () => container.VolumeOverlay.IsMuted.Value = true, () => !container.VolumeOverlay.IsMuted.Value);
+        public void TestMutedNotificationMuteButton()
+        {
+            addVolumeSteps("mute button", null, () => container.VolumeOverlay.IsMuted.Value = true, () => !container.VolumeOverlay.IsMuted.Value);
+        }
 
         /// <remarks>
         /// Created for avoiding copy pasting code for the same steps.
@@ -214,7 +223,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("reset notification lock", () => sessionStatics.GetBindable<bool>(Static.MutedAudioNotificationShownOnce).Value = false);
 
             AddStep("load player", () => ResetPlayer(false, beforeLoad, afterLoad));
-            AddUntilStep("wait for player", () => player.IsLoaded);
+            AddUntilStep("wait for player", () => player.LoadState == LoadState.Ready);
 
             AddAssert("check for notification", () => container.NotificationOverlay.UnreadCount.Value == 1);
             AddStep("click notification", () =>
@@ -228,6 +237,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             });
 
             AddAssert("check " + volumeName, assert);
+
+            AddUntilStep("wait for player load", () => player.IsLoaded);
         }
 
         private class TestPlayerLoaderContainer : Container

From f31220c1ee7aaf3f559b73248961d79208a089d8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 19:56:01 +0900
Subject: [PATCH 0486/1142] Fix exception when adding duplicate items

---
 .../Visual/Multiplayer/TestSceneMatchSongSelect.cs        | 8 ++++++++
 osu.Game/Screens/Select/MatchSongSelect.cs                | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
index 434b265f9c..5820da811d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
@@ -126,6 +126,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("playlist has 1 item", () => Room.Playlist.Count == 1);
         }
 
+        [Test]
+        public void TestAddSameItemMultipleTimes()
+        {
+            AddStep("create new item", () => songSelect.BeatmapDetails.CreateNewItem());
+            AddStep("create new item", () => songSelect.BeatmapDetails.CreateNewItem());
+            AddAssert("playlist has 2 items", () => Room.Playlist.Count == 2);
+        }
+
         private class TestMatchSongSelect : MatchSongSelect
         {
             public new MatchBeatmapDetailArea BeatmapDetails => (MatchBeatmapDetailArea)base.BeatmapDetails;
diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index 4edc968e8a..cb0d09b6bb 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -53,6 +54,7 @@ namespace osu.Game.Screens.Select
         {
             PlaylistItem item = new PlaylistItem
             {
+                ID = (Playlist.LastOrDefault()?.ID + 1) ?? 0,
                 Beatmap = { Value = Beatmap.Value.BeatmapInfo },
                 Ruleset = { Value = Ruleset.Value }
             };

From 1e80facfe8e67c03d83c3a0ca7c78e152097f3aa Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 20:03:37 +0900
Subject: [PATCH 0487/1142] Add subscreen test scene

---
 .../Multiplayer/TestSceneMatchSubScreen.cs    | 87 +++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
new file mode 100644
index 0000000000..76d950b847
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
@@ -0,0 +1,87 @@
+// 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 NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Beatmaps;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Rulesets;
+using osu.Game.Screens.Multi.Match;
+using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.Select;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneMatchSubScreen : ScreenTestScene
+    {
+        protected override bool UseOnlineAPI => true;
+
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(Screens.Multi.Multiplayer),
+            typeof(MatchSubScreen),
+            typeof(Header),
+            typeof(Footer)
+        };
+
+        [Cached]
+        private readonly Bindable<Room> currentRoom = new Bindable<Room>();
+
+        [Resolved]
+        private BeatmapManager beatmaps { get; set; }
+
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
+        public TestSceneMatchSubScreen()
+        {
+            currentRoom.Value = new Room();
+        }
+
+        [Test]
+        public void TestShowRoom()
+        {
+            AddStep(@"show", () =>
+            {
+                currentRoom.Value.RoomID.Value = 1;
+                currentRoom.Value.Availability.Value = RoomAvailability.Public;
+                currentRoom.Value.Duration.Value = TimeSpan.FromHours(24);
+                currentRoom.Value.Host.Value = new User { Username = "peppy", Id = 2 };
+                currentRoom.Value.Name.Value = "super secret room";
+                currentRoom.Value.Participants.AddRange(new[]
+                {
+                    new User { Username = "peppy", Id = 2 },
+                    new User { Username = "smoogipoo", Id = 1040328 }
+                });
+                currentRoom.Value.Playlist.Add(new PlaylistItem
+                {
+                    Beatmap = { Value = beatmaps.GetAllUsableBeatmapSets()[0].Beatmaps[0] },
+                    Ruleset = { Value = rulesets.GetRuleset(2) },
+                });
+
+                LoadScreen(new MatchSubScreen(currentRoom.Value));
+            });
+        }
+
+        [Test]
+        public void TestShowSettings()
+        {
+            AddStep(@"show", () =>
+            {
+                currentRoom.Value.RoomID.Value = null;
+                LoadScreen(new MatchSubScreen(currentRoom.Value));
+            });
+        }
+
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+        {
+            var dependencies = new CachedModelDependencyContainer<Room>(base.CreateChildDependencies(parent));
+            dependencies.Model.BindTo(currentRoom);
+            return dependencies;
+        }
+    }
+}

From b0793b06edd594f452dbc2b788f8105927884f28 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 20:07:52 +0900
Subject: [PATCH 0488/1142] Re-implement the match header

---
 .../Multiplayer/TestSceneMatchBeatmapPanel.cs |  41 -----
 .../Multiplayer/TestSceneMatchHeader.cs       |   5 +-
 .../Visual/Multiplayer/TestSceneMatchInfo.cs  |  84 ---------
 .../Screens/Multi/Match/Components/Header.cs  | 174 +++++-------------
 .../Match/Components/MatchBeatmapPanel.cs     |  67 -------
 .../Multi/Match/Components/MatchPage.cs       |  28 ---
 .../Multi/Match/Components/MatchTabControl.cs |  66 -------
 .../Screens/Multi/Match/MatchSubScreen.cs     |  24 ---
 8 files changed, 44 insertions(+), 445 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapPanel.cs
 delete mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneMatchInfo.cs
 delete mode 100644 osu.Game/Screens/Multi/Match/Components/MatchBeatmapPanel.cs
 delete mode 100644 osu.Game/Screens/Multi/Match/Components/MatchPage.cs
 delete mode 100644 osu.Game/Screens/Multi/Match/Components/MatchTabControl.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapPanel.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapPanel.cs
deleted file mode 100644
index f014b08325..0000000000
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapPanel.cs
+++ /dev/null
@@ -1,41 +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 System;
-using System.Collections.Generic;
-using osu.Game.Beatmaps;
-using osu.Game.Online.Multiplayer;
-using osu.Game.Screens.Multi.Match.Components;
-using osu.Framework.Graphics;
-using osu.Game.Audio;
-using osu.Framework.Allocation;
-
-namespace osu.Game.Tests.Visual.Multiplayer
-{
-    [Cached(typeof(IPreviewTrackOwner))]
-    public class TestSceneMatchBeatmapPanel : MultiplayerTestScene, IPreviewTrackOwner
-    {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(MatchBeatmapPanel)
-        };
-
-        [Resolved]
-        private PreviewTrackManager previewTrackManager { get; set; }
-
-        public TestSceneMatchBeatmapPanel()
-        {
-            Add(new MatchBeatmapPanel
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-            });
-
-            Room.Playlist.Add(new PlaylistItem { Beatmap = { Value = new BeatmapInfo { OnlineBeatmapID = 1763072 } } });
-            Room.Playlist.Add(new PlaylistItem { Beatmap = { Value = new BeatmapInfo { OnlineBeatmapID = 2101557 } } });
-            Room.Playlist.Add(new PlaylistItem { Beatmap = { Value = new BeatmapInfo { OnlineBeatmapID = 1973466 } } });
-            Room.Playlist.Add(new PlaylistItem { Beatmap = { Value = new BeatmapInfo { OnlineBeatmapID = 2109801 } } });
-            Room.Playlist.Add(new PlaylistItem { Beatmap = { Value = new BeatmapInfo { OnlineBeatmapID = 1922035 } } });
-        }
-    }
-}
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
index 7d7e7f85db..cf40995fc0 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs
@@ -5,10 +5,10 @@ using System;
 using System.Collections.Generic;
 using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Online.Multiplayer.GameTypes;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
@@ -45,7 +45,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 }
             });
 
-            Room.Type.Value = new GameTypeTimeshift();
+            Room.Name.Value = "A very awesome room";
+            Room.Host.Value = new User { Id = 2, Username = "peppy" };
 
             Child = new Header();
         }
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchInfo.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchInfo.cs
deleted file mode 100644
index 6ee9ceb2dd..0000000000
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchInfo.cs
+++ /dev/null
@@ -1,84 +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 System;
-using System.Collections.Generic;
-using NUnit.Framework;
-using osu.Framework.Allocation;
-using osu.Game.Beatmaps;
-using osu.Game.Online.Multiplayer;
-using osu.Game.Online.Multiplayer.RoomStatuses;
-using osu.Game.Rulesets;
-using osu.Game.Screens.Multi.Match.Components;
-
-namespace osu.Game.Tests.Visual.Multiplayer
-{
-    [TestFixture]
-    public class TestSceneMatchInfo : MultiplayerTestScene
-    {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(Info),
-            typeof(HeaderButton),
-            typeof(ReadyButton),
-            typeof(MatchBeatmapPanel)
-        };
-
-        [BackgroundDependencyLoader]
-        private void load(RulesetStore rulesets)
-        {
-            Add(new Info());
-
-            AddStep(@"set name", () => Room.Name.Value = @"Room Name?");
-            AddStep(@"set availability", () => Room.Availability.Value = RoomAvailability.FriendsOnly);
-            AddStep(@"set status", () => Room.Status.Value = new RoomStatusPlaying());
-            AddStep(@"set beatmap", () =>
-            {
-                Room.Playlist.Clear();
-                Room.Playlist.Add(new PlaylistItem
-                {
-                    Beatmap =
-                    {
-                        Value = new BeatmapInfo
-                        {
-                            StarDifficulty = 2.4,
-                            Ruleset = rulesets.GetRuleset(0),
-                            Metadata = new BeatmapMetadata
-                            {
-                                Title = @"My Song",
-                                Artist = @"VisualTests",
-                                AuthorString = @"osu!lazer",
-                            },
-                        }
-                    }
-                });
-            });
-
-            AddStep(@"change name", () => Room.Name.Value = @"Room Name!");
-            AddStep(@"change availability", () => Room.Availability.Value = RoomAvailability.InviteOnly);
-            AddStep(@"change status", () => Room.Status.Value = new RoomStatusOpen());
-            AddStep(@"null beatmap", () => Room.Playlist.Clear());
-            AddStep(@"change beatmap", () =>
-            {
-                Room.Playlist.Clear();
-                Room.Playlist.Add(new PlaylistItem
-                {
-                    Beatmap =
-                    {
-                        Value = new BeatmapInfo
-                        {
-                            StarDifficulty = 4.2,
-                            Ruleset = rulesets.GetRuleset(3),
-                            Metadata = new BeatmapMetadata
-                            {
-                                Title = @"Your Song",
-                                Artist = @"Tester",
-                                AuthorString = @"Someone",
-                            },
-                        }
-                    }
-                });
-            });
-        }
-    }
-}
diff --git a/osu.Game/Screens/Multi/Match/Components/Header.cs b/osu.Game/Screens/Multi/Match/Components/Header.cs
index cf1eb6b6ed..ddbaab1706 100644
--- a/osu.Game/Screens/Multi/Match/Components/Header.cs
+++ b/osu.Game/Screens/Multi/Match/Components/Header.cs
@@ -1,39 +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 System;
-using System.Linq;
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
-using osu.Game.Online.Multiplayer;
-using osu.Game.Overlays.SearchableList;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Screens.Multi.Components;
-using osu.Game.Screens.Play.HUD;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Users.Drawables;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.Multi.Match.Components
 {
     public class Header : MultiplayerComposite
     {
-        public const float HEIGHT = 200;
+        public const float HEIGHT = 50;
 
-        public readonly BindableBool ShowBeatmapPanel = new BindableBool();
-
-        public MatchTabControl Tabs { get; private set; }
-
-        public Action RequestBeatmapSelection;
-
-        private MatchBeatmapPanel beatmapPanel;
-        private ModDisplay modDisplay;
+        private UpdateableAvatar avatar;
+        private LinkFlowContainer hostText;
 
         public Header()
         {
@@ -44,128 +28,52 @@ namespace osu.Game.Screens.Multi.Match.Components
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            BeatmapSelectButton beatmapButton;
-
-            InternalChildren = new Drawable[]
+            InternalChild = new FillFlowContainer
             {
-                new Container
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Horizontal,
+                Spacing = new Vector2(10, 0),
+                Children = new Drawable[]
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    Children = new Drawable[]
+                    avatar = new UpdateableAvatar
                     {
-                        new HeaderBackgroundSprite { RelativeSizeAxes = Axes.Both },
-                        new Box
+                        Size = new Vector2(50),
+                        Masking = true,
+                        CornerRadius = 10,
+                    },
+                    new FillFlowContainer
+                    {
+                        AutoSizeAxes = Axes.Both,
+                        Direction = FillDirection.Vertical,
+                        Children = new Drawable[]
                         {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = ColourInfo.GradientVertical(Color4.Black.Opacity(0.7f), Color4.Black.Opacity(0.8f)),
-                        },
-                        beatmapPanel = new MatchBeatmapPanel
-                        {
-                            Anchor = Anchor.CentreRight,
-                            Origin = Anchor.CentreRight,
-                            Margin = new MarginPadding { Right = 100 },
+                            new OsuSpriteText
+                            {
+                                Font = OsuFont.GetFont(size: 30),
+                                Current = { BindTarget = RoomName }
+                            },
+                            hostText = new LinkFlowContainer(s => s.Font = OsuFont.GetFont(size: 20, weight: FontWeight.SemiBold))
+                            {
+                                AutoSizeAxes = Axes.Both,
+                                Direction = FillDirection.Horizontal,
+                            }
                         }
                     }
-                },
-                new Box
-                {
-                    Anchor = Anchor.BottomLeft,
-                    Origin = Anchor.BottomLeft,
-                    RelativeSizeAxes = Axes.X,
-                    Height = 1,
-                    Colour = colours.Yellow
-                },
-                new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Horizontal = SearchableListOverlay.WIDTH_PADDING + OsuScreen.HORIZONTAL_OVERFLOW_PADDING },
-                    Children = new Drawable[]
-                    {
-                        new FillFlowContainer
-                        {
-                            AutoSizeAxes = Axes.Both,
-                            Padding = new MarginPadding { Top = 20 },
-                            Direction = FillDirection.Vertical,
-                            Children = new Drawable[]
-                            {
-                                new BeatmapTypeInfo(),
-                                modDisplay = new ModDisplay
-                                {
-                                    Scale = new Vector2(0.75f),
-                                    DisplayUnrankedText = false
-                                },
-                            }
-                        },
-                        new Container
-                        {
-                            Anchor = Anchor.TopRight,
-                            Origin = Anchor.TopRight,
-                            RelativeSizeAxes = Axes.Y,
-                            Width = 200,
-                            Padding = new MarginPadding { Vertical = 10 },
-                            Child = beatmapButton = new BeatmapSelectButton
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Height = 1,
-                            },
-                        },
-                        Tabs = new MatchTabControl
-                        {
-                            Anchor = Anchor.BottomLeft,
-                            Origin = Anchor.BottomLeft,
-                            RelativeSizeAxes = Axes.X
-                        },
-                    },
-                },
+                }
             };
 
-            beatmapButton.Action = () => RequestBeatmapSelection?.Invoke();
-
-            Playlist.ItemsAdded += _ => updateMods();
-            Playlist.ItemsRemoved += _ => updateMods();
-
-            updateMods();
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            ShowBeatmapPanel.BindValueChanged(value => beatmapPanel.FadeTo(value.NewValue ? 1 : 0, 200, Easing.OutQuint), true);
-        }
-
-        private void updateMods()
-        {
-            var item = Playlist.FirstOrDefault();
-
-            modDisplay.Current.Value = item?.RequiredMods?.ToArray() ?? Array.Empty<Mod>();
-        }
-
-        private class BeatmapSelectButton : HeaderButton
-        {
-            [Resolved(typeof(Room), nameof(Room.RoomID))]
-            private Bindable<int?> roomId { get; set; }
-
-            public BeatmapSelectButton()
+            Host.BindValueChanged(host =>
             {
-                Text = "Select beatmap";
-            }
+                avatar.User = host.NewValue;
 
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                roomId.BindValueChanged(id => this.FadeTo(id.NewValue.HasValue ? 0 : 1), true);
-            }
-        }
+                hostText.Clear();
 
-        private class HeaderBackgroundSprite : MultiplayerBackgroundSprite
-        {
-            protected override UpdateableBeatmapBackgroundSprite CreateBackgroundSprite() => new BackgroundSprite { RelativeSizeAxes = Axes.Both };
-
-            private class BackgroundSprite : UpdateableBeatmapBackgroundSprite
-            {
-                protected override double TransformDuration => 200;
-            }
+                if (host.NewValue != null)
+                {
+                    hostText.AddText("hosted by ");
+                    hostText.AddUserLink(host.NewValue);
+                }
+            }, true);
         }
     }
 }
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchBeatmapPanel.cs b/osu.Game/Screens/Multi/Match/Components/MatchBeatmapPanel.cs
deleted file mode 100644
index c8de066caa..0000000000
--- a/osu.Game/Screens/Multi/Match/Components/MatchBeatmapPanel.cs
+++ /dev/null
@@ -1,67 +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 System.Linq;
-using System.Threading;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
-using osu.Game.Overlays.Direct;
-using osu.Game.Rulesets;
-
-namespace osu.Game.Screens.Multi.Match.Components
-{
-    public class MatchBeatmapPanel : MultiplayerComposite
-    {
-        [Resolved]
-        private IAPIProvider api { get; set; }
-
-        [Resolved]
-        private RulesetStore rulesets { get; set; }
-
-        private CancellationTokenSource loadCancellation;
-        private GetBeatmapSetRequest request;
-        private DirectGridPanel panel;
-
-        public MatchBeatmapPanel()
-        {
-            AutoSizeAxes = Axes.Both;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            Playlist.ItemsAdded += _ => loadNewPanel();
-            Playlist.ItemsRemoved += _ => loadNewPanel();
-
-            loadNewPanel();
-        }
-
-        private void loadNewPanel()
-        {
-            loadCancellation?.Cancel();
-            request?.Cancel();
-
-            panel?.FadeOut(200);
-            panel?.Expire();
-            panel = null;
-
-            var beatmap = Playlist.FirstOrDefault()?.Beatmap.Value;
-
-            if (beatmap?.OnlineBeatmapID == null)
-                return;
-
-            loadCancellation = new CancellationTokenSource();
-
-            request = new GetBeatmapSetRequest(beatmap.OnlineBeatmapID.Value, BeatmapSetLookupType.BeatmapId);
-            request.Success += res => Schedule(() =>
-            {
-                panel = new DirectGridPanel(res.ToBeatmapSet(rulesets));
-                LoadComponentAsync(panel, AddInternal, loadCancellation.Token);
-            });
-
-            api.Queue(request);
-        }
-    }
-}
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchPage.cs b/osu.Game/Screens/Multi/Match/Components/MatchPage.cs
deleted file mode 100644
index fc98db157b..0000000000
--- a/osu.Game/Screens/Multi/Match/Components/MatchPage.cs
+++ /dev/null
@@ -1,28 +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.Bindables;
-
-namespace osu.Game.Screens.Multi.Match.Components
-{
-    public abstract class MatchPage
-    {
-        public abstract string Name { get; }
-
-        public readonly BindableBool Enabled = new BindableBool(true);
-
-        public override string ToString() => Name;
-        public override int GetHashCode() => GetType().GetHashCode();
-        public override bool Equals(object obj) => GetType() == obj?.GetType();
-    }
-
-    public class SettingsMatchPage : MatchPage
-    {
-        public override string Name => "Settings";
-    }
-
-    public class RoomMatchPage : MatchPage
-    {
-        public override string Name => "Room";
-    }
-}
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchTabControl.cs b/osu.Game/Screens/Multi/Match/Components/MatchTabControl.cs
deleted file mode 100644
index c700d7b88a..0000000000
--- a/osu.Game/Screens/Multi/Match/Components/MatchTabControl.cs
+++ /dev/null
@@ -1,66 +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.Extensions.IEnumerableExtensions;
-using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Input.Events;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.Multiplayer;
-using osuTK.Graphics;
-
-namespace osu.Game.Screens.Multi.Match.Components
-{
-    public class MatchTabControl : PageTabControl<MatchPage>
-    {
-        [Resolved(typeof(Room), nameof(Room.RoomID))]
-        private Bindable<int?> roomId { get; set; }
-
-        public MatchTabControl()
-        {
-            AddItem(new RoomMatchPage());
-            AddItem(new SettingsMatchPage());
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            roomId.BindValueChanged(id =>
-            {
-                if (id.NewValue.HasValue)
-                {
-                    Items.ForEach(t => t.Enabled.Value = !(t is SettingsMatchPage));
-                    Current.Value = new RoomMatchPage();
-                }
-                else
-                {
-                    Items.ForEach(t => t.Enabled.Value = t is SettingsMatchPage);
-                    Current.Value = new SettingsMatchPage();
-                }
-            }, true);
-        }
-
-        protected override TabItem<MatchPage> CreateTabItem(MatchPage value) => new TabItem(value);
-
-        private class TabItem : PageTabItem
-        {
-            private readonly IBindable<bool> enabled = new BindableBool();
-
-            public TabItem(MatchPage value)
-                : base(value)
-            {
-                enabled.BindTo(value.Enabled);
-                enabled.BindValueChanged(enabled => Colour = enabled.NewValue ? Color4.White : Color4.Gray, true);
-            }
-
-            protected override bool OnClick(ClickEvent e)
-            {
-                if (!enabled.Value)
-                    return true;
-
-                return base.OnClick(e);
-            }
-        }
-    }
-}
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index 890664e99b..ed1cb987c2 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -15,7 +15,6 @@ using osu.Game.Online.Multiplayer.GameTypes;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Multi.Match.Components;
 using osu.Game.Screens.Multi.Play;
-using osu.Game.Screens.Select;
 using PlaylistItem = osu.Game.Online.Multiplayer.PlaylistItem;
 
 namespace osu.Game.Screens.Multi.Match
@@ -78,17 +77,6 @@ namespace osu.Game.Screens.Multi.Match
                             header = new Components.Header
                             {
                                 Depth = -1,
-                                RequestBeatmapSelection = () =>
-                                {
-                                    this.Push(new MatchSongSelect
-                                    {
-                                        Selected = item =>
-                                        {
-                                            Playlist.Clear();
-                                            Playlist.Add(item);
-                                        }
-                                    });
-                                }
                             }
                         },
                         new Drawable[] { info = new Info { OnStart = onStart } },
@@ -145,18 +133,6 @@ namespace osu.Game.Screens.Multi.Match
                 },
             };
 
-            header.Tabs.Current.BindValueChanged(tab =>
-            {
-                const float fade_duration = 500;
-
-                var settingsDisplayed = tab.NewValue is SettingsMatchPage;
-
-                header.ShowBeatmapPanel.Value = !settingsDisplayed;
-                settings.State.Value = settingsDisplayed ? Visibility.Visible : Visibility.Hidden;
-                info.FadeTo(settingsDisplayed ? 0 : 1, fade_duration, Easing.OutQuint);
-                bottomRow.FadeTo(settingsDisplayed ? 0 : 1, fade_duration, Easing.OutQuint);
-            }, true);
-
             beatmapManager.ItemAdded += beatmapAdded;
         }
 

From 73621e41fd7b4f4164d5a316ca0d13b5cf267229 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Feb 2020 20:12:23 +0900
Subject: [PATCH 0489/1142] Forcefully hide mute notification for navigation
 tests

---
 osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
index 8d2e4a614d..70d71d0952 100644
--- a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
+++ b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
@@ -117,6 +117,8 @@ namespace osu.Game.Tests.Visual.Navigation
             {
                 base.LoadComplete();
                 API.Login("Rhythm Champion", "osu!");
+
+                Dependencies.Get<SessionStatics>().Set(Static.MutedAudioNotificationShownOnce, true);
             }
         }
 

From c0dba632787246a7ef98b56fcf561dc827eb885f Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 20:14:25 +0900
Subject: [PATCH 0490/1142] Remove match info

---
 .../Multiplayer/TestSceneMatchHostInfo.cs     |  35 ------
 .../Multiplayer/TestSceneMatchParticipants.cs |  52 ---------
 .../Multi/Match/Components/HeaderButton.cs    |  47 --------
 .../Multi/Match/Components/HostInfo.cs        |  61 ----------
 .../Screens/Multi/Match/Components/Info.cs    | 107 ------------------
 .../Multi/Match/Components/Participants.cs    |  77 -------------
 .../Multi/Match/Components/ReadyButton.cs     |   3 +-
 .../Screens/Multi/Match/MatchSubScreen.cs     |   2 -
 8 files changed, 2 insertions(+), 382 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHostInfo.cs
 delete mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneMatchParticipants.cs
 delete mode 100644 osu.Game/Screens/Multi/Match/Components/HeaderButton.cs
 delete mode 100644 osu.Game/Screens/Multi/Match/Components/HostInfo.cs
 delete mode 100644 osu.Game/Screens/Multi/Match/Components/Info.cs
 delete mode 100644 osu.Game/Screens/Multi/Match/Components/Participants.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHostInfo.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHostInfo.cs
deleted file mode 100644
index 808a45cdf0..0000000000
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHostInfo.cs
+++ /dev/null
@@ -1,35 +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 System;
-using System.Collections.Generic;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Game.Screens.Multi.Match.Components;
-using osu.Game.Users;
-
-namespace osu.Game.Tests.Visual.Multiplayer
-{
-    public class TestSceneMatchHostInfo : OsuTestScene
-    {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(HostInfo)
-        };
-
-        private readonly Bindable<User> host = new Bindable<User>(new User { Username = "SomeHost" });
-
-        public TestSceneMatchHostInfo()
-        {
-            HostInfo hostInfo;
-
-            Child = hostInfo = new HostInfo
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre
-            };
-
-            hostInfo.Host.BindTo(host);
-        }
-    }
-}
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchParticipants.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchParticipants.cs
deleted file mode 100644
index a6f47961e9..0000000000
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchParticipants.cs
+++ /dev/null
@@ -1,52 +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.Graphics;
-using osu.Game.Screens.Multi.Match.Components;
-using osu.Game.Users;
-
-namespace osu.Game.Tests.Visual.Multiplayer
-{
-    [TestFixture]
-    public class TestSceneMatchParticipants : MultiplayerTestScene
-    {
-        public TestSceneMatchParticipants()
-        {
-            Add(new Participants { RelativeSizeAxes = Axes.Both });
-
-            AddStep(@"set max to null", () => Room.MaxParticipants.Value = null);
-            AddStep(@"set users", () => Room.Participants.AddRange(new[]
-            {
-                new User
-                {
-                    Username = @"Feppla",
-                    Id = 4271601,
-                    Country = new Country { FlagName = @"SE" },
-                    CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c2.jpg",
-                    IsSupporter = true,
-                },
-                new User
-                {
-                    Username = @"Xilver",
-                    Id = 3099689,
-                    Country = new Country { FlagName = @"IL" },
-                    CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c2.jpg",
-                    IsSupporter = true,
-                },
-                new User
-                {
-                    Username = @"Wucki",
-                    Id = 5287410,
-                    Country = new Country { FlagName = @"FI" },
-                    CoverUrl = @"https://assets.ppy.sh/user-profile-covers/5287410/5cfeaa9dd41cbce038ecdc9d781396ed4b0108089170bf7f50492ef8eadeb368.jpeg",
-                    IsSupporter = true,
-                },
-            }));
-
-            AddStep(@"set max", () => Room.MaxParticipants.Value = 10);
-            AddStep(@"clear users", () => Room.Participants.Clear());
-            AddStep(@"set max to null", () => Room.MaxParticipants.Value = null);
-        }
-    }
-}
diff --git a/osu.Game/Screens/Multi/Match/Components/HeaderButton.cs b/osu.Game/Screens/Multi/Match/Components/HeaderButton.cs
deleted file mode 100644
index de6ece6a05..0000000000
--- a/osu.Game/Screens/Multi/Match/Components/HeaderButton.cs
+++ /dev/null
@@ -1,47 +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.Framework.Graphics.Sprites;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
-
-namespace osu.Game.Screens.Multi.Match.Components
-{
-    public class HeaderButton : TriangleButton
-    {
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            BackgroundColour = OsuColour.FromHex(@"1187aa");
-
-            Triangles.ColourLight = OsuColour.FromHex(@"277b9c");
-            Triangles.ColourDark = OsuColour.FromHex(@"1f6682");
-            Triangles.TriangleScale = 1.5f;
-
-            Add(new Container
-            {
-                RelativeSizeAxes = Axes.Both,
-                Alpha = 1f,
-                Child = new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Alpha = 0.15f,
-                    Blending = BlendingParameters.Additive,
-                },
-            });
-        }
-
-        protected override SpriteText CreateText() => new OsuSpriteText
-        {
-            Depth = -1,
-            Origin = Anchor.Centre,
-            Anchor = Anchor.Centre,
-            Font = OsuFont.GetFont(weight: FontWeight.Light, size: 30),
-        };
-    }
-}
diff --git a/osu.Game/Screens/Multi/Match/Components/HostInfo.cs b/osu.Game/Screens/Multi/Match/Components/HostInfo.cs
deleted file mode 100644
index 8851a96605..0000000000
--- a/osu.Game/Screens/Multi/Match/Components/HostInfo.cs
+++ /dev/null
@@ -1,61 +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.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
-using osu.Game.Users;
-using osu.Game.Users.Drawables;
-using osuTK;
-
-namespace osu.Game.Screens.Multi.Match.Components
-{
-    public class HostInfo : CompositeDrawable
-    {
-        public readonly IBindable<User> Host = new Bindable<User>();
-
-        private readonly LinkFlowContainer linkContainer;
-        private readonly UpdateableAvatar avatar;
-
-        public HostInfo()
-        {
-            AutoSizeAxes = Axes.X;
-            Height = 50;
-
-            InternalChild = new FillFlowContainer
-            {
-                AutoSizeAxes = Axes.Both,
-                Direction = FillDirection.Horizontal,
-                Spacing = new Vector2(5, 0),
-                Children = new Drawable[]
-                {
-                    avatar = new UpdateableAvatar { Size = new Vector2(50) },
-                    new FillFlowContainer
-                    {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        AutoSizeAxes = Axes.Both,
-                        Direction = FillDirection.Vertical,
-                        Child = linkContainer = new LinkFlowContainer { AutoSizeAxes = Axes.Both }
-                    }
-                }
-            };
-
-            Host.BindValueChanged(host => updateHost(host.NewValue));
-        }
-
-        private void updateHost(User host)
-        {
-            avatar.User = host;
-
-            if (host != null)
-            {
-                linkContainer.AddText("hosted by");
-                linkContainer.NewLine();
-                linkContainer.AddUserLink(host, s => s.Font = s.Font.With(Typeface.Exo, weight: FontWeight.Bold, italics: true));
-            }
-        }
-    }
-}
diff --git a/osu.Game/Screens/Multi/Match/Components/Info.cs b/osu.Game/Screens/Multi/Match/Components/Info.cs
deleted file mode 100644
index a320b08cc4..0000000000
--- a/osu.Game/Screens/Multi/Match/Components/Info.cs
+++ /dev/null
@@ -1,107 +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 System;
-using System.Linq;
-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 osu.Game.Overlays.SearchableList;
-using osu.Game.Screens.Multi.Components;
-using osuTK;
-
-namespace osu.Game.Screens.Multi.Match.Components
-{
-    public class Info : MultiplayerComposite
-    {
-        public Action OnStart;
-
-        private ReadyButton readyButton;
-
-        public Info()
-        {
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            HostInfo hostInfo;
-
-            InternalChildren = new Drawable[]
-            {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = OsuColour.FromHex(@"28242d"),
-                },
-                new Container
-                {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Padding = new MarginPadding { Horizontal = SearchableListOverlay.WIDTH_PADDING + OsuScreen.HORIZONTAL_OVERFLOW_PADDING },
-                    Children = new Drawable[]
-                    {
-                        new FillFlowContainer
-                        {
-                            AutoSizeAxes = Axes.Both,
-                            Direction = FillDirection.Vertical,
-                            Spacing = new Vector2(0, 10),
-                            Padding = new MarginPadding { Vertical = 20 },
-                            Children = new Drawable[]
-                            {
-                                new FillFlowContainer
-                                {
-                                    AutoSizeAxes = Axes.Both,
-                                    Direction = FillDirection.Vertical,
-                                    Children = new Drawable[]
-                                    {
-                                        new OsuSpriteText
-                                        {
-                                            Font = OsuFont.GetFont(size: 30),
-                                            Current = RoomName
-                                        },
-                                        new RoomStatusInfo(),
-                                    }
-                                },
-                                hostInfo = new HostInfo(),
-                            },
-                        },
-                        new FillFlowContainer
-                        {
-                            Anchor = Anchor.CentreRight,
-                            Origin = Anchor.CentreRight,
-                            AutoSizeAxes = Axes.X,
-                            Height = 70,
-                            Spacing = new Vector2(10, 0),
-                            Direction = FillDirection.Horizontal,
-                            Children = new Drawable[]
-                            {
-                                readyButton = new ReadyButton
-                                {
-                                    Action = () => OnStart?.Invoke()
-                                }
-                            }
-                        }
-                    },
-                },
-            };
-
-            hostInfo.Host.BindTo(Host);
-
-            Playlist.ItemsAdded += _ => updateBeatmap();
-            Playlist.ItemsRemoved += _ => updateBeatmap();
-
-            updateBeatmap();
-        }
-
-        private void updateBeatmap()
-        {
-            readyButton.Beatmap.Value = Playlist.FirstOrDefault()?.Beatmap.Value;
-        }
-    }
-}
diff --git a/osu.Game/Screens/Multi/Match/Components/Participants.cs b/osu.Game/Screens/Multi/Match/Components/Participants.cs
deleted file mode 100644
index 00d2f3e150..0000000000
--- a/osu.Game/Screens/Multi/Match/Components/Participants.cs
+++ /dev/null
@@ -1,77 +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 System.Linq;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics.Containers;
-using osu.Game.Overlays.SearchableList;
-using osu.Game.Screens.Multi.Components;
-using osu.Game.Users;
-using osuTK;
-
-namespace osu.Game.Screens.Multi.Match.Components
-{
-    public class Participants : MultiplayerComposite
-    {
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            FillFlowContainer<UserPanel> usersFlow;
-
-            InternalChild = new Container
-            {
-                RelativeSizeAxes = Axes.Both,
-                Padding = new MarginPadding { Horizontal = SearchableListOverlay.WIDTH_PADDING },
-                Children = new Drawable[]
-                {
-                    new OsuScrollContainer
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Padding = new MarginPadding { Top = 10 },
-                        Children = new Drawable[]
-                        {
-                            new ParticipantCountDisplay
-                            {
-                                Anchor = Anchor.TopRight,
-                                Origin = Anchor.TopRight,
-                            },
-                            usersFlow = new FillFlowContainer<UserPanel>
-                            {
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                                Spacing = new Vector2(5),
-                                Padding = new MarginPadding { Top = 40 },
-                                LayoutDuration = 200,
-                                LayoutEasing = Easing.OutQuint,
-                            },
-                        },
-                    },
-                },
-            };
-
-            Participants.ItemsAdded += users =>
-            {
-                usersFlow.AddRange(users.Select(u =>
-                {
-                    var panel = new UserPanel(u)
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
-                        Width = 300,
-                    };
-
-                    panel.OnLoadComplete += d => d.FadeInFromZero(60);
-
-                    return panel;
-                }).ToList());
-            };
-
-            Participants.ItemsRemoved += users =>
-            {
-                usersFlow.RemoveAll(p => users.Contains(p.User));
-            };
-        }
-    }
-}
diff --git a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
index 8ab0b8f61f..cec5b2f855 100644
--- a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
+++ b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
@@ -7,12 +7,13 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osuTK;
 
 namespace osu.Game.Screens.Multi.Match.Components
 {
-    public class ReadyButton : HeaderButton
+    public class ReadyButton : OsuButton
     {
         public readonly Bindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
 
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index ed1cb987c2..07da707724 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -61,7 +61,6 @@ namespace osu.Game.Screens.Multi.Match
         private void load()
         {
             Components.Header header;
-            Info info;
             GridContainer bottomRow;
             MatchSettingsOverlay settings;
 
@@ -79,7 +78,6 @@ namespace osu.Game.Screens.Multi.Match
                                 Depth = -1,
                             }
                         },
-                        new Drawable[] { info = new Info { OnStart = onStart } },
                         new Drawable[]
                         {
                             bottomRow = new GridContainer

From 80fd9485a9681b5c092860be6625c7495b111f22 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 20:18:53 +0900
Subject: [PATCH 0491/1142] Refactor ready button to support selected playlist
 item

---
 .../Multi/Match/Components/ReadyButton.cs     | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
index cec5b2f855..a62572a851 100644
--- a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
+++ b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Screens.Multi.Match.Components
 {
     public class ReadyButton : OsuButton
     {
-        public readonly Bindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
+        public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
         [Resolved(typeof(Room), nameof(Room.EndDate))]
         private Bindable<DateTimeOffset> endDate { get; set; }
@@ -42,31 +42,37 @@ namespace osu.Game.Screens.Multi.Match.Components
             beatmaps.ItemAdded += beatmapAdded;
             beatmaps.ItemRemoved += beatmapRemoved;
 
-            Beatmap.BindValueChanged(b => updateBeatmap(b.NewValue), true);
+            SelectedItem.BindValueChanged(item => updateSelectedItem(item.NewValue), true);
         }
 
-        private void updateBeatmap(BeatmapInfo beatmap)
+        private void updateSelectedItem(PlaylistItem item)
         {
             hasBeatmap = false;
 
-            if (beatmap?.OnlineBeatmapID == null)
+            int? beatmapId = SelectedItem.Value?.Beatmap.Value?.OnlineBeatmapID;
+            if (beatmapId == null)
                 return;
 
-            hasBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == beatmap.OnlineBeatmapID) != null;
+            hasBeatmap = beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == beatmapId) != null;
         }
 
         private void beatmapAdded(BeatmapSetInfo model)
         {
-            if (model.Beatmaps.Any(b => b.OnlineBeatmapID == Beatmap.Value.OnlineBeatmapID))
+            int? beatmapId = SelectedItem.Value?.Beatmap.Value?.OnlineBeatmapID;
+            if (beatmapId == null)
+                return;
+
+            if (model.Beatmaps.Any(b => b.OnlineBeatmapID == beatmapId))
                 Schedule(() => hasBeatmap = true);
         }
 
         private void beatmapRemoved(BeatmapSetInfo model)
         {
-            if (Beatmap.Value == null)
+            int? beatmapId = SelectedItem.Value?.Beatmap.Value?.OnlineBeatmapID;
+            if (beatmapId == null)
                 return;
 
-            if (model.OnlineBeatmapSetID == Beatmap.Value.BeatmapSet.OnlineBeatmapSetID)
+            if (model.Beatmaps.Any(b => b.OnlineBeatmapID == beatmapId))
                 Schedule(() => hasBeatmap = false);
         }
 
@@ -79,7 +85,7 @@ namespace osu.Game.Screens.Multi.Match.Components
 
         private void updateEnabledState()
         {
-            if (gameBeatmap.Value == null)
+            if (gameBeatmap.Value == null || SelectedItem.Value == null)
             {
                 Enabled.Value = false;
                 return;
@@ -95,7 +101,10 @@ namespace osu.Game.Screens.Multi.Match.Components
             base.Dispose(isDisposing);
 
             if (beatmaps != null)
+            {
                 beatmaps.ItemAdded -= beatmapAdded;
+                beatmaps.ItemRemoved -= beatmapRemoved;
+            }
         }
     }
 }

From c75a7742977122303c59de7bc036b7310238fec9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 20:27:37 +0900
Subject: [PATCH 0492/1142] Extract participants list from the room inspector

---
 .../Multiplayer/TestSceneParticipantsList.cs  |  20 +++
 .../Multi/Components/ParticipantsList.cs      | 119 ++++++++++++++++++
 .../Multi/Lounge/Components/RoomInspector.cs  | 113 +----------------
 3 files changed, 142 insertions(+), 110 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
 create mode 100644 osu.Game/Screens/Multi/Components/ParticipantsList.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.cs
new file mode 100644
index 0000000000..9c4c45f94a
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneParticipantsList.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.Components;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneParticipantsList : MultiplayerTestScene
+    {
+        protected override bool UseOnlineAPI => true;
+
+        public TestSceneParticipantsList()
+        {
+            Room.RoomID.Value = 7;
+
+            Add(new ParticipantsList { RelativeSizeAxes = Axes.Both });
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/Components/ParticipantsList.cs b/osu.Game/Screens/Multi/Components/ParticipantsList.cs
new file mode 100644
index 0000000000..2ef36b2795
--- /dev/null
+++ b/osu.Game/Screens/Multi/Components/ParticipantsList.cs
@@ -0,0 +1,119 @@
+// 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;
+using osu.Game.Graphics.Containers;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Users;
+using osu.Game.Users.Drawables;
+using osuTK;
+
+namespace osu.Game.Screens.Multi.Components
+{
+    public class ParticipantsList : MultiplayerComposite
+    {
+        private readonly FillFlowContainer fill;
+
+        public ParticipantsList()
+        {
+            InternalChild = new OsuScrollContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Child = fill = new FillFlowContainer
+                {
+                    Spacing = new Vector2(10),
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Direction = FillDirection.Full,
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            RoomID.BindValueChanged(_ => updateParticipants(), true);
+        }
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        private GetRoomScoresRequest request;
+
+        private void updateParticipants()
+        {
+            var roomId = RoomID.Value ?? 0;
+
+            request?.Cancel();
+
+            // nice little progressive fade
+            int time = 500;
+
+            foreach (var c in fill.Children)
+            {
+                c.Delay(500 - time).FadeOut(time, Easing.Out);
+                time = Math.Max(20, time - 20);
+                c.Expire();
+            }
+
+            if (roomId == 0) return;
+
+            request = new GetRoomScoresRequest(roomId);
+            request.Success += scores => Schedule(() =>
+            {
+                if (roomId != RoomID.Value)
+                    return;
+
+                fill.Clear();
+                foreach (var s in scores)
+                    fill.Add(new UserTile(s.User));
+
+                fill.FadeInFromZero(1000, Easing.OutQuint);
+            });
+
+            api.Queue(request);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            request?.Cancel();
+            base.Dispose(isDisposing);
+        }
+
+        private class UserTile : CompositeDrawable, IHasTooltip
+        {
+            private readonly User user;
+
+            public string TooltipText => user.Username;
+
+            public UserTile(User user)
+            {
+                this.user = user;
+                Size = new Vector2(70f);
+                CornerRadius = 5f;
+                Masking = true;
+
+                InternalChildren = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = OsuColour.FromHex(@"27252d"),
+                    },
+                    new UpdateableAvatar
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        User = user,
+                    },
+                };
+            }
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs
index 5030d8cb50..cb6bbf6731 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs
@@ -1,25 +1,18 @@
 // 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.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Components;
-using osu.Game.Users;
-using osu.Game.Users.Drawables;
 using osuTK;
 using osuTK.Graphics;
 
@@ -160,9 +153,11 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                         },
                         new Drawable[]
                         {
-                            new MatchParticipants
+                            new Container
                             {
                                 RelativeSizeAxes = Axes.Both,
+                                Padding = new MarginPadding { Horizontal = 10 },
+                                Child = new ParticipantsList { RelativeSizeAxes = Axes.Both }
                             }
                         }
                     }
@@ -219,107 +214,5 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                 status.BindValueChanged(s => Text = s.NewValue.Message, true);
             }
         }
-
-        private class MatchParticipants : MultiplayerComposite
-        {
-            private readonly FillFlowContainer fill;
-
-            public MatchParticipants()
-            {
-                Padding = new MarginPadding { Horizontal = 10 };
-
-                InternalChild = new OsuScrollContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Child = fill = new FillFlowContainer
-                    {
-                        Spacing = new Vector2(10),
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Direction = FillDirection.Full,
-                    }
-                };
-            }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                RoomID.BindValueChanged(_ => updateParticipants(), true);
-            }
-
-            [Resolved]
-            private IAPIProvider api { get; set; }
-
-            private GetRoomScoresRequest request;
-
-            private void updateParticipants()
-            {
-                var roomId = RoomID.Value ?? 0;
-
-                request?.Cancel();
-
-                // nice little progressive fade
-                int time = 500;
-
-                foreach (var c in fill.Children)
-                {
-                    c.Delay(500 - time).FadeOut(time, Easing.Out);
-                    time = Math.Max(20, time - 20);
-                    c.Expire();
-                }
-
-                if (roomId == 0) return;
-
-                request = new GetRoomScoresRequest(roomId);
-                request.Success += scores =>
-                {
-                    if (roomId != RoomID.Value)
-                        return;
-
-                    fill.Clear();
-                    foreach (var s in scores)
-                        fill.Add(new UserTile(s.User));
-
-                    fill.FadeInFromZero(1000, Easing.OutQuint);
-                };
-
-                api.Queue(request);
-            }
-
-            protected override void Dispose(bool isDisposing)
-            {
-                request?.Cancel();
-                base.Dispose(isDisposing);
-            }
-
-            private class UserTile : CompositeDrawable, IHasTooltip
-            {
-                private readonly User user;
-
-                public string TooltipText => user.Username;
-
-                public UserTile(User user)
-                {
-                    this.user = user;
-                    Size = new Vector2(70f);
-                    CornerRadius = 5f;
-                    Masking = true;
-
-                    InternalChildren = new Drawable[]
-                    {
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = OsuColour.FromHex(@"27252d"),
-                        },
-                        new UpdateableAvatar
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            User = user,
-                        },
-                    };
-                }
-            }
-        }
     }
 }

From d5496321e2cf8dfaf0c254460786d25d0bacac8b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 20:31:55 +0900
Subject: [PATCH 0493/1142] Implement leaderboard chat display

---
 .../TestSceneMatchLeaderboardChatDisplay.cs   |  39 +++++++
 .../Components/LeaderboardChatDisplay.cs      | 100 ++++++++++++++++++
 2 files changed, 139 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboardChatDisplay.cs
 create mode 100644 osu.Game/Screens/Multi/Match/Components/LeaderboardChatDisplay.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboardChatDisplay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboardChatDisplay.cs
new file mode 100644
index 0000000000..e46386b263
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboardChatDisplay.cs
@@ -0,0 +1,39 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Screens.Multi.Match.Components;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneMatchLeaderboardChatDisplay : MultiplayerTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(LeaderboardChatDisplay)
+        };
+
+        protected override bool UseOnlineAPI => true;
+
+        public TestSceneMatchLeaderboardChatDisplay()
+        {
+            Room.RoomID.Value = 7;
+
+            Add(new Container
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(500),
+                Child = new LeaderboardChatDisplay
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                }
+            });
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/Match/Components/LeaderboardChatDisplay.cs b/osu.Game/Screens/Multi/Match/Components/LeaderboardChatDisplay.cs
new file mode 100644
index 0000000000..de02b7f605
--- /dev/null
+++ b/osu.Game/Screens/Multi/Match/Components/LeaderboardChatDisplay.cs
@@ -0,0 +1,100 @@
+// 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.UserInterface;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Screens.Multi.Match.Components
+{
+    public class LeaderboardChatDisplay : MultiplayerComposite
+    {
+        private const double fade_duration = 100;
+
+        private readonly OsuTabControl<DisplayMode> tabControl;
+        private readonly MatchLeaderboard leaderboard;
+        private readonly MatchChatDisplay chat;
+
+        public LeaderboardChatDisplay()
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            InternalChild = new GridContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Content = new[]
+                {
+                    new Drawable[]
+                    {
+                        tabControl = new DisplayModeTabControl
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Height = 24,
+                        }
+                    },
+                    new Drawable[]
+                    {
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Padding = new MarginPadding { Top = 10 },
+                            Children = new Drawable[]
+                            {
+                                leaderboard = new MatchLeaderboard { RelativeSizeAxes = Axes.Both },
+                                chat = new MatchChatDisplay
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Alpha = 0
+                                }
+                            }
+                        }
+                    },
+                },
+                RowDimensions = new[]
+                {
+                    new Dimension(GridSizeMode.AutoSize),
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            tabControl.AccentColour = colours.Yellow;
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            tabControl.Current.BindValueChanged(changeTab);
+        }
+
+        public void RefreshScores() => leaderboard.RefreshScores();
+
+        private void changeTab(ValueChangedEvent<DisplayMode> mode)
+        {
+            chat.FadeTo(mode.NewValue == DisplayMode.Chat ? 1 : 0, fade_duration);
+            leaderboard.FadeTo(mode.NewValue == DisplayMode.Leaderboard ? 1 : 0, fade_duration);
+        }
+
+        private class DisplayModeTabControl : OsuTabControl<DisplayMode>
+        {
+            protected override TabItem<DisplayMode> CreateTabItem(DisplayMode value) => base.CreateTabItem(value).With(d =>
+            {
+                d.Anchor = Anchor.Centre;
+                d.Origin = Anchor.Centre;
+            });
+        }
+
+        private enum DisplayMode
+        {
+            Leaderboard,
+            Chat,
+        }
+    }
+}

From d0b7b7f53a2892571f25c0daee83e229e40420a9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 20:34:15 +0900
Subject: [PATCH 0494/1142] Re-layout match settings overlay

---
 .../Match/Components/MatchSettingsOverlay.cs  | 58 +++++++++++++++----
 1 file changed, 48 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
index 410aaed788..776de424ab 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
@@ -25,6 +25,8 @@ namespace osu.Game.Screens.Multi.Match.Components
         private const float transition_duration = 350;
         private const float field_padding = 45;
 
+        public Action EditPlaylist;
+
         protected MatchSettings Settings { get; private set; }
 
         [BackgroundDependencyLoader]
@@ -35,7 +37,8 @@ namespace osu.Game.Screens.Multi.Match.Components
             Child = Settings = new MatchSettings
             {
                 RelativeSizeAxes = Axes.Both,
-                RelativePositionAxes = Axes.Y
+                RelativePositionAxes = Axes.Y,
+                EditPlaylist = () => EditPlaylist?.Invoke()
             };
         }
 
@@ -53,6 +56,8 @@ namespace osu.Game.Screens.Multi.Match.Components
         {
             private const float disabled_alpha = 0.2f;
 
+            public Action EditPlaylist;
+
             public OsuTextBox NameField, MaxParticipantsField;
             public OsuDropdown<TimeSpan> DurationField;
             public RoomAvailabilityPicker AvailabilityPicker;
@@ -63,6 +68,7 @@ namespace osu.Game.Screens.Multi.Match.Components
 
             private OsuSpriteText typeLabel;
             private ProcessingOverlay processingOverlay;
+            private DrawableRoomPlaylist playlist;
 
             [Resolved(CanBeNull = true)]
             private IRoomManager manager { get; set; }
@@ -155,15 +161,6 @@ namespace osu.Game.Screens.Multi.Match.Components
                                                                 },
                                                             },
                                                         },
-                                                    },
-                                                },
-                                                new SectionContainer
-                                                {
-                                                    Anchor = Anchor.TopRight,
-                                                    Origin = Anchor.TopRight,
-                                                    Padding = new MarginPadding { Left = field_padding / 2 },
-                                                    Children = new[]
-                                                    {
                                                         new Section("Max participants")
                                                         {
                                                             Alpha = disabled_alpha,
@@ -208,6 +205,45 @@ namespace osu.Game.Screens.Multi.Match.Components
                                                         },
                                                     },
                                                 },
+                                                new SectionContainer
+                                                {
+                                                    Anchor = Anchor.TopRight,
+                                                    Origin = Anchor.TopRight,
+                                                    Padding = new MarginPadding { Left = field_padding / 2 },
+                                                    Children = new[]
+                                                    {
+                                                        new Section("Playlist")
+                                                        {
+                                                            Child = new GridContainer
+                                                            {
+                                                                RelativeSizeAxes = Axes.X,
+                                                                Height = 300,
+                                                                Content = new[]
+                                                                {
+                                                                    new Drawable[]
+                                                                    {
+                                                                        playlist = new DrawableRoomPlaylist(true, true) { RelativeSizeAxes = Axes.Both }
+                                                                    },
+                                                                    new Drawable[]
+                                                                    {
+                                                                        new OsuButton
+                                                                        {
+                                                                            RelativeSizeAxes = Axes.X,
+                                                                            Height = 40,
+                                                                            Text = "Edit playlist",
+                                                                            Action = () => EditPlaylist?.Invoke()
+                                                                        }
+                                                                    }
+                                                                },
+                                                                RowDimensions = new[]
+                                                                {
+                                                                    new Dimension(),
+                                                                    new Dimension(GridSizeMode.AutoSize),
+                                                                }
+                                                            }
+                                                        },
+                                                    },
+                                                },
                                             },
                                         }
                                     },
@@ -271,6 +307,8 @@ namespace osu.Game.Screens.Multi.Match.Components
                 Type.BindValueChanged(type => TypePicker.Current.Value = type.NewValue, true);
                 MaxParticipants.BindValueChanged(count => MaxParticipantsField.Text = count.NewValue?.ToString(), true);
                 Duration.BindValueChanged(duration => DurationField.Current.Value = duration.NewValue, true);
+
+                playlist.Items.BindTo(Playlist);
             }
 
             protected override void Update()

From 929eb4f035d00a0d7b32b602c266685dec374afc Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 20:35:52 +0900
Subject: [PATCH 0495/1142] Add match footer

---
 .../Multiplayer/TestSceneMatchSubScreen.cs    |  1 -
 .../Screens/Multi/Match/Components/Footer.cs  | 53 +++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Screens/Multi/Match/Components/Footer.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
index 76d950b847..61def4be1a 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
@@ -11,7 +11,6 @@ using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Multi.Match;
 using osu.Game.Screens.Multi.Match.Components;
-using osu.Game.Screens.Select;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
diff --git a/osu.Game/Screens/Multi/Match/Components/Footer.cs b/osu.Game/Screens/Multi/Match/Components/Footer.cs
new file mode 100644
index 0000000000..93430d9131
--- /dev/null
+++ b/osu.Game/Screens/Multi/Match/Components/Footer.cs
@@ -0,0 +1,53 @@
+// 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.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.Multiplayer;
+using osuTK;
+
+namespace osu.Game.Screens.Multi.Match.Components
+{
+    public class Footer : CompositeDrawable
+    {
+        public const float HEIGHT = 100;
+
+        public Action OnStart;
+        public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
+
+        private readonly Drawable background;
+        private readonly OsuButton startButton;
+
+        public Footer()
+        {
+            RelativeSizeAxes = Axes.X;
+            Height = HEIGHT;
+
+            InternalChildren = new[]
+            {
+                background = new Box { RelativeSizeAxes = Axes.Both },
+                startButton = new ReadyButton
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(600, 50),
+                    SelectedItem = { BindTarget = SelectedItem },
+                    Action = () => OnStart?.Invoke()
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            background.Colour = OsuColour.FromHex(@"28242d");
+            startButton.BackgroundColour = colours.Green;
+        }
+    }
+}

From 6d87d22a84abb31ac09aa0d311b2dc2c84616486 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Fri, 14 Feb 2020 18:40:58 +0700
Subject: [PATCH 0496/1142] Remove duplicated dependency on AudioManager

---
 osu.Game/Screens/Menu/IntroTriangles.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index 50cfe23481..4deaa68467 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Screens.Menu
         private SampleChannel welcome;
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio)
+        private void load()
         {
             if (MenuVoice.Value && !MenuMusic.Value)
                 welcome = audio.Samples.Get(@"welcome");

From b762e5e8a5f48ce0d098ba79d2b6e50ec5946186 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 20:42:14 +0900
Subject: [PATCH 0497/1142] Implement overlined components

---
 .../TestSceneOverlinedParticipants.cs         | 28 ++++++
 .../Multiplayer/TestSceneOverlinedPlaylist.cs | 39 +++++++++
 .../Match/Components/OverlinedDisplay.cs      | 87 +++++++++++++++++++
 .../Match/Components/OverlinedParticipants.cs | 29 +++++++
 .../Match/Components/OverlinedPlaylist.cs     | 33 +++++++
 5 files changed, 216 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
 create mode 100644 osu.Game/Screens/Multi/Match/Components/OverlinedDisplay.cs
 create mode 100644 osu.Game/Screens/Multi/Match/Components/OverlinedParticipants.cs
 create mode 100644 osu.Game/Screens/Multi/Match/Components/OverlinedPlaylist.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
new file mode 100644
index 0000000000..e07ebc1454
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
@@ -0,0 +1,28 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Screens.Multi.Match.Components;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneOverlinedParticipants : MultiplayerTestScene
+    {
+        protected override bool UseOnlineAPI => true;
+
+        public TestSceneOverlinedParticipants()
+        {
+            Room.RoomID.Value = 7;
+
+            Add(new Container
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(500),
+                Child = new OverlinedParticipants()
+            });
+        }
+    }
+}
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
new file mode 100644
index 0000000000..cf4897be50
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
@@ -0,0 +1,39 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Tests.Beatmaps;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneOverlinedPlaylist : MultiplayerTestScene
+    {
+        protected override bool UseOnlineAPI => true;
+
+        public TestSceneOverlinedPlaylist()
+        {
+            for (int i = 0; i < 10; i++)
+            {
+                Room.Playlist.Add(new PlaylistItem
+                {
+                    ID = i,
+                    Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
+                    Ruleset = { Value = new OsuRuleset().RulesetInfo }
+                });
+            }
+
+            Add(new Container
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(500),
+                Child = new OverlinedPlaylist(false)
+            });
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/Match/Components/OverlinedDisplay.cs b/osu.Game/Screens/Multi/Match/Components/OverlinedDisplay.cs
new file mode 100644
index 0000000000..854877bd1c
--- /dev/null
+++ b/osu.Game/Screens/Multi/Match/Components/OverlinedDisplay.cs
@@ -0,0 +1,87 @@
+// 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.Match.Components
+{
+    public abstract class OverlinedDisplay : MultiplayerComposite
+    {
+        protected readonly Container Content;
+
+        protected string Details
+        {
+            set => details.Text = value;
+        }
+
+        private readonly Circle line;
+        private readonly OsuSpriteText details;
+
+        protected OverlinedDisplay(string title)
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            InternalChild = new GridContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                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)
+                                },
+                                details = new OsuSpriteText { Font = OsuFont.GetFont(size: 14) },
+                            }
+                        },
+                    },
+                    new Drawable[]
+                    {
+                        Content = new Container
+                        {
+                            Margin = new MarginPadding { Top = 5 },
+                            RelativeSizeAxes = Axes.Both
+                        }
+                    }
+                },
+                RowDimensions = new[]
+                {
+                    new Dimension(GridSizeMode.AutoSize),
+                    new Dimension(GridSizeMode.AutoSize),
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            line.Colour = colours.Yellow;
+            details.Colour = colours.Yellow;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/Match/Components/OverlinedParticipants.cs b/osu.Game/Screens/Multi/Match/Components/OverlinedParticipants.cs
new file mode 100644
index 0000000000..7a4290a9a1
--- /dev/null
+++ b/osu.Game/Screens/Multi/Match/Components/OverlinedParticipants.cs
@@ -0,0 +1,29 @@
+// 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.Screens.Multi.Components;
+
+namespace osu.Game.Screens.Multi.Match.Components
+{
+    public class OverlinedParticipants : OverlinedDisplay
+    {
+        public OverlinedParticipants()
+            : base("Participants")
+        {
+            Content.Add(new ParticipantsList { RelativeSizeAxes = Axes.Both });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            ParticipantCount.BindValueChanged(_ => setParticipantCount());
+            MaxParticipants.BindValueChanged(_ => setParticipantCount());
+
+            setParticipantCount();
+        }
+
+        private void setParticipantCount() => Details = MaxParticipants.Value != null ? $"{ParticipantCount.Value}/{MaxParticipants.Value}" : ParticipantCount.Value.ToString();
+    }
+}
diff --git a/osu.Game/Screens/Multi/Match/Components/OverlinedPlaylist.cs b/osu.Game/Screens/Multi/Match/Components/OverlinedPlaylist.cs
new file mode 100644
index 0000000000..eea85d9d64
--- /dev/null
+++ b/osu.Game/Screens/Multi/Match/Components/OverlinedPlaylist.cs
@@ -0,0 +1,33 @@
+// 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.Match.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);
+        }
+    }
+}

From 2ea8c47c83a084bf3bc67ebe527c5bebfe12dc00 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 20:44:41 +0900
Subject: [PATCH 0498/1142] Fix incorrect footer button size

---
 osu.Game/Screens/Multi/Match/Components/ReadyButton.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
index a62572a851..d39217db5d 100644
--- a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
+++ b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
@@ -5,11 +5,9 @@ using System;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
-using osuTK;
 
 namespace osu.Game.Screens.Multi.Match.Components
 {
@@ -30,9 +28,6 @@ namespace osu.Game.Screens.Multi.Match.Components
 
         public ReadyButton()
         {
-            RelativeSizeAxes = Axes.Y;
-            Size = new Vector2(200, 1);
-
             Text = "Start";
         }
 

From b92f1ad68dc57c67b33fe8bf180419b6118c93d7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 20:48:09 +0900
Subject: [PATCH 0499/1142] Implement match subscreen re-design

---
 .../TestSceneMatchBeatmapDetailArea.cs        |   4 +-
 .../Screens/Multi/Match/MatchSubScreen.cs     | 223 ++++++++++--------
 2 files changed, 125 insertions(+), 102 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
index 09d882a265..5c7ad7616d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs
@@ -24,14 +24,12 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private RulesetStore rulesetStore { get; set; }
 
-        private MatchBeatmapDetailArea detailArea;
-
         [SetUp]
         public void Setup() => Schedule(() =>
         {
             Room.Playlist.Clear();
 
-            Child = detailArea = new MatchBeatmapDetailArea
+            Child = new MatchBeatmapDetailArea
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index 07da707724..44fccdaa13 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -5,17 +5,23 @@ using System;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Drawables;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Multiplayer.GameTypes;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Match.Components;
 using osu.Game.Screens.Multi.Play;
-using PlaylistItem = osu.Game.Online.Multiplayer.PlaylistItem;
+using osu.Game.Screens.Select;
+using osuTK.Graphics;
+using Footer = osu.Game.Screens.Multi.Match.Components.Footer;
 
 namespace osu.Game.Screens.Multi.Match
 {
@@ -31,26 +37,21 @@ namespace osu.Game.Screens.Multi.Match
         [Resolved(typeof(Room), nameof(Room.RoomID))]
         private Bindable<int?> roomId { get; set; }
 
-        [Resolved(typeof(Room), nameof(Room.Name))]
-        private Bindable<string> name { get; set; }
-
         [Resolved(typeof(Room), nameof(Room.Type))]
         private Bindable<GameType> type { get; set; }
 
-        [Resolved(typeof(Room))]
-        protected BindableList<PlaylistItem> Playlist { get; private set; }
+        [Resolved(typeof(Room), nameof(Room.Playlist))]
+        private BindableList<PlaylistItem> playlist { get; set; }
 
         [Resolved]
         private BeatmapManager beatmapManager { get; set; }
 
-        [Resolved]
-        private PreviewTrackManager previewTrackManager { get; set; }
-
-        [Resolved(CanBeNull = true)]
-        private OsuGame game { get; set; }
+        [Resolved(canBeNull: true)]
+        private Multiplayer multiplayer { get; set; }
 
         private readonly Bindable<PlaylistItem> selectedItem = new Bindable<PlaylistItem>();
-        private MatchLeaderboard leaderboard;
+        private LeaderboardChatDisplay leaderboardChatDisplay;
+        private MatchSettingsOverlay settingsOverlay;
 
         public MatchSubScreen(Room room)
         {
@@ -60,12 +61,14 @@ namespace osu.Game.Screens.Multi.Match
         [BackgroundDependencyLoader]
         private void load()
         {
-            Components.Header header;
-            GridContainer bottomRow;
-            MatchSettingsOverlay settings;
-
             InternalChildren = new Drawable[]
             {
+                new HeaderBackgroundSprite
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Height = 200,
+                    Colour = ColourInfo.GradientVertical(Color4.White.Opacity(0.4f), Color4.White.Opacity(0))
+                },
                 new GridContainer
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -73,143 +76,155 @@ namespace osu.Game.Screens.Multi.Match
                     {
                         new Drawable[]
                         {
-                            header = new Components.Header
+                            new Container
                             {
-                                Depth = -1,
+                                RelativeSizeAxes = Axes.Both,
+                                Padding = new MarginPadding
+                                {
+                                    Horizontal = 105,
+                                    Vertical = 20
+                                },
+                                Child = new GridContainer
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Content = new[]
+                                    {
+                                        new Drawable[] { new Components.Header() },
+                                        new Drawable[]
+                                        {
+                                            new Container
+                                            {
+                                                RelativeSizeAxes = Axes.Both,
+                                                Padding = new MarginPadding { Top = 65 },
+                                                Child = new GridContainer
+                                                {
+                                                    RelativeSizeAxes = Axes.Both,
+                                                    Content = new[]
+                                                    {
+                                                        new Drawable[]
+                                                        {
+                                                            new Container
+                                                            {
+                                                                RelativeSizeAxes = Axes.Both,
+                                                                Padding = new MarginPadding { Right = 5 },
+                                                                Child = new OverlinedParticipants()
+                                                            },
+                                                            new Container
+                                                            {
+                                                                RelativeSizeAxes = Axes.Both,
+                                                                Padding = new MarginPadding { Horizontal = 5 },
+                                                                Child = new OverlinedPlaylist(true) // Temporarily always allow selection
+                                                                {
+                                                                    SelectedItem = { BindTarget = selectedItem }
+                                                                }
+                                                            },
+                                                            new Container
+                                                            {
+                                                                RelativeSizeAxes = Axes.Both,
+                                                                Padding = new MarginPadding { Left = 5 },
+                                                                Child = leaderboardChatDisplay = new LeaderboardChatDisplay()
+                                                            }
+                                                        },
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    },
+                                    RowDimensions = new[]
+                                    {
+                                        new Dimension(GridSizeMode.AutoSize),
+                                        new Dimension(),
+                                    }
+                                }
                             }
                         },
                         new Drawable[]
                         {
-                            bottomRow = new GridContainer
+                            new Footer
                             {
-                                RelativeSizeAxes = Axes.Both,
-                                Content = new[]
-                                {
-                                    new Drawable[]
-                                    {
-                                        leaderboard = new MatchLeaderboard
-                                        {
-                                            Padding = new MarginPadding
-                                            {
-                                                Left = 10 + HORIZONTAL_OVERFLOW_PADDING,
-                                                Right = 10,
-                                                Vertical = 10,
-                                            },
-                                            RelativeSizeAxes = Axes.Both
-                                        },
-                                        new Container
-                                        {
-                                            Padding = new MarginPadding
-                                            {
-                                                Left = 10,
-                                                Right = 10 + HORIZONTAL_OVERFLOW_PADDING,
-                                                Vertical = 10,
-                                            },
-                                            RelativeSizeAxes = Axes.Both,
-                                            Child = new MatchChatDisplay
-                                            {
-                                                RelativeSizeAxes = Axes.Both
-                                            }
-                                        },
-                                    },
-                                },
+                                OnStart = onStart,
+                                SelectedItem = { BindTarget = selectedItem }
                             }
-                        },
+                        }
                     },
                     RowDimensions = new[]
                     {
+                        new Dimension(),
                         new Dimension(GridSizeMode.AutoSize),
-                        new Dimension(GridSizeMode.AutoSize),
-                        new Dimension(GridSizeMode.Distributed),
                     }
                 },
-                new Container
+                settingsOverlay = new MatchSettingsOverlay
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Top = Components.Header.HEIGHT },
-                    Child = settings = new MatchSettingsOverlay { RelativeSizeAxes = Axes.Both },
-                },
+                    EditPlaylist = () => this.Push(new MatchSongSelect()),
+                    State = { Value = roomId.Value == null ? Visibility.Visible : Visibility.Hidden }
+                }
             };
-
-            beatmapManager.ItemAdded += beatmapAdded;
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            Playlist.ItemsAdded += _ => updateSelectedItem();
-            Playlist.ItemsRemoved += _ => updateSelectedItem();
+            roomId.BindValueChanged(id =>
+            {
+                if (id.NewValue == null)
+                    settingsOverlay.Show();
+                else
+                    settingsOverlay.Hide();
+            }, true);
 
-            updateSelectedItem();
-        }
+            selectedItem.BindValueChanged(selectedItemChanged);
+            selectedItem.Value = playlist.FirstOrDefault();
 
-        private void updateSelectedItem()
-        {
-            selectedItem.Value = Playlist.FirstOrDefault();
-            currentItemChanged();
+            beatmapManager.ItemAdded += beatmapAdded;
         }
 
         public override bool OnExiting(IScreen next)
         {
             RoomManager?.PartRoom();
             Mods.Value = Array.Empty<Mod>();
-            previewTrackManager.StopAnyPlaying(this);
 
             return base.OnExiting(next);
         }
 
-        /// <summary>
-        /// Handles propagation of the current playlist item's content to game-wide mechanisms.
-        /// </summary>
-        private void currentItemChanged()
+        private void selectedItemChanged(ValueChangedEvent<PlaylistItem> e)
         {
-            var item = selectedItem.Value;
+            updateWorkingBeatmap();
 
-            // Retrieve the corresponding local beatmap, since we can't directly use the playlist's beatmap info
-            var localBeatmap = item?.Beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == item.Beatmap.Value.OnlineBeatmapID);
+            Mods.Value = e.NewValue?.RequiredMods?.ToArray() ?? Array.Empty<Mod>();
 
-            Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
-            Mods.Value = item?.RequiredMods?.ToArray() ?? Array.Empty<Mod>();
-
-            if (item?.Ruleset != null)
-                Ruleset.Value = item.Ruleset.Value;
-
-            previewTrackManager.StopAnyPlaying(this);
+            if (e.NewValue?.Ruleset != null)
+                Ruleset.Value = e.NewValue.Ruleset.Value;
+        }
+
+        private void updateWorkingBeatmap()
+        {
+            var beatmap = selectedItem.Value?.Beatmap.Value;
+
+            // Retrieve the corresponding local beatmap, since we can't directly use the playlist's beatmap info
+            var localBeatmap = beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == beatmap.OnlineBeatmapID);
+
+            Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
         }
 
-        /// <summary>
-        /// Handle the case where a beatmap is imported (and can be used by this match).
-        /// </summary>
         private void beatmapAdded(BeatmapSetInfo model) => Schedule(() =>
         {
             if (Beatmap.Value != beatmapManager.DefaultBeatmap)
                 return;
 
-            if (selectedItem.Value == null)
-                return;
-
-            // Try to retrieve the corresponding local beatmap
-            var localBeatmap = beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == selectedItem.Value.Beatmap.Value.OnlineBeatmapID);
-
-            if (localBeatmap != null)
-                Beatmap.Value = beatmapManager.GetWorkingBeatmap(localBeatmap);
+            updateWorkingBeatmap();
         });
 
-        [Resolved(canBeNull: true)]
-        private Multiplayer multiplayer { get; set; }
-
         private void onStart()
         {
-            previewTrackManager.StopAnyPlaying(this);
-
             switch (type.Value)
             {
                 default:
                 case GameTypeTimeshift _:
                     multiplayer?.Start(() => new TimeshiftPlayer(selectedItem.Value)
                     {
-                        Exited = () => leaderboard.RefreshScores()
+                        Exited = () => leaderboardChatDisplay.RefreshScores()
                     });
                     break;
             }
@@ -222,5 +237,15 @@ namespace osu.Game.Screens.Multi.Match
             if (beatmapManager != null)
                 beatmapManager.ItemAdded -= beatmapAdded;
         }
+
+        private class HeaderBackgroundSprite : MultiplayerBackgroundSprite
+        {
+            protected override UpdateableBeatmapBackgroundSprite CreateBackgroundSprite() => new BackgroundSprite { RelativeSizeAxes = Axes.Both };
+
+            private class BackgroundSprite : UpdateableBeatmapBackgroundSprite
+            {
+                protected override double TransformDuration => 200;
+            }
+        }
     }
 }

From 9eaf37258794cdec6c0bc6c9dedad6713551d54e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 21:17:07 +0900
Subject: [PATCH 0500/1142] Immediately update selected state

---
 osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
index b1e69e4c4f..1c35d8a53f 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Screens.Multi
         {
             base.LoadComplete();
 
-            SelectedItem.BindValueChanged(selected => maskingContainer.BorderThickness = selected.NewValue == Model ? 5 : 0);
+            SelectedItem.BindValueChanged(selected => maskingContainer.BorderThickness = selected.NewValue == Model ? 5 : 0, true);
 
             beatmap.BindValueChanged(_ => scheduleRefresh());
             ruleset.BindValueChanged(_ => scheduleRefresh());

From c753cb46c50d48107fb58ebdd93f8ae4c54e542f Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Fri, 14 Feb 2020 20:14:00 +0700
Subject: [PATCH 0501/1142] Use [Resolved] wherever possible

---
 osu.Game/Audio/PreviewTrackManager.cs             | 15 +++++----------
 osu.Game/Graphics/ScreenshotManager.cs            | 12 +++++++-----
 osu.Game/Graphics/UserInterface/DownloadButton.cs |  7 +++----
 .../Graphics/UserInterface/ExternalLinkButton.cs  |  7 ++++---
 osu.Game/Graphics/UserInterface/FocusedTextBox.cs |  7 +++----
 .../Graphics/UserInterface/OsuPasswordTextBox.cs  |  9 ++-------
 osu.Game/Online/Chat/ChannelManager.cs            |  9 ++-------
 osu.Game/Online/Chat/ExternalLinkOpener.cs        | 12 +++++++-----
 osu.Game/Online/DownloadTrackingComposite.cs      |  7 +++----
 osu.Game/Online/Leaderboards/Leaderboard.cs       |  8 ++++----
 osu.Game/OsuGame.cs                               |  7 +++----
 osu.Game/Overlays/AccountCreation/ScreenEntry.cs  | 13 +++++++------
 .../Overlays/AccountCreation/ScreenWarning.cs     |  8 ++++----
 osu.Game/Overlays/BeatmapSetOverlay.cs            |  7 +++----
 osu.Game/Overlays/ChatOverlay.cs                  |  7 +++----
 osu.Game/Overlays/Direct/PlayButton.cs            |  7 +++----
 osu.Game/Overlays/DirectOverlay.cs                | 12 ++++++------
 osu.Game/Overlays/KeyBinding/KeyBindingRow.cs     |  7 +++----
 osu.Game/Overlays/Music/PlaylistOverlay.cs        |  7 ++++---
 .../Sections/Audio/AudioDevicesSettings.cs        |  9 ++-------
 .../Settings/Sections/General/LoginSettings.cs    | 15 ++++++++-------
 .../Settings/Sections/Graphics/LayoutSettings.cs  |  8 ++++----
 .../Overlays/Settings/Sections/SkinSection.cs     |  7 +++----
 osu.Game/Rulesets/Judgements/DrawableJudgement.cs |  7 +++----
 .../Screens/Edit/Components/PlaybackControl.cs    |  7 +++----
 .../Screens/Edit/Components/TimeInfoContainer.cs  |  9 ++-------
 .../Edit/Compose/Components/Timeline/Timeline.cs  |  7 +++----
 osu.Game/Screens/Menu/IntroTriangles.cs           |  7 +++----
 .../Multi/Ranking/Pages/RoomLeaderboardPage.cs    |  8 ++++----
 osu.Game/Screens/Play/Player.cs                   |  7 +++----
 osu.Game/Screens/Select/BeatmapDetails.cs         |  9 ++-------
 .../Select/Carousel/DrawableCarouselBeatmap.cs    |  7 +++----
 .../Select/Carousel/DrawableCarouselBeatmapSet.cs |  6 +++---
 osu.Game/Skinning/SkinnableSound.cs               |  9 ++-------
 osu.Game/Updater/SimpleUpdateManager.cs           |  7 ++++---
 35 files changed, 128 insertions(+), 169 deletions(-)

diff --git a/osu.Game/Audio/PreviewTrackManager.cs b/osu.Game/Audio/PreviewTrackManager.cs
index 6f0b62543d..862be41c1a 100644
--- a/osu.Game/Audio/PreviewTrackManager.cs
+++ b/osu.Game/Audio/PreviewTrackManager.cs
@@ -19,13 +19,15 @@ namespace osu.Game.Audio
     {
         private readonly BindableDouble muteBindable = new BindableDouble();
 
-        private AudioManager audio;
+        [Resolved]
+        private AudioManager audio { get; set; }
+
         private PreviewTrackStore trackStore;
 
         protected TrackManagerPreviewTrack CurrentTrack;
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio)
+        private void load()
         {
             // this is a temporary solution to get around muting ourselves.
             // todo: update this once we have a BackgroundTrackManager or similar.
@@ -33,8 +35,6 @@ namespace osu.Game.Audio
 
             audio.AddItem(trackStore);
             trackStore.AddAdjustment(AdjustableProperty.Volume, audio.VolumeTrack);
-
-            this.audio = audio;
         }
 
         /// <summary>
@@ -90,6 +90,7 @@ namespace osu.Game.Audio
 
         public class TrackManagerPreviewTrack : PreviewTrack
         {
+            [Resolved]
             public IPreviewTrackOwner Owner { get; private set; }
 
             private readonly BeatmapSetInfo beatmapSetInfo;
@@ -101,12 +102,6 @@ namespace osu.Game.Audio
                 this.trackManager = trackManager;
             }
 
-            [BackgroundDependencyLoader]
-            private void load(IPreviewTrackOwner owner)
-            {
-                Owner = owner;
-            }
-
             protected override Track GetTrack() => trackManager.Get($"https://b.ppy.sh/preview/{beatmapSetInfo?.OnlineBeatmapSetID}.mp3");
         }
 
diff --git a/osu.Game/Graphics/ScreenshotManager.cs b/osu.Game/Graphics/ScreenshotManager.cs
index e21545688b..9804aefce8 100644
--- a/osu.Game/Graphics/ScreenshotManager.cs
+++ b/osu.Game/Graphics/ScreenshotManager.cs
@@ -35,18 +35,20 @@ namespace osu.Game.Graphics
         private Bindable<ScreenshotFormat> screenshotFormat;
         private Bindable<bool> captureMenuCursor;
 
-        private GameHost host;
+        [Resolved]
+        private GameHost host { get; set; }
+
         private Storage storage;
-        private NotificationOverlay notificationOverlay;
+
+        [Resolved]
+        private NotificationOverlay notificationOverlay { get; set; }
 
         private SampleChannel shutter;
 
         [BackgroundDependencyLoader]
-        private void load(GameHost host, OsuConfigManager config, Storage storage, NotificationOverlay notificationOverlay, AudioManager audio)
+        private void load(OsuConfigManager config, Storage storage, AudioManager audio)
         {
-            this.host = host;
             this.storage = storage.GetStorageForDirectory(@"screenshots");
-            this.notificationOverlay = notificationOverlay;
 
             screenshotFormat = config.GetBindable<ScreenshotFormat>(OsuSetting.ScreenshotFormat);
             captureMenuCursor = config.GetBindable<bool>(OsuSetting.ScreenshotCaptureMenuCursor);
diff --git a/osu.Game/Graphics/UserInterface/DownloadButton.cs b/osu.Game/Graphics/UserInterface/DownloadButton.cs
index 41b90d3802..86a5cb9aa6 100644
--- a/osu.Game/Graphics/UserInterface/DownloadButton.cs
+++ b/osu.Game/Graphics/UserInterface/DownloadButton.cs
@@ -19,7 +19,8 @@ namespace osu.Game.Graphics.UserInterface
         private readonly SpriteIcon checkmark;
         private readonly Box background;
 
-        private OsuColour colours;
+        [Resolved]
+        private OsuColour colours { get; set; }
 
         public DownloadButton()
         {
@@ -49,10 +50,8 @@ namespace osu.Game.Graphics.UserInterface
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load()
         {
-            this.colours = colours;
-
             State.BindValueChanged(updateState, true);
         }
 
diff --git a/osu.Game/Graphics/UserInterface/ExternalLinkButton.cs b/osu.Game/Graphics/UserInterface/ExternalLinkButton.cs
index 7225dbc66f..5a1eb53fe1 100644
--- a/osu.Game/Graphics/UserInterface/ExternalLinkButton.cs
+++ b/osu.Game/Graphics/UserInterface/ExternalLinkButton.cs
@@ -18,7 +18,9 @@ namespace osu.Game.Graphics.UserInterface
         public string Link { get; set; }
 
         private Color4 hoverColour;
-        private GameHost host;
+
+        [Resolved]
+        private GameHost host { get; set; }
 
         public ExternalLinkButton(string link = null)
         {
@@ -32,10 +34,9 @@ namespace osu.Game.Graphics.UserInterface
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, GameHost host)
+        private void load(OsuColour colours)
         {
             hoverColour = colours.Yellow;
-            this.host = host;
         }
 
         protected override bool OnHover(HoverEvent e)
diff --git a/osu.Game/Graphics/UserInterface/FocusedTextBox.cs b/osu.Game/Graphics/UserInterface/FocusedTextBox.cs
index e59353a480..8977f014b6 100644
--- a/osu.Game/Graphics/UserInterface/FocusedTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/FocusedTextBox.cs
@@ -36,13 +36,12 @@ namespace osu.Game.Graphics.UserInterface
             }
         }
 
-        private GameHost host;
+        [Resolved]
+        private GameHost host { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load(GameHost host)
+        private void load()
         {
-            this.host = host;
-
             BackgroundUnfocused = new Color4(10, 10, 10, 255);
             BackgroundFocused = new Color4(10, 10, 10, 255);
         }
diff --git a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
index e4a4b1c50e..e7699e5255 100644
--- a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
@@ -24,7 +24,8 @@ namespace osu.Game.Graphics.UserInterface
 
         private readonly CapsWarning warning;
 
-        private GameHost host;
+        [Resolved]
+        private GameHost host { get; set; }
 
         public OsuPasswordTextBox()
         {
@@ -38,12 +39,6 @@ namespace osu.Game.Graphics.UserInterface
             });
         }
 
-        [BackgroundDependencyLoader]
-        private void load(GameHost host)
-        {
-            this.host = host;
-        }
-
         protected override bool OnKeyDown(KeyDownEvent e)
         {
             if (e.Key == Key.CapsLock)
diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index 4b5ec1cad0..2c37216fd6 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -48,7 +48,8 @@ namespace osu.Game.Online.Chat
         /// </summary>
         public IBindableList<Channel> AvailableChannels => availableChannels;
 
-        private IAPIProvider api;
+        [Resolved]
+        private IAPIProvider api { get; set; }
 
         public readonly BindableBool HighPollRate = new BindableBool();
 
@@ -466,12 +467,6 @@ namespace osu.Game.Online.Chat
 
             api.Queue(req);
         }
-
-        [BackgroundDependencyLoader]
-        private void load(IAPIProvider api)
-        {
-            this.api = api;
-        }
     }
 
     /// <summary>
diff --git a/osu.Game/Online/Chat/ExternalLinkOpener.cs b/osu.Game/Online/Chat/ExternalLinkOpener.cs
index 495f1ac0b0..da90ea6845 100644
--- a/osu.Game/Online/Chat/ExternalLinkOpener.cs
+++ b/osu.Game/Online/Chat/ExternalLinkOpener.cs
@@ -13,15 +13,17 @@ namespace osu.Game.Online.Chat
 {
     public class ExternalLinkOpener : Component
     {
-        private GameHost host;
-        private DialogOverlay dialogOverlay;
+        [Resolved]
+        private GameHost host { get; set; }
+
+        [Resolved]
+        private DialogOverlay dialogOverlay { get; set; }
+
         private Bindable<bool> externalLinkWarning;
 
         [BackgroundDependencyLoader(true)]
-        private void load(GameHost host, DialogOverlay dialogOverlay, OsuConfigManager config)
+        private void load(OsuConfigManager config)
         {
-            this.host = host;
-            this.dialogOverlay = dialogOverlay;
             externalLinkWarning = config.GetBindable<bool>(OsuSetting.ExternalLinkWarning);
         }
 
diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 9a0e112727..9eb5f36729 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -19,7 +19,8 @@ namespace osu.Game.Online
     {
         protected readonly Bindable<TModel> Model = new Bindable<TModel>();
 
-        private TModelManager manager;
+        [Resolved]
+        private TModelManager manager { get; set; }
 
         /// <summary>
         /// Holds the current download state of the <typeparamref name="TModel"/>, whether is has already been downloaded, is in progress, or is not downloaded.
@@ -34,10 +35,8 @@ namespace osu.Game.Online
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(TModelManager manager)
+        private void load()
         {
-            this.manager = manager;
-
             Model.BindValueChanged(modelInfo =>
             {
                 if (modelInfo.NewValue == null)
diff --git a/osu.Game/Online/Leaderboards/Leaderboard.cs b/osu.Game/Online/Leaderboards/Leaderboard.cs
index 87c747675a..71859d3aeb 100644
--- a/osu.Game/Online/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Online/Leaderboards/Leaderboard.cs
@@ -217,14 +217,14 @@ namespace osu.Game.Online.Leaderboards
             Scores = null;
         }
 
-        private IAPIProvider api;
+        [Resolved(CanBeNull = true)]
+        private IAPIProvider api { get; set; }
 
         private ScheduledDelegate pendingUpdateScores;
 
-        [BackgroundDependencyLoader(true)]
-        private void load(IAPIProvider api)
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            this.api = api;
             api?.Register(this);
         }
 
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index e7fffd49b4..100730d40d 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -150,10 +150,8 @@ namespace osu.Game
             dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
         [BackgroundDependencyLoader]
-        private void load(FrameworkConfigManager frameworkConfig)
+        private void load()
         {
-            this.frameworkConfig = frameworkConfig;
-
             if (!Host.IsPrimaryInstance && !DebugUtils.IsDebugBuild)
             {
                 Logger.Log(@"osu! does not support multiple running instances.", LoggingTarget.Runtime, LogLevel.Error);
@@ -881,7 +879,8 @@ namespace osu.Game
 
         private Container topMostOverlayContent;
 
-        private FrameworkConfigManager frameworkConfig;
+        [Resolved]
+        private FrameworkConfigManager frameworkConfig { get; set; }
 
         private ScalingContainer screenContainer;
 
diff --git a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
index 7067e02cd2..be3a84ca00 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
@@ -33,20 +33,21 @@ namespace osu.Game.Overlays.AccountCreation
         private OsuTextBox emailTextBox;
         private OsuPasswordTextBox passwordTextBox;
 
-        private IAPIProvider api;
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
         private ShakeContainer registerShake;
         private IEnumerable<Drawable> characterCheckText;
 
         private OsuTextBox[] textboxes;
         private ProcessingOverlay processingOverlay;
-        private GameHost host;
+
+        [Resolved]
+        private GameHost host { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, IAPIProvider api, GameHost host)
+        private void load(OsuColour colours)
         {
-            this.api = api;
-            this.host = host;
-
             InternalChildren = new Drawable[]
             {
                 new FillFlowContainer
diff --git a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
index f91d2e3323..3c3c27ab6f 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
@@ -22,7 +22,9 @@ namespace osu.Game.Overlays.AccountCreation
     {
         private OsuTextFlowContainer multiAccountExplanationText;
         private LinkFlowContainer furtherAssistance;
-        private IAPIProvider api;
+
+        [Resolved]
+        private IAPIProvider api { get; set; }
 
         private const string help_centre_url = "/help/wiki/Help_Centre#login";
 
@@ -39,10 +41,8 @@ namespace osu.Game.Overlays.AccountCreation
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(OsuColour colours, IAPIProvider api, OsuGame game, TextureStore textures)
+        private void load(OsuColour colours, OsuGame game, TextureStore textures)
         {
-            this.api = api;
-
             if (string.IsNullOrEmpty(api.ProvidedUsername))
                 return;
 
diff --git a/osu.Game/Overlays/BeatmapSetOverlay.cs b/osu.Game/Overlays/BeatmapSetOverlay.cs
index 7624351e41..d29997f7e5 100644
--- a/osu.Game/Overlays/BeatmapSetOverlay.cs
+++ b/osu.Game/Overlays/BeatmapSetOverlay.cs
@@ -25,7 +25,8 @@ namespace osu.Game.Overlays
         public const float RIGHT_WIDTH = 275;
         protected readonly Header Header;
 
-        private RulesetStore rulesets;
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
 
         private readonly Bindable<BeatmapSetInfo> beatmapSet = new Bindable<BeatmapSetInfo>();
 
@@ -90,10 +91,8 @@ namespace osu.Game.Overlays
         }
 
         [BackgroundDependencyLoader]
-        private void load(RulesetStore rulesets)
+        private void load()
         {
-            this.rulesets = rulesets;
-
             background.Colour = ColourProvider.Background6;
         }
 
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index f2aef0995f..bdc241a437 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -30,7 +30,8 @@ namespace osu.Game.Overlays
         private const float textbox_height = 60;
         private const float channel_selection_min_height = 0.3f;
 
-        private ChannelManager channelManager;
+        [Resolved]
+        private ChannelManager channelManager { get; set; }
 
         private Container<DrawableChannel> currentChannelContainer;
 
@@ -72,7 +73,7 @@ namespace osu.Game.Overlays
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config, OsuColour colours, ChannelManager channelManager)
+        private void load(OsuConfigManager config, OsuColour colours)
         {
             const float padding = 5;
 
@@ -209,8 +210,6 @@ namespace osu.Game.Overlays
 
             chatBackground.Colour = colours.ChatBlue;
 
-            this.channelManager = channelManager;
-
             loading.Show();
 
             // This is a relatively expensive (and blocking) operation.
diff --git a/osu.Game/Overlays/Direct/PlayButton.cs b/osu.Game/Overlays/Direct/PlayButton.cs
index 2a77e7ca26..10abe15177 100644
--- a/osu.Game/Overlays/Direct/PlayButton.cs
+++ b/osu.Game/Overlays/Direct/PlayButton.cs
@@ -85,13 +85,12 @@ namespace osu.Game.Overlays.Direct
             Playing.ValueChanged += playingStateChanged;
         }
 
-        private PreviewTrackManager previewTrackManager;
+        [Resolved]
+        private PreviewTrackManager previewTrackManager { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colour, PreviewTrackManager previewTrackManager)
+        private void load(OsuColour colour)
         {
-            this.previewTrackManager = previewTrackManager;
-
             hoverColour = colour.Yellow;
         }
 
diff --git a/osu.Game/Overlays/DirectOverlay.cs b/osu.Game/Overlays/DirectOverlay.cs
index e4cef319fe..6cc48f09bd 100644
--- a/osu.Game/Overlays/DirectOverlay.cs
+++ b/osu.Game/Overlays/DirectOverlay.cs
@@ -27,7 +27,8 @@ namespace osu.Game.Overlays
     {
         private const float panel_padding = 10f;
 
-        private RulesetStore rulesets;
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
 
         private readonly FillFlowContainer resultCountsContainer;
         private readonly OsuSpriteText resultCountsText;
@@ -155,11 +156,8 @@ namespace osu.Game.Overlays
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, RulesetStore rulesets, PreviewTrackManager previewTrackManager)
+        private void load(OsuColour colours)
         {
-            this.rulesets = rulesets;
-            this.previewTrackManager = previewTrackManager;
-
             resultCountsContainer.Colour = colours.Yellow;
         }
 
@@ -228,7 +226,9 @@ namespace osu.Game.Overlays
         private readonly Bindable<string> currentQuery = new Bindable<string>(string.Empty);
 
         private ScheduledDelegate queryChangedDebounce;
-        private PreviewTrackManager previewTrackManager;
+        
+        [Resolved]
+        private PreviewTrackManager previewTrackManager { get; set; }
 
         private void queueUpdateSearch(bool queryTextChanged = false)
         {
diff --git a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
index d2fcc2652a..58ca2143f9 100644
--- a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
+++ b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
@@ -66,13 +66,12 @@ namespace osu.Game.Overlays.KeyBinding
             CornerRadius = padding;
         }
 
-        private KeyBindingStore store;
+        [Resolved]
+        private KeyBindingStore store { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, KeyBindingStore store)
+        private void load(OsuColour colours)
         {
-            this.store = store;
-
             EdgeEffect = new EdgeEffectParameters
             {
                 Radius = 2,
diff --git a/osu.Game/Overlays/Music/PlaylistOverlay.cs b/osu.Game/Overlays/Music/PlaylistOverlay.cs
index 7c391e27f9..8f753fd3aa 100644
--- a/osu.Game/Overlays/Music/PlaylistOverlay.cs
+++ b/osu.Game/Overlays/Music/PlaylistOverlay.cs
@@ -26,16 +26,17 @@ namespace osu.Game.Overlays.Music
         private readonly BindableList<BeatmapSetInfo> beatmapSets = new BindableList<BeatmapSetInfo>();
 
         private readonly Bindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
-        private BeatmapManager beatmaps;
+
+        [Resolved]
+        private BeatmapManager beatmaps { get; set; }
 
         private FilterControl filter;
         private Playlist list;
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, Bindable<WorkingBeatmap> beatmap, BeatmapManager beatmaps)
+        private void load(OsuColour colours, Bindable<WorkingBeatmap> beatmap)
         {
             this.beatmap.BindTo(beatmap);
-            this.beatmaps = beatmaps;
 
             Children = new Drawable[]
             {
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs
index 0612f028bc..3cc233ef73 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs
@@ -14,15 +14,10 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
     {
         protected override string Header => "Devices";
 
-        private AudioManager audio;
+        [Resolved]
+        private AudioManager audio { get; set; }
         private SettingsDropdown<string> dropdown;
 
-        [BackgroundDependencyLoader]
-        private void load(AudioManager audio)
-        {
-            this.audio = audio;
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
diff --git a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
index e485aa5ea9..b41c7d5afb 100644
--- a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
@@ -29,7 +29,9 @@ namespace osu.Game.Overlays.Settings.Sections.General
     {
         private bool bounding = true;
         private LoginForm form;
-        private OsuColour colours;
+
+        [Resolved]
+        private OsuColour colours { get; set; }
 
         private UserPanel panel;
         private UserDropdown dropdown;
@@ -60,10 +62,8 @@ namespace osu.Game.Overlays.Settings.Sections.General
         }
 
         [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(OsuColour colours, IAPIProvider api)
+        private void load(IAPIProvider api)
         {
-            this.colours = colours;
-
             api?.Register(this);
         }
 
@@ -201,7 +201,9 @@ namespace osu.Game.Overlays.Settings.Sections.General
             private TextBox username;
             private TextBox password;
             private ShakeContainer shakeSignIn;
-            private IAPIProvider api;
+
+            [Resolved]
+            private IAPIProvider api { get; set; }
 
             public Action RequestHide;
 
@@ -214,9 +216,8 @@ namespace osu.Game.Overlays.Settings.Sections.General
             }
 
             [BackgroundDependencyLoader(permitNulls: true)]
-            private void load(IAPIProvider api, OsuConfigManager config, AccountCreationOverlay accountCreation)
+            private void load(OsuConfigManager config, AccountCreationOverlay accountCreation)
             {
-                this.api = api;
                 Direction = FillDirection.Vertical;
                 Spacing = new Vector2(0, 5);
                 AutoSizeAxes = Axes.Y;
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index efbb08b7df..b73c8f7622 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -29,7 +29,9 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
         private Bindable<Size> sizeFullscreen;
         private readonly IBindableList<WindowMode> windowModes = new BindableList<WindowMode>();
 
-        private OsuGameBase game;
+        [Resolved]
+        private OsuGameBase game { get; set; }
+
         private SettingsDropdown<Size> resolutionDropdown;
         private SettingsDropdown<WindowMode> windowModeDropdown;
 
@@ -41,10 +43,8 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
         private const int transition_duration = 400;
 
         [BackgroundDependencyLoader]
-        private void load(FrameworkConfigManager config, OsuConfigManager osuConfig, OsuGameBase game, GameHost host)
+        private void load(FrameworkConfigManager config, OsuConfigManager osuConfig, GameHost host)
         {
-            this.game = game;
-
             scalingMode = osuConfig.GetBindable<ScalingMode>(OsuSetting.Scaling);
             sizeFullscreen = config.GetBindable<Size>(FrameworkSetting.SizeFullscreen);
             scalingSizeX = osuConfig.GetBindable<float>(OsuSetting.ScalingSizeX);
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index d3029d8ab9..b229014c84 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -24,13 +24,12 @@ namespace osu.Game.Overlays.Settings.Sections
         private readonly Bindable<SkinInfo> dropdownBindable = new Bindable<SkinInfo> { Default = SkinInfo.Default };
         private readonly Bindable<int> configBindable = new Bindable<int>();
 
-        private SkinManager skins;
+        [Resolved]
+        private SkinManager skins { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config, SkinManager skins)
+        private void load(OsuConfigManager config)
         {
-            this.skins = skins;
-
             FlowContent.Spacing = new Vector2(0, 5);
             Children = new Drawable[]
             {
diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index 8289ca175d..960585b968 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -23,7 +23,8 @@ namespace osu.Game.Rulesets.Judgements
     {
         private const float judgement_size = 128;
 
-        private OsuColour colours;
+        [Resolved]
+        private OsuColour colours { get; set; }
 
         protected readonly JudgementResult Result;
 
@@ -56,10 +57,8 @@ namespace osu.Game.Rulesets.Judgements
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load()
         {
-            this.colours = colours;
-
             InternalChild = JudgementBody = new Container
             {
                 Anchor = Anchor.Centre,
diff --git a/osu.Game/Screens/Edit/Components/PlaybackControl.cs b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
index 66df68418a..897c6ec531 100644
--- a/osu.Game/Screens/Edit/Components/PlaybackControl.cs
+++ b/osu.Game/Screens/Edit/Components/PlaybackControl.cs
@@ -25,15 +25,14 @@ namespace osu.Game.Screens.Edit.Components
     {
         private IconButton playButton;
 
-        private IAdjustableClock adjustableClock;
+        [Resolved]
+        private IAdjustableClock adjustableClock { get; set; }
 
         private readonly BindableNumber<double> tempo = new BindableDouble(1);
 
         [BackgroundDependencyLoader]
-        private void load(IAdjustableClock adjustableClock)
+        private void load()
         {
-            this.adjustableClock = adjustableClock;
-
             Children = new Drawable[]
             {
                 playButton = new IconButton
diff --git a/osu.Game/Screens/Edit/Components/TimeInfoContainer.cs b/osu.Game/Screens/Edit/Components/TimeInfoContainer.cs
index 0391074b11..4bf21d240a 100644
--- a/osu.Game/Screens/Edit/Components/TimeInfoContainer.cs
+++ b/osu.Game/Screens/Edit/Components/TimeInfoContainer.cs
@@ -14,7 +14,8 @@ namespace osu.Game.Screens.Edit.Components
     {
         private readonly OsuSpriteText trackTimer;
 
-        private IAdjustableClock adjustableClock;
+        [Resolved]
+        private IAdjustableClock adjustableClock { get; set; }
 
         public TimeInfoContainer()
         {
@@ -30,12 +31,6 @@ namespace osu.Game.Screens.Edit.Components
             };
         }
 
-        [BackgroundDependencyLoader]
-        private void load(IAdjustableClock adjustableClock)
-        {
-            this.adjustableClock = adjustableClock;
-        }
-
         protected override void Update()
         {
             base.Update();
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index 0475e68e42..ddca5e42c2 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -24,7 +24,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         public readonly Bindable<bool> WaveformVisible = new Bindable<bool>();
         public readonly IBindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
 
-        private IAdjustableClock adjustableClock;
+        [Resolved]
+        private IAdjustableClock adjustableClock { get; set; }
 
         public Timeline()
         {
@@ -36,10 +37,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private WaveformGraph waveform;
 
         [BackgroundDependencyLoader]
-        private void load(IBindable<WorkingBeatmap> beatmap, IAdjustableClock adjustableClock, OsuColour colours)
+        private void load(IBindable<WorkingBeatmap> beatmap, OsuColour colours)
         {
-            this.adjustableClock = adjustableClock;
-
             Add(waveform = new WaveformGraph
             {
                 RelativeSizeAxes = Axes.Both,
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index 4deaa68467..29f32406e8 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -102,13 +102,12 @@ namespace osu.Game.Screens.Menu
                 this.background = background;
             }
 
-            private OsuGameBase game;
+            [Resolved]
+            private OsuGameBase game { get; set; }
 
             [BackgroundDependencyLoader]
-            private void load(TextureStore textures, OsuGameBase game)
+            private void load(TextureStore textures)
             {
-                this.game = game;
-
                 InternalChildren = new Drawable[]
                 {
                     triangles = new GlitchingTriangles
diff --git a/osu.Game/Screens/Multi/Ranking/Pages/RoomLeaderboardPage.cs b/osu.Game/Screens/Multi/Ranking/Pages/RoomLeaderboardPage.cs
index ff5471cf4a..f8fb192b5c 100644
--- a/osu.Game/Screens/Multi/Ranking/Pages/RoomLeaderboardPage.cs
+++ b/osu.Game/Screens/Multi/Ranking/Pages/RoomLeaderboardPage.cs
@@ -23,7 +23,9 @@ namespace osu.Game.Screens.Multi.Ranking.Pages
 {
     public class RoomLeaderboardPage : ResultsPage
     {
-        private OsuColour colours;
+        [Resolved]
+        private OsuColour colours { get; set; }
+
         private TextFlowContainer rankText;
 
         [Resolved(typeof(Room), nameof(Room.Name))]
@@ -35,10 +37,8 @@ namespace osu.Game.Screens.Multi.Ranking.Pages
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load()
         {
-            this.colours = colours;
-
             MatchLeaderboard leaderboard;
 
             Children = new Drawable[]
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 9bfdcd79fe..bd43b23a9f 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -65,7 +65,8 @@ namespace osu.Game.Screens.Play
 
         private Ruleset ruleset;
 
-        private IAPIProvider api;
+        [Resolved]
+        private IAPIProvider api { get; set; }
 
         private SampleChannel sampleRestart;
 
@@ -118,10 +119,8 @@ namespace osu.Game.Screens.Play
             => dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio, IAPIProvider api, OsuConfigManager config)
+        private void load(AudioManager audio, OsuConfigManager config)
         {
-            this.api = api;
-
             Mods.Value = base.Mods.Value.Select(m => m.CreateCopy()).ToArray();
 
             if (Beatmap.Value is DummyWorkingBeatmap)
diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 577d999388..85b892336a 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -37,7 +37,8 @@ namespace osu.Game.Screens.Select
         private readonly FailRetryGraph failRetryGraph;
         private readonly DimmedLoadingLayer loading;
 
-        private IAPIProvider api;
+        [Resolved]
+        private IAPIProvider api { get; set; }
 
         private ScheduledDelegate pendingBeatmapSwitch;
 
@@ -160,12 +161,6 @@ namespace osu.Game.Screens.Select
             };
         }
 
-        [BackgroundDependencyLoader]
-        private void load(IAPIProvider api)
-        {
-            this.api = api;
-        }
-
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index fba7a328c1..31aca11b86 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -37,7 +37,8 @@ namespace osu.Game.Screens.Select.Carousel
         private Triangles triangles;
         private StarCounter starCounter;
 
-        private BeatmapSetOverlay beatmapOverlay;
+        [Resolved]
+        private BeatmapSetOverlay beatmapOverlay { get; set; }
 
         public DrawableCarouselBeatmap(CarouselBeatmap panel)
             : base(panel)
@@ -47,10 +48,8 @@ namespace osu.Game.Screens.Select.Carousel
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(SongSelect songSelect, BeatmapManager manager, BeatmapSetOverlay beatmapOverlay)
+        private void load(SongSelect songSelect, BeatmapManager manager)
         {
-            this.beatmapOverlay = beatmapOverlay;
-
             if (songSelect != null)
             {
                 startRequested = b => songSelect.FinaliseSelection(b);
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 699e01bca7..db59d8a4de 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -30,7 +30,8 @@ namespace osu.Game.Screens.Select.Carousel
         private Action<BeatmapSetInfo> restoreHiddenRequested;
         private Action<int> viewDetails;
 
-        private DialogOverlay dialogOverlay;
+        [Resolved]
+        private DialogOverlay dialogOverlay { get; set; }
         private readonly BeatmapSetInfo beatmapSet;
 
         public DrawableCarouselBeatmapSet(CarouselBeatmapSet set)
@@ -40,10 +41,9 @@ namespace osu.Game.Screens.Select.Carousel
         }
 
         [BackgroundDependencyLoader(true)]
-        private void load(BeatmapManager manager, BeatmapSetOverlay beatmapOverlay, DialogOverlay overlay)
+        private void load(BeatmapManager manager, BeatmapSetOverlay beatmapOverlay)
         {
             restoreHiddenRequested = s => s.Beatmaps.ForEach(manager.Restore);
-            dialogOverlay = overlay;
             if (beatmapOverlay != null)
                 viewDetails = beatmapOverlay.FetchAndShowBeatmapSet;
 
diff --git a/osu.Game/Skinning/SkinnableSound.cs b/osu.Game/Skinning/SkinnableSound.cs
index fc6afd0b27..a78c04ecd4 100644
--- a/osu.Game/Skinning/SkinnableSound.cs
+++ b/osu.Game/Skinning/SkinnableSound.cs
@@ -21,7 +21,8 @@ namespace osu.Game.Skinning
 
         private SampleChannel[] channels;
 
-        private ISampleStore samples;
+        [Resolved]
+        private ISampleStore samples { get; set; }
 
         public SkinnableSound(IEnumerable<ISampleInfo> hitSamples)
         {
@@ -33,12 +34,6 @@ namespace osu.Game.Skinning
             this.hitSamples = new[] { hitSamples };
         }
 
-        [BackgroundDependencyLoader]
-        private void load(ISampleStore samples)
-        {
-            this.samples = samples;
-        }
-
         private bool looping;
 
         public bool Looping
diff --git a/osu.Game/Updater/SimpleUpdateManager.cs b/osu.Game/Updater/SimpleUpdateManager.cs
index 5412b11b33..e490ac14e9 100644
--- a/osu.Game/Updater/SimpleUpdateManager.cs
+++ b/osu.Game/Updater/SimpleUpdateManager.cs
@@ -20,12 +20,13 @@ namespace osu.Game.Updater
     public class SimpleUpdateManager : UpdateManager
     {
         private string version;
-        private GameHost host;
+
+        [Resolved]
+        private GameHost host { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load(OsuGameBase game, GameHost host)
+        private void load(OsuGameBase game)
         {
-            this.host = host;
             version = game.Version;
 
             if (game.IsDeployedBuild)

From a7c2fd078f03bc9c1c808c54e3a5d2d8a6ae61cc Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Fri, 14 Feb 2020 20:27:21 +0700
Subject: [PATCH 0502/1142] Fix remaining cases

---
 osu.Game/Beatmaps/Drawables/DifficultyIcon.cs | 6 +++---
 osu.Game/Online/API/APIAccess.cs              | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
index a3128e36c4..8a0d981e49 100644
--- a/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
+++ b/osu.Game/Beatmaps/Drawables/DifficultyIcon.cs
@@ -150,12 +150,12 @@ namespace osu.Game.Beatmaps.Drawables
                 };
             }
 
-            private OsuColour colours;
+            [Resolved]
+            private OsuColour colours { get; set; }
 
             [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
+            private void load()
             {
-                this.colours = colours;
                 background.Colour = colours.Gray3;
             }
 
diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 23c931d161..ab87607112 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -9,6 +9,7 @@ using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.ExceptionExtensions;
 using osu.Framework.Graphics;
@@ -21,7 +22,9 @@ namespace osu.Game.Online.API
 {
     public class APIAccess : Component, IAPIProvider
     {
-        private readonly OsuConfigManager config;
+        [Resolved]
+        private OsuConfigManager config { get; set; }
+
         private readonly OAuth authentication;
 
         public string Endpoint => @"https://osu.ppy.sh";

From 10798aeab3ec493cec17daab1746e23a609c8cc2 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Fri, 14 Feb 2020 20:30:27 +0700
Subject: [PATCH 0503/1142] Fix code formatting

---
 osu.Game/Overlays/DirectOverlay.cs                              | 2 +-
 .../Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs    | 1 +
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs  | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/DirectOverlay.cs b/osu.Game/Overlays/DirectOverlay.cs
index 6cc48f09bd..a6f8b65a0d 100644
--- a/osu.Game/Overlays/DirectOverlay.cs
+++ b/osu.Game/Overlays/DirectOverlay.cs
@@ -226,7 +226,7 @@ namespace osu.Game.Overlays
         private readonly Bindable<string> currentQuery = new Bindable<string>(string.Empty);
 
         private ScheduledDelegate queryChangedDebounce;
-        
+
         [Resolved]
         private PreviewTrackManager previewTrackManager { get; set; }
 
diff --git a/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs
index 3cc233ef73..3da64e0de4 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs
@@ -16,6 +16,7 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
 
         [Resolved]
         private AudioManager audio { get; set; }
+
         private SettingsDropdown<string> dropdown;
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index db59d8a4de..bf7329b305 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -32,6 +32,7 @@ namespace osu.Game.Screens.Select.Carousel
 
         [Resolved]
         private DialogOverlay dialogOverlay { get; set; }
+
         private readonly BeatmapSetInfo beatmapSet;
 
         public DrawableCarouselBeatmapSet(CarouselBeatmapSet set)

From c46d8287164a88c70703598c169531684a89e596 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Fri, 14 Feb 2020 20:59:51 +0700
Subject: [PATCH 0504/1142] Preserve permitNulls

---
 osu.Game/Online/Chat/ExternalLinkOpener.cs                    | 4 ++--
 osu.Game/Online/DownloadTrackingComposite.cs                  | 2 +-
 osu.Game/Overlays/AccountCreation/ScreenWarning.cs            | 2 +-
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs   | 2 +-
 .../Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Online/Chat/ExternalLinkOpener.cs b/osu.Game/Online/Chat/ExternalLinkOpener.cs
index da90ea6845..a5958d38cb 100644
--- a/osu.Game/Online/Chat/ExternalLinkOpener.cs
+++ b/osu.Game/Online/Chat/ExternalLinkOpener.cs
@@ -13,10 +13,10 @@ namespace osu.Game.Online.Chat
 {
     public class ExternalLinkOpener : Component
     {
-        [Resolved]
+        [Resolved(CanBeNull = true)]
         private GameHost host { get; set; }
 
-        [Resolved]
+        [Resolved(CanBeNull = true)]
         private DialogOverlay dialogOverlay { get; set; }
 
         private Bindable<bool> externalLinkWarning;
diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 9eb5f36729..6e7ef99c6d 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Online
     {
         protected readonly Bindable<TModel> Model = new Bindable<TModel>();
 
-        [Resolved]
+        [Resolved(CanBeNull = true)]
         private TModelManager manager { get; set; }
 
         /// <summary>
diff --git a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
index 3c3c27ab6f..5375476c9e 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenWarning.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Overlays.AccountCreation
         private OsuTextFlowContainer multiAccountExplanationText;
         private LinkFlowContainer furtherAssistance;
 
-        [Resolved]
+        [Resolved(CanBeNull = true)]
         private IAPIProvider api { get; set; }
 
         private const string help_centre_url = "/help/wiki/Help_Centre#login";
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index 31aca11b86..d9eeec9f85 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Screens.Select.Carousel
         private Triangles triangles;
         private StarCounter starCounter;
 
-        [Resolved]
+        [Resolved(CanBeNull = true)]
         private BeatmapSetOverlay beatmapOverlay { get; set; }
 
         public DrawableCarouselBeatmap(CarouselBeatmap panel)
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index bf7329b305..997f2382fc 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Screens.Select.Carousel
         private Action<BeatmapSetInfo> restoreHiddenRequested;
         private Action<int> viewDetails;
 
-        [Resolved]
+        [Resolved(CanBeNull = true)]
         private DialogOverlay dialogOverlay { get; set; }
 
         private readonly BeatmapSetInfo beatmapSet;

From 61d539dc6794b1108aeab5e065a322f7e7b53795 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 14 Feb 2020 23:39:39 +0900
Subject: [PATCH 0505/1142] Fix first playlist item not getting selected

---
 .../Multiplayer/TestSceneMatchSubScreen.cs    | 99 +++++++++++++------
 .../Screens/Multi/Match/MatchSubScreen.cs     | 21 ++--
 2 files changed, 81 insertions(+), 39 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
index 61def4be1a..7f79e306ad 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSubScreen.cs
@@ -3,19 +3,28 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Screens;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.Multi;
 using osu.Game.Screens.Multi.Match;
 using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Tests.Beatmaps;
 using osu.Game.Users;
+using osuTK.Input;
+using Header = osu.Game.Screens.Multi.Match.Components.Header;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestSceneMatchSubScreen : ScreenTestScene
+    public class TestSceneMatchSubScreen : MultiplayerTestScene
     {
         protected override bool UseOnlineAPI => true;
 
@@ -27,8 +36,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
             typeof(Footer)
         };
 
-        [Cached]
-        private readonly Bindable<Room> currentRoom = new Bindable<Room>();
+        [Cached(typeof(IRoomManager))]
+        private readonly TestRoomManager roomManager = new TestRoomManager();
 
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
@@ -36,51 +45,77 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
-        public TestSceneMatchSubScreen()
+        private TestMatchSubScreen match;
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
         {
-            currentRoom.Value = new Room();
+            Room.CopyFrom(new Room());
+        });
+
+        [SetUpSteps]
+        public void SetupSteps()
+        {
+            AddStep("load match", () => LoadScreen(match = new TestMatchSubScreen(Room)));
+            AddUntilStep("wait for load", () => match.IsCurrentScreen());
         }
 
         [Test]
-        public void TestShowRoom()
+        public void TestPlaylistItemSelectedOnCreate()
         {
-            AddStep(@"show", () =>
+            AddStep("set room properties", () =>
             {
-                currentRoom.Value.RoomID.Value = 1;
-                currentRoom.Value.Availability.Value = RoomAvailability.Public;
-                currentRoom.Value.Duration.Value = TimeSpan.FromHours(24);
-                currentRoom.Value.Host.Value = new User { Username = "peppy", Id = 2 };
-                currentRoom.Value.Name.Value = "super secret room";
-                currentRoom.Value.Participants.AddRange(new[]
+                Room.Name.Value = "my awesome room";
+                Room.Host.Value = new User { Id = 2, Username = "peppy" };
+                Room.Playlist.Add(new PlaylistItem
                 {
-                    new User { Username = "peppy", Id = 2 },
-                    new User { Username = "smoogipoo", Id = 1040328 }
+                    Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
+                    Ruleset = { Value = new OsuRuleset().RulesetInfo }
                 });
-                currentRoom.Value.Playlist.Add(new PlaylistItem
-                {
-                    Beatmap = { Value = beatmaps.GetAllUsableBeatmapSets()[0].Beatmaps[0] },
-                    Ruleset = { Value = rulesets.GetRuleset(2) },
-                });
-
-                LoadScreen(new MatchSubScreen(currentRoom.Value));
             });
+
+            AddStep("move mouse to create button", () =>
+            {
+                var footer = match.ChildrenOfType<Footer>().Single();
+                InputManager.MoveMouseTo(footer.ChildrenOfType<OsuButton>().Single());
+            });
+
+            AddStep("click", () => InputManager.Click(MouseButton.Left));
+
+            AddAssert("first playlist item selected", () => match.SelectedItem.Value == Room.Playlist[0]);
         }
 
-        [Test]
-        public void TestShowSettings()
+        private class TestMatchSubScreen : MatchSubScreen
         {
-            AddStep(@"show", () =>
+            public new Bindable<PlaylistItem> SelectedItem => base.SelectedItem;
+
+            public TestMatchSubScreen(Room room)
+                : base(room)
             {
-                currentRoom.Value.RoomID.Value = null;
-                LoadScreen(new MatchSubScreen(currentRoom.Value));
-            });
+            }
         }
 
-        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+        private class TestRoomManager : IRoomManager
         {
-            var dependencies = new CachedModelDependencyContainer<Room>(base.CreateChildDependencies(parent));
-            dependencies.Model.BindTo(currentRoom);
-            return dependencies;
+            public event Action RoomsUpdated
+            {
+                add => throw new NotImplementedException();
+                remove => throw new NotImplementedException();
+            }
+
+            public IBindableList<Room> Rooms { get; } = new BindableList<Room>();
+
+            public void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
+            {
+                room.RoomID.Value = 1;
+                onSuccess?.Invoke(room);
+            }
+
+            public void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) => onSuccess?.Invoke(room);
+
+            public void PartRoom()
+            {
+            }
         }
     }
 }
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index 44fccdaa13..75f836fe75 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -49,7 +49,8 @@ namespace osu.Game.Screens.Multi.Match
         [Resolved(canBeNull: true)]
         private Multiplayer multiplayer { get; set; }
 
-        private readonly Bindable<PlaylistItem> selectedItem = new Bindable<PlaylistItem>();
+        protected readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
+
         private LeaderboardChatDisplay leaderboardChatDisplay;
         private MatchSettingsOverlay settingsOverlay;
 
@@ -115,7 +116,7 @@ namespace osu.Game.Screens.Multi.Match
                                                                 Padding = new MarginPadding { Horizontal = 5 },
                                                                 Child = new OverlinedPlaylist(true) // Temporarily always allow selection
                                                                 {
-                                                                    SelectedItem = { BindTarget = selectedItem }
+                                                                    SelectedItem = { BindTarget = SelectedItem }
                                                                 }
                                                             },
                                                             new Container
@@ -143,7 +144,7 @@ namespace osu.Game.Screens.Multi.Match
                             new Footer
                             {
                                 OnStart = onStart,
-                                SelectedItem = { BindTarget = selectedItem }
+                                SelectedItem = { BindTarget = SelectedItem }
                             }
                         }
                     },
@@ -171,11 +172,17 @@ namespace osu.Game.Screens.Multi.Match
                 if (id.NewValue == null)
                     settingsOverlay.Show();
                 else
+                {
                     settingsOverlay.Hide();
+
+                    // Set the first playlist item.
+                    // This is scheduled since updating the room and playlist may happen in an arbitrary order (via Room.CopyFrom()).
+                    Schedule(() => SelectedItem.Value = playlist.FirstOrDefault());
+                }
             }, true);
 
-            selectedItem.BindValueChanged(selectedItemChanged);
-            selectedItem.Value = playlist.FirstOrDefault();
+            SelectedItem.BindValueChanged(selectedItemChanged);
+            SelectedItem.Value = playlist.FirstOrDefault();
 
             beatmapManager.ItemAdded += beatmapAdded;
         }
@@ -200,7 +207,7 @@ namespace osu.Game.Screens.Multi.Match
 
         private void updateWorkingBeatmap()
         {
-            var beatmap = selectedItem.Value?.Beatmap.Value;
+            var beatmap = SelectedItem.Value?.Beatmap.Value;
 
             // Retrieve the corresponding local beatmap, since we can't directly use the playlist's beatmap info
             var localBeatmap = beatmap == null ? null : beatmapManager.QueryBeatmap(b => b.OnlineBeatmapID == beatmap.OnlineBeatmapID);
@@ -222,7 +229,7 @@ namespace osu.Game.Screens.Multi.Match
             {
                 default:
                 case GameTypeTimeshift _:
-                    multiplayer?.Start(() => new TimeshiftPlayer(selectedItem.Value)
+                    multiplayer?.Start(() => new TimeshiftPlayer(SelectedItem.Value)
                     {
                         Exited = () => leaderboardChatDisplay.RefreshScores()
                     });

From 2bd2cd1d3f16cf8c4cedbb7ca2e0e23751badaaf Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Fri, 14 Feb 2020 21:59:33 +0700
Subject: [PATCH 0506/1142] Use OsuConfigManager from ctor instead

---
 osu.Game/Online/API/APIAccess.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index ab87607112..cae073f596 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -22,7 +22,6 @@ namespace osu.Game.Online.API
 {
     public class APIAccess : Component, IAPIProvider
     {
-        [Resolved]
         private OsuConfigManager config { get; set; }
 
         private readonly OAuth authentication;

From 7de7748607c236838b5151eabe1f760d5650220e Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Fri, 14 Feb 2020 22:02:10 +0700
Subject: [PATCH 0507/1142] Remove unnecessary nullability

---
 osu.Game/Online/Chat/ExternalLinkOpener.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Chat/ExternalLinkOpener.cs b/osu.Game/Online/Chat/ExternalLinkOpener.cs
index a5958d38cb..8407e2ca6a 100644
--- a/osu.Game/Online/Chat/ExternalLinkOpener.cs
+++ b/osu.Game/Online/Chat/ExternalLinkOpener.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Online.Chat
 {
     public class ExternalLinkOpener : Component
     {
-        [Resolved(CanBeNull = true)]
+        [Resolved]
         private GameHost host { get; set; }
 
         [Resolved(CanBeNull = true)]

From ee14a275a231166322aefb18d12951198e06f4f6 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Fri, 14 Feb 2020 22:02:44 +0700
Subject: [PATCH 0508/1142] Make IAPIProvider instances nullable

---
 osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
index b41c7d5afb..c55183772b 100644
--- a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
@@ -202,7 +202,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
             private TextBox password;
             private ShakeContainer shakeSignIn;
 
-            [Resolved]
+            [Resolved(CanBeNull = true)]
             private IAPIProvider api { get; set; }
 
             public Action RequestHide;

From 7866c26f955c6b568f69262c3bcd1461b41c1e0a Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Fri, 14 Feb 2020 22:18:56 +0700
Subject: [PATCH 0509/1142] Make OsuConfigManager instances readonly

---
 osu.Game/Online/API/APIAccess.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index cae073f596..adfef1d11f 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -9,7 +9,6 @@ using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
-using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.ExceptionExtensions;
 using osu.Framework.Graphics;
@@ -22,7 +21,7 @@ namespace osu.Game.Online.API
 {
     public class APIAccess : Component, IAPIProvider
     {
-        private OsuConfigManager config { get; set; }
+        private readonly OsuConfigManager config;
 
         private readonly OAuth authentication;
 

From f64eabc38b2f0f0659b437defe27b5a33c10995b Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 14 Feb 2020 20:49:37 +0300
Subject: [PATCH 0510/1142] Make countries name non-italic

---
 osu.Game/Overlays/Rankings/Tables/CountriesTable.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs b/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs
index 997438ac07..32ac1404bc 100644
--- a/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs
+++ b/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Overlays.Rankings.Tables
         {
             public CountryName(Country country)
             {
-                Font = OsuFont.GetFont(size: 12, italics: true);
+                Font = OsuFont.GetFont(size: 12);
                 Text = country.FullName ?? string.Empty;
             }
 

From 8e1ecddb1dbd05a81b71ef14f513bdd733fd2807 Mon Sep 17 00:00:00 2001
From: voidedWarranties <wz68.scratch@gmail.com>
Date: Fri, 14 Feb 2020 17:23:24 -0800
Subject: [PATCH 0511/1142] Add testing

---
 .../SongSelect/TestScenePlaySongSelect.cs     | 40 +++++++++++++++++++
 .../Carousel/DrawableCarouselBeatmapSet.cs    |  7 ++--
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 80192b9ebc..2b6d7cce58 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -463,6 +463,46 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("Selected beatmap has not changed", () => songSelect.Carousel.SelectedBeatmap.ID == previousID);
         }
 
+        [Test]
+        public void TestDifficultyIconSelecting()
+        {
+            int? previousID = null;
+            addRulesetImportStep(0);
+            createSongSelect();
+
+            AddStep("Store current ID", () => previousID = songSelect.Carousel.SelectedBeatmap.ID);
+            AddStep("Click on a difficulty", () =>
+            {
+                InputManager.MoveMouseTo(songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet.FilterableDifficultyIcon>()
+                                                   .First(icon => icon.Item.Beatmap != songSelect.Carousel.SelectedBeatmap));
+
+                InputManager.PressButton(MouseButton.Left);
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
+            AddAssert("Selected beatmap changed", () => songSelect.Carousel.SelectedBeatmap.ID != previousID);
+
+            AddStep("Filter some difficulties", () => songSelect.Carousel.Filter(new FilterCriteria
+            {
+                BPM = new FilterCriteria.OptionalRange<double>
+                {
+                    Min = songSelect.Carousel.SelectedBeatmapSet.MaxBPM,
+                    IsLowerInclusive = true
+                }
+            }));
+            AddUntilStep("Wait for filter", () => songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet.FilterableDifficultyIcon>().Any(icon => icon.Item.Filtered.Value));
+
+            AddStep("Store current ID", () => previousID = songSelect.Carousel.SelectedBeatmap.ID);
+            AddStep("Click on a filtered difficulty", () =>
+            {
+                InputManager.MoveMouseTo(songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet.FilterableDifficultyIcon>()
+                                                   .First(icon => icon.Item.Filtered.Value));
+
+                InputManager.PressButton(MouseButton.Left);
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
+            AddAssert("Selected beatmap has not changed", () => songSelect.Carousel.SelectedBeatmap.ID == previousID);
+        }
+
         private void addRulesetImportStep(int id) => AddStep($"import test map for ruleset {id}", () => importForRuleset(id));
 
         private void importForRuleset(int id) => manager.Import(createTestBeatmapSet(getImportId(), rulesets.AvailableRulesets.Where(r => r.ID == id).ToArray())).Wait();
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 572580f7c1..4b98c4eeb2 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -211,7 +211,7 @@ namespace osu.Game.Screens.Select.Carousel
         {
             private readonly BindableBool filtered = new BindableBool();
 
-            private readonly CarouselBeatmap item;
+            public readonly CarouselBeatmap Item;
 
             public FilterableDifficultyIcon(CarouselBeatmap item)
                 : base(item.Beatmap)
@@ -220,12 +220,13 @@ namespace osu.Game.Screens.Select.Carousel
                 filtered.ValueChanged += isFiltered => Schedule(() => this.FadeTo(isFiltered.NewValue ? 0.1f : 1, 100));
                 filtered.TriggerChange();
 
-                this.item = item;
+                Item = item;
             }
 
             protected override bool OnClick(ClickEvent e)
             {
-                item.State.Value = CarouselItemState.Selected;
+                if (!filtered.Value)
+                    Item.State.Value = CarouselItemState.Selected;
 
                 return true;
             }

From bb541f5ae4dacdbc3c6d2ce4543db091f0b4900a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 15 Feb 2020 11:54:29 +0900
Subject: [PATCH 0512/1142] Update inspectcode version and fix new issues

---
 build/InspectCode.cake                         |  2 +-
 osu.Game.Rulesets.Catch/Objects/JuiceStream.cs |  2 +-
 .../Online/TestSceneStandAloneChatDisplay.cs   | 18 +++++++++---------
 osu.Game/Screens/Menu/ButtonSystem.cs          | 14 +++++++-------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/build/InspectCode.cake b/build/InspectCode.cake
index 06c56dce87..2e7a1d1b28 100644
--- a/build/InspectCode.cake
+++ b/build/InspectCode.cake
@@ -1,5 +1,5 @@
 #addin "nuget:?package=CodeFileSanity&version=0.0.33"
-#addin "nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2019.3.0"
+#addin "nuget:?package=JetBrains.ReSharper.CommandLineTools&version=2019.3.2"
 #tool "nuget:?package=NVika.MSBuild&version=1.0.1"
 var nVikaToolPath = GetFiles("./tools/NVika.MSBuild.*/tools/NVika.exe").First();
 
diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index b014b32305..11e2466275 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                                 Samples = tickSamples,
                                 StartTime = t + lastEvent.Value.Time,
                                 X = X + Path.PositionAt(
-                                        lastEvent.Value.PathProgress + (t / sinceLastTick) * (e.PathProgress - lastEvent.Value.PathProgress)).X / CatchPlayfield.BASE_WIDTH,
+                                    lastEvent.Value.PathProgress + (t / sinceLastTick) * (e.PathProgress - lastEvent.Value.PathProgress)).X / CatchPlayfield.BASE_WIDTH,
                             });
                         }
                     }
diff --git a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
index 28b5693ef4..492abdd88d 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs
@@ -128,17 +128,17 @@ namespace osu.Game.Tests.Visual.Online
 
             const int messages_per_call = 10;
             AddRepeatStep("add many messages", () =>
+            {
+                for (int i = 0; i < messages_per_call; i++)
                 {
-                    for (int i = 0; i < messages_per_call; i++)
+                    testChannel.AddNewMessages(new Message(sequence++)
                     {
-                        testChannel.AddNewMessages(new Message(sequence++)
-                        {
-                            Sender = longUsernameUser,
-                            Content = "Many messages! " + Guid.NewGuid(),
-                            Timestamp = DateTimeOffset.Now
-                        });
-                    }
-                }, Channel.MAX_HISTORY / messages_per_call + 5);
+                        Sender = longUsernameUser,
+                        Content = "Many messages! " + Guid.NewGuid(),
+                        Timestamp = DateTimeOffset.Now
+                    });
+                }
+            }, Channel.MAX_HISTORY / messages_per_call + 5);
 
             AddAssert("Ensure no adjacent day separators", () =>
             {
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index d94f8aa11a..fe538728e3 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -301,15 +301,15 @@ namespace osu.Game.Screens.Menu
                 case ButtonSystemState.Initial:
                     logoDelayedAction?.Cancel();
                     logoDelayedAction = Scheduler.AddDelayed(() =>
-                        {
-                            logoTrackingContainer.StopTracking();
+                    {
+                        logoTrackingContainer.StopTracking();
 
-                            game?.Toolbar.Hide();
+                        game?.Toolbar.Hide();
 
-                            logo.ClearTransforms(targetMember: nameof(Position));
-                            logo.MoveTo(new Vector2(0.5f), 800, Easing.OutExpo);
-                            logo.ScaleTo(1, 800, Easing.OutExpo);
-                        }, buttonArea.Alpha * 150);
+                        logo.ClearTransforms(targetMember: nameof(Position));
+                        logo.MoveTo(new Vector2(0.5f), 800, Easing.OutExpo);
+                        logo.ScaleTo(1, 800, Easing.OutExpo);
+                    }, buttonArea.Alpha * 150);
                     break;
 
                 case ButtonSystemState.TopLevel:

From 637c1dc8407d31c72023758b794ee9577ca01336 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 15 Feb 2020 14:41:16 +0900
Subject: [PATCH 0513/1142] In the case of only one playlist item, update with
 current selection on select

---
 osu.Game/Screens/Select/MatchSongSelect.cs | 25 +++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index cb0d09b6bb..a115ab9841 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -42,8 +42,16 @@ namespace osu.Game.Screens.Select
 
         protected override bool OnStart()
         {
-            if (Playlist.Count == 0)
-                createNewItem();
+            switch (Playlist.Count)
+            {
+                case 0:
+                    createNewItem();
+                    break;
+
+                case 1:
+                    populateItemFromCurrent(Playlist.Single());
+                    break;
+            }
 
             this.Exit();
 
@@ -55,13 +63,20 @@ namespace osu.Game.Screens.Select
             PlaylistItem item = new PlaylistItem
             {
                 ID = (Playlist.LastOrDefault()?.ID + 1) ?? 0,
-                Beatmap = { Value = Beatmap.Value.BeatmapInfo },
-                Ruleset = { Value = Ruleset.Value }
             };
 
-            item.RequiredMods.AddRange(Mods.Value);
+            populateItemFromCurrent(item);
 
             Playlist.Add(item);
         }
+
+        private void populateItemFromCurrent(PlaylistItem item)
+        {
+            item.Beatmap.Value = Beatmap.Value.BeatmapInfo;
+            item.Ruleset.Value = Ruleset.Value;
+
+            item.RequiredMods.Clear();
+            item.RequiredMods.AddRange(Mods.Value);
+        }
     }
 }

From f54844d8a54e520947885fdf45ee4f11f8551328 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 15 Feb 2020 15:07:10 +0900
Subject: [PATCH 0514/1142] Schedule selection update handling in
 MatchSubScreen to avoid firing when not the current screen

---
 osu.Game/Screens/Multi/Match/MatchSubScreen.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index 890664e99b..bd9aceecc3 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -164,8 +164,8 @@ namespace osu.Game.Screens.Multi.Match
         {
             base.LoadComplete();
 
-            Playlist.ItemsAdded += _ => updateSelectedItem();
-            Playlist.ItemsRemoved += _ => updateSelectedItem();
+            Playlist.ItemsAdded += _ => Scheduler.AddOnce(updateSelectedItem);
+            Playlist.ItemsRemoved += _ => Scheduler.AddOnce(updateSelectedItem);
 
             updateSelectedItem();
         }

From e2e157b4554e9ab9ddd8825a99b4b1b3d083b5fe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 15 Feb 2020 15:52:27 +0900
Subject: [PATCH 0515/1142] Add minimum size rules to fix overlap at non-wide
 resolutions

---
 osu.Game/Screens/Multi/Match/MatchSubScreen.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index 4b1f7b2e9a..a8630b79b1 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -99,6 +99,12 @@ namespace osu.Game.Screens.Multi.Match
                                                 Padding = new MarginPadding { Top = 65 },
                                                 Child = new GridContainer
                                                 {
+                                                    ColumnDimensions = new[]
+                                                    {
+                                                        new Dimension(minSize: 160),
+                                                        new Dimension(minSize: 360),
+                                                        new Dimension(minSize: 400),
+                                                    },
                                                     RelativeSizeAxes = Axes.Both,
                                                     Content = new[]
                                                     {

From 120dab18cfa97fcf3b01595c551a99a98fd8a050 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 15 Feb 2020 16:20:44 +0900
Subject: [PATCH 0516/1142] Fix DownloadTrackingComposite incorrectly receiving
 cancelled state

---
 osu.Game/Database/DownloadableArchiveModelManager.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Database/DownloadableArchiveModelManager.cs b/osu.Game/Database/DownloadableArchiveModelManager.cs
index 4bd9df5f36..1b90898c8d 100644
--- a/osu.Game/Database/DownloadableArchiveModelManager.cs
+++ b/osu.Game/Database/DownloadableArchiveModelManager.cs
@@ -105,9 +105,10 @@ namespace osu.Game.Database
 
             void triggerFailure(Exception error)
             {
+                currentDownloads.Remove(request);
+
                 DownloadFailed?.Invoke(request);
 
-                currentDownloads.Remove(request);
                 notification.State = ProgressNotificationState.Cancelled;
 
                 if (!(error is OperationCanceledException))

From e8f1335b47be059c0c3fcb5c7a6ea7207281c7a4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 15 Feb 2020 16:47:55 +0900
Subject: [PATCH 0517/1142] Allow for easier selection by disabling
 clickability of contained elements until selected

---
 osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
index 1c35d8a53f..b409fa7f0f 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
@@ -51,6 +51,8 @@ namespace osu.Game.Screens.Multi
         private readonly bool allowEdit;
         private readonly bool allowSelection;
 
+        protected override bool ShouldBeConsideredForInput(Drawable child) => allowEdit || SelectedItem.Value == Model;
+
         public DrawableRoomPlaylistItem(PlaylistItem item, bool allowEdit, bool allowSelection)
             : base(item)
         {

From 7c29327167786e5a39e3be6e9825ee7b918c2d64 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 15 Feb 2020 16:56:11 +0900
Subject: [PATCH 0518/1142] Fix download button being visible for already
 downloaded playlist items

---
 .../Screens/Multi/DrawableRoomPlaylistItem.cs | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
index b409fa7f0f..ed48d45501 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
@@ -18,6 +18,7 @@ using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Online;
 using osu.Game.Online.Chat;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Overlays.Direct;
@@ -194,10 +195,9 @@ namespace osu.Game.Screens.Multi
                             Alpha = allowEdit ? 1 : 0,
                             Action = () => RequestDeletion?.Invoke(Model),
                         },
-                        new PanelDownloadButton(item.Beatmap.Value.BeatmapSet)
+                        new PlaylistDownloadButton(item.Beatmap.Value.BeatmapSet)
                         {
-                            Size = new Vector2(50, 30),
-                            Alpha = allowEdit ? 0 : 1
+                            Size = new Vector2(50, 30)
                         }
                     }
                 }
@@ -211,6 +211,27 @@ namespace osu.Game.Screens.Multi
             return true;
         }
 
+        private class PlaylistDownloadButton : PanelDownloadButton
+        {
+            public PlaylistDownloadButton(BeatmapSetInfo beatmapSet, bool noVideo = false)
+                : base(beatmapSet, noVideo)
+            {
+                Alpha = 0;
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                State.BindValueChanged(stateChanged, true);
+            }
+
+            private void stateChanged(ValueChangedEvent<DownloadState> state)
+            {
+                this.FadeTo(state.NewValue == DownloadState.LocallyAvailable ? 0 : 1, 500);
+            }
+        }
+
         // For now, this is the same implementation as in PanelBackground, but supports a beatmap info rather than a working beatmap
         private class PanelBackground : Container // todo: should be a buffered container (https://github.com/ppy/osu-framework/issues/3222)
         {

From 2e24ceb2239d938499f09002718520d30ea9c55e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 15 Feb 2020 16:58:35 +0900
Subject: [PATCH 0519/1142] Move duration higher in match settings display

---
 .../Match/Components/MatchSettingsOverlay.cs  | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
index 776de424ab..e3110cdfc8 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
@@ -129,6 +129,26 @@ namespace osu.Game.Screens.Multi.Match.Components
                                                                 OnCommit = (sender, text) => apply(),
                                                             },
                                                         },
+                                                        new Section("Duration")
+                                                        {
+                                                            Child = DurationField = new DurationDropdown
+                                                            {
+                                                                RelativeSizeAxes = Axes.X,
+                                                                Items = new[]
+                                                                {
+                                                                    TimeSpan.FromMinutes(30),
+                                                                    TimeSpan.FromHours(1),
+                                                                    TimeSpan.FromHours(2),
+                                                                    TimeSpan.FromHours(4),
+                                                                    TimeSpan.FromHours(8),
+                                                                    TimeSpan.FromHours(12),
+                                                                    //TimeSpan.FromHours(16),
+                                                                    TimeSpan.FromHours(24),
+                                                                    TimeSpan.FromDays(3),
+                                                                    TimeSpan.FromDays(7)
+                                                                }
+                                                            }
+                                                        },
                                                         new Section("Room visibility")
                                                         {
                                                             Alpha = disabled_alpha,
@@ -172,26 +192,6 @@ namespace osu.Game.Screens.Multi.Match.Components
                                                                 OnCommit = (sender, text) => apply()
                                                             },
                                                         },
-                                                        new Section("Duration")
-                                                        {
-                                                            Child = DurationField = new DurationDropdown
-                                                            {
-                                                                RelativeSizeAxes = Axes.X,
-                                                                Items = new[]
-                                                                {
-                                                                    TimeSpan.FromMinutes(30),
-                                                                    TimeSpan.FromHours(1),
-                                                                    TimeSpan.FromHours(2),
-                                                                    TimeSpan.FromHours(4),
-                                                                    TimeSpan.FromHours(8),
-                                                                    TimeSpan.FromHours(12),
-                                                                    //TimeSpan.FromHours(16),
-                                                                    TimeSpan.FromHours(24),
-                                                                    TimeSpan.FromDays(3),
-                                                                    TimeSpan.FromDays(7)
-                                                                }
-                                                            }
-                                                        },
                                                         new Section("Password (optional)")
                                                         {
                                                             Alpha = disabled_alpha,

From ac46b3660004f9d828265d398c0adf4447a4ea5a Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Sat, 15 Feb 2020 16:53:44 +0700
Subject: [PATCH 0520/1142] Change right content origin

---
 .../Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
index 0eee34a304..2f983ba16b 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                     new Container
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Padding = new MarginPadding { Left = 10, Right = performance_width + 30 },
+                        Padding = new MarginPadding { Left = 10, Right = performance_width + 120 },
                         Children = new Drawable[]
                         {
                             new FillFlowContainer
@@ -116,7 +116,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                                     CreateRightContent().With(c =>
                                     {
                                         c.Anchor = Anchor.CentreRight;
-                                        c.Origin = Anchor.CentreRight;
+                                        c.Origin = Anchor.CentreLeft;
                                     }),
                                     new FillFlowContainer
                                     {

From d0122b935edd00a514d4bc0088ab2a2dee5cd3a0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 15 Feb 2020 19:40:59 +0900
Subject: [PATCH 0521/1142] Transfer metadata to ensure present on creating a
 new match

---
 osu.Game/Online/Multiplayer/Room.cs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs
index 400afb39a1..2459f65b84 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Multiplayer/Room.cs
@@ -118,8 +118,20 @@ namespace osu.Game.Online.Multiplayer
             if (DateTimeOffset.Now >= EndDate.Value)
                 Status.Value = new RoomStatusEnded();
 
-            foreach (var removedItem in Playlist.Except(other.Playlist).ToArray())
-                Playlist.Remove(removedItem);
+            // transfer local beatmaps across to ensure we have Metadata available (CreateRoomRequest does not give us metadata as expected)
+            foreach (var item in other.Playlist)
+            {
+                var localItem = Playlist.FirstOrDefault(i => i.BeatmapID == item.BeatmapID);
+
+                if (localItem != null)
+                {
+                    item.Beatmap.Value.Metadata = localItem.Beatmap.Value.Metadata;
+                }
+            }
+
+            foreach (var removeableItem in Playlist.Except(other.Playlist).ToArray())
+                Playlist.Remove(removeableItem);
+
             Playlist.AddRange(other.Playlist.Except(Playlist).ToArray());
 
             foreach (var removedItem in Participants.Except(other.Participants).ToArray())

From a8be437103bd0b83b7a306b3ed76b0ceb337270d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 15 Feb 2020 20:29:38 +0900
Subject: [PATCH 0522/1142] Fix failing tests

---
 osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
index ed48d45501..75c751aa61 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
@@ -189,16 +189,16 @@ namespace osu.Game.Screens.Multi
                     X = -18,
                     Children = new Drawable[]
                     {
+                        new PlaylistDownloadButton(item.Beatmap.Value.BeatmapSet)
+                        {
+                            Size = new Vector2(50, 30)
+                        },
                         new IconButton
                         {
                             Icon = FontAwesome.Solid.MinusSquare,
                             Alpha = allowEdit ? 1 : 0,
                             Action = () => RequestDeletion?.Invoke(Model),
                         },
-                        new PlaylistDownloadButton(item.Beatmap.Value.BeatmapSet)
-                        {
-                            Size = new Vector2(50, 30)
-                        }
                     }
                 }
             }

From 01f9966933f2ee2d13cf786216e1114a6552f55d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 15 Feb 2020 16:05:15 +0100
Subject: [PATCH 0523/1142] Cover case of incorrect display in test scene

---
 .../Online/TestSceneUserProfileScores.cs      | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
index 19b72e7071..a72ff2154d 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
@@ -50,6 +50,23 @@ namespace osu.Game.Tests.Visual.Online
                 Accuracy = 0.998546
             };
 
+            var secondScore = new ScoreInfo
+            {
+                PP = 96.83,
+                Rank = ScoreRank.S,
+                Beatmap = new BeatmapInfo
+                {
+                    Metadata = new BeatmapMetadata
+                    {
+                        Title = "Idolize",
+                        Artist = "Creo"
+                    },
+                    Version = "Insane"
+                },
+                Date = DateTimeOffset.Now,
+                Accuracy = 0.9726
+            };
+
             var noPPScore = new ScoreInfo
             {
                 Rank = ScoreRank.B,
@@ -78,7 +95,8 @@ namespace osu.Game.Tests.Visual.Online
                 {
                     new ColourProvidedContainer(OverlayColourScheme.Green, new DrawableProfileScore(score)),
                     new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileScore(noPPScore)),
-                    new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileWeightedScore(score, 0.85))
+                    new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileWeightedScore(score, 0.85)),
+                    new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileWeightedScore(secondScore, 0.66)),
                 }
             });
         }

From 17e34704413ee1cf1d5520cd4a7f10a2569ac177 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 16 Feb 2020 00:22:14 +0900
Subject: [PATCH 0524/1142] Replace hashcode override with local equality
 comparer

---
 .../Multiplayer/TestSceneDrawableRoomPlaylist.cs   | 10 ++++++++++
 osu.Game/Online/Multiplayer/PlaylistItem.cs        |  7 -------
 osu.Game/Online/Multiplayer/Room.cs                | 14 ++++++++++----
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index d2d02412cd..4f54e451b7 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -179,6 +179,16 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("item 0 is selected", () => playlist.SelectedItem.Value == playlist.Items[0]);
         }
 
+        [Test]
+        public void TestChangeBeatmapAndRemove()
+        {
+            createPlaylist(true, true);
+
+            AddStep("change beatmap of first item", () => playlist.Items[0].BeatmapID = 30);
+            moveToDeleteButton(0);
+            AddStep("click delete button", () => InputManager.Click(MouseButton.Left));
+        }
+
         private void moveToItem(int index, Vector2? offset = null)
             => AddStep($"move mouse to item {index}", () => InputManager.MoveMouseTo(playlist.ChildrenOfType<OsuRearrangeableListItem<PlaylistItem>>().ElementAt(index), offset));
 
diff --git a/osu.Game/Online/Multiplayer/PlaylistItem.cs b/osu.Game/Online/Multiplayer/PlaylistItem.cs
index 69e1f0db13..11e4854174 100644
--- a/osu.Game/Online/Multiplayer/PlaylistItem.cs
+++ b/osu.Game/Online/Multiplayer/PlaylistItem.cs
@@ -93,12 +93,5 @@ namespace osu.Game.Online.Multiplayer
         public bool ShouldSerializeapiBeatmap() => false;
 
         public bool Equals(PlaylistItem other) => ID == other?.ID && BeatmapID == other.BeatmapID && RulesetID == other.RulesetID;
-
-        public override int GetHashCode()
-        {
-            // ReSharper disable NonReadonlyMemberInGetHashCode
-            return HashCode.Combine(ID, BeatmapID, RulesetID);
-            // ReSharper restore NonReadonlyMemberInGetHashCode
-        }
     }
 }
diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs
index 2459f65b84..b2226a6f22 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Multiplayer/Room.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 Newtonsoft.Json;
 using osu.Framework.Allocation;
@@ -124,15 +125,13 @@ namespace osu.Game.Online.Multiplayer
                 var localItem = Playlist.FirstOrDefault(i => i.BeatmapID == item.BeatmapID);
 
                 if (localItem != null)
-                {
                     item.Beatmap.Value.Metadata = localItem.Beatmap.Value.Metadata;
-                }
             }
 
-            foreach (var removeableItem in Playlist.Except(other.Playlist).ToArray())
+            foreach (var removeableItem in Playlist.Except(other.Playlist, new PlaylistEqualityComparer()).ToArray())
                 Playlist.Remove(removeableItem);
 
-            Playlist.AddRange(other.Playlist.Except(Playlist).ToArray());
+            Playlist.AddRange(other.Playlist.Except(Playlist, new PlaylistEqualityComparer()).ToArray());
 
             foreach (var removedItem in Participants.Except(other.Participants).ToArray())
                 Participants.Remove(removedItem);
@@ -144,5 +143,12 @@ namespace osu.Game.Online.Multiplayer
         public bool ShouldSerializeRoomID() => false;
         public bool ShouldSerializeHost() => false;
         public bool ShouldSerializeEndDate() => false;
+
+        private class PlaylistEqualityComparer : IEqualityComparer<PlaylistItem>
+        {
+            public bool Equals(PlaylistItem x, PlaylistItem y) => x?.Equals(y) ?? false;
+
+            public int GetHashCode(PlaylistItem obj) => HashCode.Combine(obj.ID, obj.BeatmapID, obj.RulesetID);
+        }
     }
 }

From 8c81f1e684ce4e4b32531f8fb4807b6cc087f002 Mon Sep 17 00:00:00 2001
From: voidedWarranties <wz68.scratch@gmail.com>
Date: Sat, 15 Feb 2020 17:51:55 -0800
Subject: [PATCH 0525/1142] Move CarouselBeatmap access to private, test using
 indices

---
 .../SongSelect/TestScenePlaySongSelect.cs     | 44 +++++++++++++++----
 .../Carousel/DrawableCarouselBeatmapSet.cs    |  6 +--
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 2b6d7cce58..369ae346dc 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -466,36 +466,53 @@ namespace osu.Game.Tests.Visual.SongSelect
         [Test]
         public void TestDifficultyIconSelecting()
         {
-            int? previousID = null;
             addRulesetImportStep(0);
             createSongSelect();
 
-            AddStep("Store current ID", () => previousID = songSelect.Carousel.SelectedBeatmap.ID);
+            DrawableCarouselBeatmapSet set = null;
+            AddStep("Find the DrawableCarouselBeatmapSet", () =>
+            {
+                set = songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet>().First();
+            });
+
+            DrawableCarouselBeatmapSet.FilterableDifficultyIcon difficultyIcon = null;
+            AddStep("Find an icon", () =>
+            {
+                difficultyIcon = set.ChildrenOfType<DrawableCarouselBeatmapSet.FilterableDifficultyIcon>()
+                                    .First(icon => getDifficultyIconIndex(set, icon) != getCurrentBeatmapIndex());
+            });
             AddStep("Click on a difficulty", () =>
             {
-                InputManager.MoveMouseTo(songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet.FilterableDifficultyIcon>()
-                                                   .First(icon => icon.Item.Beatmap != songSelect.Carousel.SelectedBeatmap));
+                InputManager.MoveMouseTo(difficultyIcon);
 
                 InputManager.PressButton(MouseButton.Left);
                 InputManager.ReleaseButton(MouseButton.Left);
             });
-            AddAssert("Selected beatmap changed", () => songSelect.Carousel.SelectedBeatmap.ID != previousID);
+            AddAssert("Selected beatmap correct", () => getCurrentBeatmapIndex() == getDifficultyIconIndex(set, difficultyIcon));
 
+            double? maxBPM = null;
             AddStep("Filter some difficulties", () => songSelect.Carousel.Filter(new FilterCriteria
             {
                 BPM = new FilterCriteria.OptionalRange<double>
                 {
-                    Min = songSelect.Carousel.SelectedBeatmapSet.MaxBPM,
+                    Min = maxBPM = songSelect.Carousel.SelectedBeatmapSet.MaxBPM,
                     IsLowerInclusive = true
                 }
             }));
-            AddUntilStep("Wait for filter", () => songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet.FilterableDifficultyIcon>().Any(icon => icon.Item.Filtered.Value));
 
+            DrawableCarouselBeatmapSet.FilterableDifficultyIcon filteredIcon = null;
+            AddStep("Get filtered icon", () =>
+            {
+                var filteredBeatmap = songSelect.Carousel.SelectedBeatmapSet.Beatmaps.Find(b => b.BPM < maxBPM);
+                int filteredBeatmapIndex = getBeatmapIndex(filteredBeatmap.BeatmapSet, filteredBeatmap);
+                filteredIcon = set.ChildrenOfType<DrawableCarouselBeatmapSet.FilterableDifficultyIcon>().ElementAt(filteredBeatmapIndex);
+            });
+
+            int? previousID = null;
             AddStep("Store current ID", () => previousID = songSelect.Carousel.SelectedBeatmap.ID);
             AddStep("Click on a filtered difficulty", () =>
             {
-                InputManager.MoveMouseTo(songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet.FilterableDifficultyIcon>()
-                                                   .First(icon => icon.Item.Filtered.Value));
+                InputManager.MoveMouseTo(filteredIcon);
 
                 InputManager.PressButton(MouseButton.Left);
                 InputManager.ReleaseButton(MouseButton.Left);
@@ -503,6 +520,15 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("Selected beatmap has not changed", () => songSelect.Carousel.SelectedBeatmap.ID == previousID);
         }
 
+        private int getBeatmapIndex(BeatmapSetInfo set, BeatmapInfo info) => set.Beatmaps.FindIndex(b => b == info);
+
+        private int getCurrentBeatmapIndex() => getBeatmapIndex(songSelect.Carousel.SelectedBeatmapSet, songSelect.Carousel.SelectedBeatmap);
+
+        private int getDifficultyIconIndex(DrawableCarouselBeatmapSet set, DrawableCarouselBeatmapSet.FilterableDifficultyIcon icon)
+        {
+            return set.ChildrenOfType<DrawableCarouselBeatmapSet.FilterableDifficultyIcon>().ToList().FindIndex(i => i == icon);
+        }
+
         private void addRulesetImportStep(int id) => AddStep($"import test map for ruleset {id}", () => importForRuleset(id));
 
         private void importForRuleset(int id) => manager.Import(createTestBeatmapSet(getImportId(), rulesets.AvailableRulesets.Where(r => r.ID == id).ToArray())).Wait();
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 4b98c4eeb2..3d958dc67f 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -211,7 +211,7 @@ namespace osu.Game.Screens.Select.Carousel
         {
             private readonly BindableBool filtered = new BindableBool();
 
-            public readonly CarouselBeatmap Item;
+            private readonly CarouselBeatmap item;
 
             public FilterableDifficultyIcon(CarouselBeatmap item)
                 : base(item.Beatmap)
@@ -220,13 +220,13 @@ namespace osu.Game.Screens.Select.Carousel
                 filtered.ValueChanged += isFiltered => Schedule(() => this.FadeTo(isFiltered.NewValue ? 0.1f : 1, 100));
                 filtered.TriggerChange();
 
-                Item = item;
+                this.item = item;
             }
 
             protected override bool OnClick(ClickEvent e)
             {
                 if (!filtered.Value)
-                    Item.State.Value = CarouselItemState.Selected;
+                    item.State.Value = CarouselItemState.Selected;
 
                 return true;
             }

From cd4643593fdaeb87d3618c6930b4acd4dfb9172f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 16 Feb 2020 11:58:41 +0900
Subject: [PATCH 0526/1142] Fix transform mod not being applied correctly

---
 osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs | 42 ++++++++++++-------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
index cc664ae72e..e14c024fd0 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Mods
@@ -27,26 +28,39 @@ namespace osu.Game.Rulesets.Osu.Mods
         public void ApplyToDrawableHitObjects(IEnumerable<DrawableHitObject> drawables)
         {
             foreach (var drawable in drawables)
+                drawable.ApplyCustomUpdateState += applyTransform;
+        }
+
+        private void applyTransform(DrawableHitObject drawable, ArmedState state)
+        {
+            switch (drawable)
             {
-                var hitObject = (OsuHitObject)drawable.HitObject;
+                case DrawableSliderHead _:
+                case DrawableSliderTail _:
+                case DrawableSliderTick _:
+                    return;
 
-                float appearDistance = (float)(hitObject.TimePreempt - hitObject.TimeFadeIn) / 2;
+                default:
+                    var hitObject = (OsuHitObject)drawable.HitObject;
 
-                Vector2 originalPosition = drawable.Position;
-                Vector2 appearOffset = new Vector2(MathF.Cos(theta), MathF.Sin(theta)) * appearDistance;
+                    float appearDistance = (float)(hitObject.TimePreempt - hitObject.TimeFadeIn) / 2;
 
-                //the - 1 and + 1 prevents the hit objects to appear in the wrong position.
-                double appearTime = hitObject.StartTime - hitObject.TimePreempt - 1;
-                double moveDuration = hitObject.TimePreempt + 1;
+                    Vector2 originalPosition = drawable.Position;
+                    Vector2 appearOffset = new Vector2(MathF.Cos(theta), MathF.Sin(theta)) * appearDistance;
 
-                using (drawable.BeginAbsoluteSequence(appearTime, true))
-                {
-                    drawable
-                        .MoveToOffset(appearOffset)
-                        .MoveTo(originalPosition, moveDuration, Easing.InOutSine);
-                }
+                    //the - 1 and + 1 prevents the hit objects to appear in the wrong position.
+                    double appearTime = hitObject.StartTime - hitObject.TimePreempt - 1;
+                    double moveDuration = hitObject.TimePreempt + 1;
 
-                theta += (float)hitObject.TimeFadeIn / 1000;
+                    using (drawable.BeginAbsoluteSequence(appearTime, true))
+                    {
+                        drawable
+                            .MoveToOffset(appearOffset)
+                            .MoveTo(originalPosition, moveDuration, Easing.InOutSine);
+                    }
+
+                    theta += (float)hitObject.TimeFadeIn / 1000;
+                    break;
             }
         }
     }

From e5a66bdef37e89f10be8b558718b661e37d85171 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 16 Feb 2020 06:16:02 +0100
Subject: [PATCH 0527/1142] Refactor drawable profile score to match web

---
 .../Online/TestSceneUserProfileScores.cs      | 35 ++++++++--
 .../Sections/Ranks/DrawableProfileScore.cs    | 68 ++++++++++++-------
 .../Ranks/DrawableProfileWeightedScore.cs     | 22 +++---
 3 files changed, 86 insertions(+), 39 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs b/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
index a72ff2154d..f1e745bd14 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
@@ -28,7 +28,30 @@ namespace osu.Game.Tests.Visual.Online
 
         public TestSceneUserProfileScores()
         {
-            var score = new ScoreInfo
+            var firstScore = new ScoreInfo
+            {
+                PP = 1047.21,
+                Rank = ScoreRank.SH,
+                Beatmap = new BeatmapInfo
+                {
+                    Metadata = new BeatmapMetadata
+                    {
+                        Title = "JUSTadICE (TV Size)",
+                        Artist = "Oomori Seiko"
+                    },
+                    Version = "Extreme"
+                },
+                Date = DateTimeOffset.Now,
+                Mods = new Mod[]
+                {
+                    new OsuModHidden(),
+                    new OsuModHardRock(),
+                    new OsuModDoubleTime()
+                },
+                Accuracy = 0.9813
+            };
+
+            var secondScore = new ScoreInfo
             {
                 PP = 134.32,
                 Rank = ScoreRank.A,
@@ -50,7 +73,7 @@ namespace osu.Game.Tests.Visual.Online
                 Accuracy = 0.998546
             };
 
-            var secondScore = new ScoreInfo
+            var thirdScore = new ScoreInfo
             {
                 PP = 96.83,
                 Rank = ScoreRank.S,
@@ -93,10 +116,12 @@ namespace osu.Game.Tests.Visual.Online
                 Spacing = new Vector2(0, 10),
                 Children = new[]
                 {
-                    new ColourProvidedContainer(OverlayColourScheme.Green, new DrawableProfileScore(score)),
+                    new ColourProvidedContainer(OverlayColourScheme.Green, new DrawableProfileScore(firstScore)),
+                    new ColourProvidedContainer(OverlayColourScheme.Green, new DrawableProfileScore(secondScore)),
                     new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileScore(noPPScore)),
-                    new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileWeightedScore(score, 0.85)),
-                    new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileWeightedScore(secondScore, 0.66)),
+                    new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileWeightedScore(firstScore, 0.97)),
+                    new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileWeightedScore(secondScore, 0.85)),
+                    new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileWeightedScore(thirdScore, 0.66)),
                 }
             });
         }
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
index 2f983ba16b..2c20dcc0ef 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.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 System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
@@ -22,10 +21,9 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
     public class DrawableProfileScore : CompositeDrawable
     {
         private const int height = 40;
-        private const int performance_width = 80;
+        private const int performance_width = 100;
 
         private const float performance_background_shear = 0.45f;
-        private static readonly float performance_background_width = performance_width + (height / 4f * MathF.Tan(performance_background_shear));
 
         protected readonly ScoreInfo Score;
 
@@ -53,7 +51,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                     new Container
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Padding = new MarginPadding { Left = 10, Right = performance_width + 120 },
+                        Padding = new MarginPadding { Left = 20, Right = performance_width },
                         Children = new Drawable[]
                         {
                             new FillFlowContainer
@@ -62,7 +60,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                                 Origin = Anchor.CentreLeft,
                                 AutoSizeAxes = Axes.Both,
                                 Direction = FillDirection.Horizontal,
-                                Spacing = new Vector2(8, 0),
+                                Spacing = new Vector2(10, 0),
                                 Children = new Drawable[]
                                 {
                                     new UpdateableRank(Score.Rank)
@@ -85,7 +83,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                                             {
                                                 AutoSizeAxes = Axes.Both,
                                                 Direction = FillDirection.Horizontal,
-                                                Spacing = new Vector2(5, 0),
+                                                Spacing = new Vector2(15, 0),
                                                 Children = new Drawable[]
                                                 {
                                                     new OsuSpriteText
@@ -108,16 +106,21 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                             {
                                 Anchor = Anchor.CentreRight,
                                 Origin = Anchor.CentreRight,
-                                AutoSizeAxes = Axes.Both,
+                                AutoSizeAxes = Axes.X,
+                                RelativeSizeAxes = Axes.Y,
                                 Direction = FillDirection.Horizontal,
                                 Spacing = new Vector2(15),
-                                Children = new[]
+                                Children = new Drawable[]
                                 {
-                                    CreateRightContent().With(c =>
+                                    new Container
                                     {
-                                        c.Anchor = Anchor.CentreRight;
-                                        c.Origin = Anchor.CentreLeft;
-                                    }),
+                                        AutoSizeAxes = Axes.X,
+                                        RelativeSizeAxes = Axes.Y,
+                                        Padding = new MarginPadding { Horizontal = 10, Vertical = 5 },
+                                        Anchor = Anchor.CentreRight,
+                                        Origin = Anchor.CentreRight,
+                                        Child = CreateRightContent()
+                                    },
                                     new FillFlowContainer
                                     {
                                         AutoSizeAxes = Axes.Both,
@@ -140,14 +143,13 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                         Width = performance_width,
                         Anchor = Anchor.CentreRight,
                         Origin = Anchor.CentreRight,
-                        Children = new[]
+                        Children = new Drawable[]
                         {
                             new Box
                             {
                                 Anchor = Anchor.TopRight,
                                 Origin = Anchor.TopRight,
-                                RelativeSizeAxes = Axes.Y,
-                                Width = performance_background_width,
+                                RelativeSizeAxes = Axes.Both,
                                 Height = 0.5f,
                                 Colour = colourProvider.Background4,
                                 Shear = new Vector2(-performance_background_shear, 0),
@@ -157,20 +159,29 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
                             {
                                 Anchor = Anchor.TopRight,
                                 Origin = Anchor.TopRight,
-                                RelativeSizeAxes = Axes.Y,
+                                RelativeSizeAxes = Axes.Both,
                                 RelativePositionAxes = Axes.Y,
-                                Width = performance_background_width,
                                 Height = -0.5f,
                                 Position = new Vector2(0, 1),
                                 Colour = colourProvider.Background4,
                                 Shear = new Vector2(performance_background_shear, 0),
                                 EdgeSmoothness = new Vector2(2, 0),
                             },
-                            createDrawablePerformance().With(d =>
+                            new Container
                             {
-                                d.Anchor = Anchor.Centre;
-                                d.Origin = Anchor.Centre;
-                            })
+                                RelativeSizeAxes = Axes.Both,
+                                Padding = new MarginPadding
+                                {
+                                    Vertical = 5,
+                                    Left = 30,
+                                    Right = 20
+                                },
+                                Child = createDrawablePerformance().With(d =>
+                                {
+                                    d.Anchor = Anchor.Centre;
+                                    d.Origin = Anchor.Centre;
+                                })
+                            }
                         }
                     }
                 }
@@ -180,11 +191,18 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
         [NotNull]
         protected virtual Drawable CreateRightContent() => CreateDrawableAccuracy();
 
-        protected OsuSpriteText CreateDrawableAccuracy() => new OsuSpriteText
+        protected Drawable CreateDrawableAccuracy() => new Container
         {
-            Text = Score.DisplayAccuracy,
-            Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true),
-            Colour = colours.Yellow,
+            Width = 65,
+            RelativeSizeAxes = Axes.Y,
+            Child = new OsuSpriteText
+            {
+                Text = Score.DisplayAccuracy,
+                Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true),
+                Colour = colours.Yellow,
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft
+            }
         };
 
         private Drawable createDrawablePerformance()
diff --git a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileWeightedScore.cs b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileWeightedScore.cs
index e741c88aeb..3afa79e59e 100644
--- a/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileWeightedScore.cs
+++ b/osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileWeightedScore.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Scoring;
+using osuTK;
 
 namespace osu.Game.Overlays.Profile.Sections.Ranks
 {
@@ -23,25 +24,28 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
         {
             AutoSizeAxes = Axes.Both,
             Direction = FillDirection.Vertical,
+            Origin = Anchor.CentreLeft,
+            Anchor = Anchor.CentreLeft,
             Children = new Drawable[]
             {
                 new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
                     Direction = FillDirection.Horizontal,
-                    Children = new Drawable[]
+                    Spacing = new Vector2(10, 0),
+                    Children = new[]
                     {
+                        CreateDrawableAccuracy(),
                         new Container
                         {
                             AutoSizeAxes = Axes.Y,
-                            Width = 60,
-                            Child = CreateDrawableAccuracy()
-                        },
-                        new OsuSpriteText
-                        {
-                            Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true),
-                            Text = $"{Score.PP * weight:0}pp",
-                        },
+                            Width = 50,
+                            Child = new OsuSpriteText
+                            {
+                                Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true),
+                                Text = $"{Score.PP * weight:0}pp",
+                            },
+                        }
                     }
                 },
                 new OsuSpriteText

From 006c52bbe52db6f48b1cc69609e37733b174e419 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 16 Feb 2020 15:06:12 +0900
Subject: [PATCH 0528/1142] Fix visible error being thrown when playing a
 no-video beatmap

---
 osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
index 55c5175c5d..1991770518 100644
--- a/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs
@@ -74,7 +74,9 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    return new VideoSprite(textureStore.GetStream(getPathForFile(Metadata.VideoFile)));
+                    var stream = textureStore.GetStream(getPathForFile(Metadata.VideoFile));
+
+                    return stream == null ? null : new VideoSprite(stream);
                 }
                 catch (Exception e)
                 {

From 6cfa182fe4702f503bfd874a2df37a9359460595 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 16 Feb 2020 15:35:12 +0900
Subject: [PATCH 0529/1142] Don't transform repeat points

---
 osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs b/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
index e14c024fd0..41daef1f38 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModTransform.cs
@@ -38,6 +38,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                 case DrawableSliderHead _:
                 case DrawableSliderTail _:
                 case DrawableSliderTick _:
+                case DrawableRepeatPoint _:
                     return;
 
                 default:

From c8b81bcf3c9ebe6e08696910944e96d9c904fdeb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 16 Feb 2020 16:23:46 +0900
Subject: [PATCH 0530/1142] Use equality comparison rather than hash set

---
 osu.Game/Online/Multiplayer/Room.cs | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs
index b2226a6f22..2bfcc019fa 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Multiplayer/Room.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
 using osu.Framework.Allocation;
@@ -128,14 +127,17 @@ namespace osu.Game.Online.Multiplayer
                     item.Beatmap.Value.Metadata = localItem.Beatmap.Value.Metadata;
             }
 
-            foreach (var removeableItem in Playlist.Except(other.Playlist, new PlaylistEqualityComparer()).ToArray())
-                Playlist.Remove(removeableItem);
+            if (!Playlist.SequenceEqual(other.Playlist))
+            {
+                Playlist.Clear();
+                Playlist.AddRange(other.Playlist);
+            }
 
-            Playlist.AddRange(other.Playlist.Except(Playlist, new PlaylistEqualityComparer()).ToArray());
-
-            foreach (var removedItem in Participants.Except(other.Participants).ToArray())
-                Participants.Remove(removedItem);
-            Participants.AddRange(other.Participants.Except(Participants).ToArray());
+            if (!Participants.SequenceEqual(other.Participants))
+            {
+                Participants.Clear();
+                Participants.AddRange(other.Participants);
+            }
 
             Position = other.Position;
         }
@@ -143,12 +145,5 @@ namespace osu.Game.Online.Multiplayer
         public bool ShouldSerializeRoomID() => false;
         public bool ShouldSerializeHost() => false;
         public bool ShouldSerializeEndDate() => false;
-
-        private class PlaylistEqualityComparer : IEqualityComparer<PlaylistItem>
-        {
-            public bool Equals(PlaylistItem x, PlaylistItem y) => x?.Equals(y) ?? false;
-
-            public int GetHashCode(PlaylistItem obj) => HashCode.Combine(obj.ID, obj.BeatmapID, obj.RulesetID);
-        }
     }
 }

From 3888911eee7882f5131aa44b25bfcef29640a9d0 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 16 Feb 2020 14:19:49 +0300
Subject: [PATCH 0531/1142] Implement BeatmapSearchFilter component

---
 .../TestSceneBeatmapSearchFilter.cs           |  55 +++++++++
 .../BeatmapListing/BeatmapSearchFilter.cs     | 104 ++++++++++++++++++
 .../BeatmapSearchRulesetFilter.cs             |  36 ++++++
 3 files changed, 195 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs
 create mode 100644 osu.Game/Overlays/BeatmapListing/BeatmapSearchFilter.cs
 create mode 100644 osu.Game/Overlays/BeatmapListing/BeatmapSearchRulesetFilter.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs
new file mode 100644
index 0000000000..e25b047fd0
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs
@@ -0,0 +1,55 @@
+// 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 NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Online.API.Requests;
+using osu.Game.Overlays;
+using osu.Game.Overlays.BeatmapListing;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneBeatmapSearchFilter : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(BeatmapSearchFilter<>),
+            typeof(BeatmapSearchRulesetFilter)
+        };
+
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+
+        private readonly FillFlowContainer resizableContainer;
+
+        public TestSceneBeatmapSearchFilter()
+        {
+            Add(resizableContainer = new FillFlowContainer
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                AutoSizeAxes = Axes.Y,
+                Width = 600,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 10),
+                Children = new Drawable[]
+                {
+                    new BeatmapSearchRulesetFilter(),
+                    new BeatmapSearchFilter<BeatmapSearchCategory>(),
+                }
+            });
+        }
+
+        [Test]
+        public void TestResize()
+        {
+            AddStep("Resize to 100px", () => resizableContainer.ResizeWidthTo(100, 1000));
+            AddStep("Resize to 600px", () => resizableContainer.ResizeWidthTo(600, 1000));
+        }
+    }
+}
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilter.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilter.cs
new file mode 100644
index 0000000000..bf9d48fa3e
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilter.cs
@@ -0,0 +1,104 @@
+// 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;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osuTK;
+using osuTK.Graphics;
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+    public class BeatmapSearchFilter<T> : TabControl<T>
+    {
+        public BeatmapSearchFilter()
+        {
+            AutoSizeAxes = Axes.Y;
+            RelativeSizeAxes = Axes.X;
+
+            if (typeof(T).IsEnum)
+            {
+                foreach (var val in (T[])Enum.GetValues(typeof(T)))
+                    AddItem(val);
+            }
+        }
+
+        protected override Dropdown<T> CreateDropdown() => null;
+
+        protected override TabItem<T> CreateTabItem(T value) => new FilterTabItem(value);
+
+        protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
+        {
+            AutoSizeAxes = Axes.Y,
+            RelativeSizeAxes = Axes.X,
+            Direction = FillDirection.Full,
+            Spacing = new Vector2(10),
+            AllowMultiline = true,
+        };
+
+        protected class FilterTabItem : TabItem<T>
+        {
+            [Resolved]
+            private OverlayColourProvider colourProvider { get; set; }
+
+            private readonly OsuSpriteText text;
+
+            public FilterTabItem(T value)
+                : base(value)
+            {
+                AutoSizeAxes = Axes.Both;
+                AddRangeInternal(new Drawable[]
+                {
+                    text = new OsuSpriteText
+                    {
+                        Font = OsuFont.GetFont(size: 13, weight: FontWeight.Regular),
+                        Text = GetText(value)
+                    },
+                    new HoverClickSounds()
+                });
+
+                Enabled.Value = true;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                updateState();
+            }
+
+            protected virtual string GetText(T value) => (value as Enum)?.GetDescription() ?? value.ToString();
+
+            protected override bool OnHover(HoverEvent e)
+            {
+                base.OnHover(e);
+                updateState();
+                return true;
+            }
+
+            protected override void OnHoverLost(HoverLostEvent e)
+            {
+                base.OnHoverLost(e);
+                updateState();
+            }
+
+            protected override void OnActivated() => updateState();
+
+            protected override void OnDeactivated() => updateState();
+
+            private void updateState()
+            {
+                text.Font = text.Font.With(weight: Active.Value ? FontWeight.Medium : FontWeight.Regular);
+                text.FadeColour(Active.Value ? Color4.White : getStateColour(), 200, Easing.OutQuint);
+            }
+
+            private Color4 getStateColour() => IsHovered ? colourProvider.Light1 : colourProvider.Light3;
+        }
+    }
+}
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchRulesetFilter.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchRulesetFilter.cs
new file mode 100644
index 0000000000..ffe5693eeb
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchRulesetFilter.cs
@@ -0,0 +1,36 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Game.Rulesets;
+using osu.Framework.Graphics.UserInterface;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+    public class BeatmapSearchRulesetFilter : BeatmapSearchFilter<RulesetInfo>
+    {
+        [BackgroundDependencyLoader]
+        private void load(RulesetStore rulesets)
+        {
+            AddItem(new RulesetInfo
+            {
+                Name = @"Any"
+            });
+
+            foreach (var r in rulesets.AvailableRulesets)
+                AddItem(r);
+        }
+
+        protected override TabItem<RulesetInfo> CreateTabItem(RulesetInfo value) => new RulesetTabItem(value);
+
+        private class RulesetTabItem : FilterTabItem
+        {
+            public RulesetTabItem(RulesetInfo value)
+                : base(value)
+            {
+            }
+
+            protected override string GetText(RulesetInfo value) => value.Name;
+        }
+    }
+}

From a71e410e5d622bba24979f76e9eed58230601260 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 16 Feb 2020 15:04:21 +0300
Subject: [PATCH 0532/1142] Make the filter autosized

---
 .../UserInterface/TestSceneBeatmapSearchFilter.cs | 15 ++-------------
 .../BeatmapListing/BeatmapSearchFilter.cs         |  9 ++-------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs
index e25b047fd0..a237a8a5b5 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -25,16 +24,13 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
-        private readonly FillFlowContainer resizableContainer;
-
         public TestSceneBeatmapSearchFilter()
         {
-            Add(resizableContainer = new FillFlowContainer
+            Add(new FillFlowContainer
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                AutoSizeAxes = Axes.Y,
-                Width = 600,
+                AutoSizeAxes = Axes.Both,
                 Direction = FillDirection.Vertical,
                 Spacing = new Vector2(0, 10),
                 Children = new Drawable[]
@@ -44,12 +40,5 @@ namespace osu.Game.Tests.Visual.UserInterface
                 }
             });
         }
-
-        [Test]
-        public void TestResize()
-        {
-            AddStep("Resize to 100px", () => resizableContainer.ResizeWidthTo(100, 1000));
-            AddStep("Resize to 600px", () => resizableContainer.ResizeWidthTo(600, 1000));
-        }
     }
 }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilter.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilter.cs
index bf9d48fa3e..6cd941495f 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilter.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilter.cs
@@ -12,7 +12,6 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osuTK;
 using osuTK.Graphics;
-using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Overlays.BeatmapListing
 {
@@ -20,8 +19,7 @@ namespace osu.Game.Overlays.BeatmapListing
     {
         public BeatmapSearchFilter()
         {
-            AutoSizeAxes = Axes.Y;
-            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Both;
 
             if (typeof(T).IsEnum)
             {
@@ -36,11 +34,8 @@ namespace osu.Game.Overlays.BeatmapListing
 
         protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
         {
-            AutoSizeAxes = Axes.Y,
-            RelativeSizeAxes = Axes.X,
-            Direction = FillDirection.Full,
+            AutoSizeAxes = Axes.Both,
             Spacing = new Vector2(10),
-            AllowMultiline = true,
         };
 
         protected class FilterTabItem : TabItem<T>

From 330367836225995363369d9a2478f7f26d54d379 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 16 Feb 2020 22:03:43 +0900
Subject: [PATCH 0533/1142] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 494842f38f..cb044afcc6 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -54,6 +54,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.213.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.216.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 50d8c25b11..6dcb529dc4 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.213.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.216.0" />
     <PackageReference Include="Sentry" Version="2.0.2" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index e56fc41b07..946d039195 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -74,7 +74,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.213.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.216.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
@@ -82,7 +82,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.213.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.216.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 54a3705bdbaa2c1aac1af0a20303a10f8ffe806f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 16 Feb 2020 16:26:18 +0300
Subject: [PATCH 0534/1142] Remove font weight changes on selection

---
 osu.Game/Overlays/BeatmapListing/BeatmapSearchFilter.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilter.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilter.cs
index 6cd941495f..acae5ce117 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilter.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilter.cs
@@ -87,11 +87,7 @@ namespace osu.Game.Overlays.BeatmapListing
 
             protected override void OnDeactivated() => updateState();
 
-            private void updateState()
-            {
-                text.Font = text.Font.With(weight: Active.Value ? FontWeight.Medium : FontWeight.Regular);
-                text.FadeColour(Active.Value ? Color4.White : getStateColour(), 200, Easing.OutQuint);
-            }
+            private void updateState() => text.FadeColour(Active.Value ? Color4.White : getStateColour(), 200, Easing.OutQuint);
 
             private Color4 getStateColour() => IsHovered ? colourProvider.Light1 : colourProvider.Light3;
         }

From e62fec58c1846fdfb6df580f3be6d792a2e9dc40 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 16 Feb 2020 16:38:05 +0300
Subject: [PATCH 0535/1142] Add ability to override text size

---
 .../TestSceneBeatmapSearchFilter.cs           |  1 +
 .../BeatmapListing/BeatmapSearchFilter.cs     |  4 +++-
 .../SmallBeatmapSearchFilter.cs               | 22 +++++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Overlays/BeatmapListing/SmallBeatmapSearchFilter.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs
index a237a8a5b5..b82ad86fb8 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs
@@ -37,6 +37,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 {
                     new BeatmapSearchRulesetFilter(),
                     new BeatmapSearchFilter<BeatmapSearchCategory>(),
+                    new SmallBeatmapSearchFilter<BeatmapSearchCategory>()
                 }
             });
         }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilter.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilter.cs
index acae5ce117..57e8282798 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilter.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilter.cs
@@ -40,6 +40,8 @@ namespace osu.Game.Overlays.BeatmapListing
 
         protected class FilterTabItem : TabItem<T>
         {
+            protected virtual float TextSize() => 13;
+
             [Resolved]
             private OverlayColourProvider colourProvider { get; set; }
 
@@ -53,7 +55,7 @@ namespace osu.Game.Overlays.BeatmapListing
                 {
                     text = new OsuSpriteText
                     {
-                        Font = OsuFont.GetFont(size: 13, weight: FontWeight.Regular),
+                        Font = OsuFont.GetFont(size: TextSize(), weight: FontWeight.Regular),
                         Text = GetText(value)
                     },
                     new HoverClickSounds()
diff --git a/osu.Game/Overlays/BeatmapListing/SmallBeatmapSearchFilter.cs b/osu.Game/Overlays/BeatmapListing/SmallBeatmapSearchFilter.cs
new file mode 100644
index 0000000000..ca387f08cf
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/SmallBeatmapSearchFilter.cs
@@ -0,0 +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 osu.Framework.Graphics.UserInterface;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+    public class SmallBeatmapSearchFilter<T> : BeatmapSearchFilter<T>
+    {
+        protected override TabItem<T> CreateTabItem(T value) => new SmallTabItem(value);
+
+        protected class SmallTabItem : FilterTabItem
+        {
+            public SmallTabItem(T value)
+                : base(value)
+            {
+            }
+
+            protected override float TextSize() => 10;
+        }
+    }
+}

From dd5e713c0c109a387307925aba91764c8f389282 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Sun, 16 Feb 2020 21:42:05 +0100
Subject: [PATCH 0536/1142] Adjust colours

---
 osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
index 16eecb7198..182ab055b3 100644
--- a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
+++ b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Beatmaps.Drawables
             Child = new Box
             {
                 RelativeSizeAxes = Axes.Both,
-                Colour = ColourInfo.GradientVertical(OsuColour.Gray(0.2f), OsuColour.Gray(0.1f)),
+                Colour = OsuColour.Gray(0.2f),
             };
         }
 

From 8fcd5e93dd56db9116fd90cac4e8b2aa662e3375 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Sun, 16 Feb 2020 21:43:11 +0100
Subject: [PATCH 0537/1142] Adjust table layout to match osu-web

---
 .../Overlays/BeatmapSet/Scores/ScoreTable.cs    | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 43a45bd2fc..99b3870bc1 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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;
@@ -77,17 +77,20 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 new TableColumn("rank", Anchor.CentreRight, new Dimension(GridSizeMode.AutoSize)),
                 new TableColumn("", Anchor.Centre, new Dimension(GridSizeMode.Absolute, 70)), // grade
                 new TableColumn("score", Anchor.CentreLeft, new Dimension(GridSizeMode.AutoSize)),
-                new TableColumn("accuracy", Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed, minSize: 60, maxSize: 70)),
-                new TableColumn("player", Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed, minSize: 150)),
-                new TableColumn("max combo", Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed, minSize: 70, maxSize: 110))
+                new TableColumn("accuracy", Anchor.CentreLeft, new Dimension(GridSizeMode.Absolute, minSize: 60, maxSize: 70)),
+                new TableColumn("", Anchor.CentreLeft, new Dimension(GridSizeMode.Absolute, 25)), // flag
+                new TableColumn("player", Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed, minSize: 125)),
+                new TableColumn("max combo", Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed, minSize: 70, maxSize: 120))
             };
 
-            foreach (var statistic in score.SortedStatistics)
-                columns.Add(new TableColumn(statistic.Key.GetDescription(), Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed, minSize: 50, maxSize: 70)));
+            foreach (var statistic in score.SortedStatistics.Take(score.SortedStatistics.Count() - 1))
+                columns.Add(new TableColumn(statistic.Key.GetDescription(), Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed, minSize: 35, maxSize: 60)));
+
+            columns.Add(new TableColumn(score.SortedStatistics.LastOrDefault().Key.GetDescription(), Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed, minSize: 45, maxSize: 95)));
 
             columns.AddRange(new[]
             {
-                new TableColumn("pp", Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed, minSize: 40, maxSize: 70)),
+                new TableColumn("pp", Anchor.CentreLeft, new Dimension(GridSizeMode.Absolute, 30)),
                 new TableColumn("mods", Anchor.CentreLeft, new Dimension(GridSizeMode.AutoSize)),
             });
 

From 4d180a685a1070e3dc4ada778a3bf675208030e6 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Sun, 16 Feb 2020 21:43:33 +0100
Subject: [PATCH 0538/1142] Adjust font sizes and spacing in BeatmapSetOverlay

---
 osu.Game/Overlays/BeatmapSet/AuthorInfo.cs    |  8 ++--
 osu.Game/Overlays/BeatmapSet/BasicStats.cs    | 11 +++---
 osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs | 38 +++++++++++--------
 .../Buttons/HeaderDownloadButton.cs           | 13 ++++---
 osu.Game/Overlays/BeatmapSet/Details.cs       |  2 +-
 osu.Game/Overlays/BeatmapSet/Header.cs        |  7 +++-
 osu.Game/Overlays/BeatmapSet/Info.cs          | 10 +++--
 .../BeatmapSet/LeaderboardScopeSelector.cs    |  1 -
 .../BeatmapSet/Scores/DrawableTopScore.cs     |  4 +-
 .../Scores/NotSupporterPlaceholder.cs         |  6 +--
 .../Overlays/BeatmapSet/Scores/ScoreTable.cs  | 38 ++++++-------------
 .../Scores/ScoreTableRowBackground.cs         |  4 +-
 .../BeatmapSet/Scores/ScoresContainer.cs      |  6 +--
 .../Scores/TopScoreStatisticsSection.cs       | 22 ++++++-----
 .../BeatmapSet/Scores/TopScoreUserSection.cs  |  2 +-
 osu.Game/Overlays/BeatmapSet/SuccessRate.cs   |  6 +--
 .../Screens/Select/Details/AdvancedStats.cs   |  8 ++--
 .../Screens/Select/Details/UserRatings.cs     | 13 ++++---
 18 files changed, 102 insertions(+), 97 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs b/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
index 096e91b65b..a6ff0ebeb8 100644
--- a/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
+++ b/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Overlays.BeatmapSet
                 new Container
                 {
                     AutoSizeAxes = Axes.Both,
-                    CornerRadius = 3,
+                    CornerRadius = 4,
                     Masking = true,
                     Child = avatar = new UpdateableAvatar
                     {
@@ -87,7 +87,7 @@ namespace osu.Game.Overlays.BeatmapSet
                     {
                         Colour = Color4.Black.Opacity(0.25f),
                         Type = EdgeEffectType.Shadow,
-                        Radius = 3,
+                        Radius = 4,
                         Offset = new Vector2(0f, 1f),
                     },
                 },
@@ -117,12 +117,12 @@ namespace osu.Game.Overlays.BeatmapSet
                     new OsuSpriteText
                     {
                         Text = $"{first} ",
-                        Font = OsuFont.GetFont(size: 13)
+                        Font = OsuFont.GetFont(size: 11)
                     },
                     new OsuSpriteText
                     {
                         Text = second,
-                        Font = secondFont.With(size: 13)
+                        Font = secondFont.With(size: 11)
                     },
                 };
             }
diff --git a/osu.Game/Overlays/BeatmapSet/BasicStats.cs b/osu.Game/Overlays/BeatmapSet/BasicStats.cs
index 7092b860a0..ba0a62ec2f 100644
--- a/osu.Game/Overlays/BeatmapSet/BasicStats.cs
+++ b/osu.Game/Overlays/BeatmapSet/BasicStats.cs
@@ -105,7 +105,7 @@ namespace osu.Game.Overlays.BeatmapSet
             {
                 TooltipText = name;
                 RelativeSizeAxes = Axes.X;
-                AutoSizeAxes = Axes.Y;
+                Height = 24f;
 
                 Children = new Drawable[]
                 {
@@ -113,7 +113,8 @@ namespace osu.Game.Overlays.BeatmapSet
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
-                        AutoSizeAxes = Axes.Both,
+                        AutoSizeAxes = Axes.X,
+                        RelativeSizeAxes = Axes.Y,
                         Children = new Drawable[]
                         {
                             new SpriteIcon
@@ -121,7 +122,7 @@ namespace osu.Game.Overlays.BeatmapSet
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.Centre,
                                 Icon = FontAwesome.Solid.Square,
-                                Size = new Vector2(13),
+                                Size = new Vector2(12),
                                 Rotation = 45,
                                 Colour = OsuColour.FromHex(@"441288"),
                             },
@@ -130,7 +131,7 @@ namespace osu.Game.Overlays.BeatmapSet
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.Centre,
                                 Icon = icon,
-                                Size = new Vector2(13),
+                                Size = new Vector2(12),
                                 Colour = OsuColour.FromHex(@"f7dd55"),
                                 Scale = new Vector2(0.8f),
                             },
@@ -139,7 +140,7 @@ namespace osu.Game.Overlays.BeatmapSet
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.CentreLeft,
                                 Margin = new MarginPadding { Left = 10 },
-                                Font = OsuFont.GetFont(size: 13, weight: FontWeight.Bold),
+                                Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
                             },
                         },
                     },
diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs b/osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs
index bf2a92cd4f..265e2d32f9 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs
@@ -34,7 +34,6 @@ namespace osu.Game.Overlays.BeatmapSet
         public readonly DifficultiesContainer Difficulties;
 
         public readonly Bindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
-
         private BeatmapSetInfo beatmapSet;
 
         public BeatmapSetInfo BeatmapSet
@@ -67,7 +66,7 @@ namespace osu.Game.Overlays.BeatmapSet
                         {
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
-                            Margin = new MarginPadding { Left = -(tile_icon_padding + tile_spacing / 2) },
+                            Margin = new MarginPadding { Left = -(tile_icon_padding + tile_spacing / 2), Bottom = 10 },
                             OnLostHover = () =>
                             {
                                 showBeatmap(Beatmap.Value);
@@ -77,7 +76,6 @@ namespace osu.Game.Overlays.BeatmapSet
                         new FillFlowContainer
                         {
                             AutoSizeAxes = Axes.Both,
-                            Margin = new MarginPadding { Top = 10 },
                             Spacing = new Vector2(5f),
                             Children = new[]
                             {
@@ -85,13 +83,13 @@ namespace osu.Game.Overlays.BeatmapSet
                                 {
                                     Anchor = Anchor.BottomLeft,
                                     Origin = Anchor.BottomLeft,
-                                    Font = OsuFont.GetFont(size: 20, weight: FontWeight.Bold)
+                                    Font = OsuFont.GetFont(size: 17, weight: FontWeight.Bold)
                                 },
                                 starRating = new OsuSpriteText
                                 {
                                     Anchor = Anchor.BottomLeft,
                                     Origin = Anchor.BottomLeft,
-                                    Font = OsuFont.GetFont(size: 13, weight: FontWeight.Bold),
+                                    Font = OsuFont.GetFont(size: 11, weight: FontWeight.Bold),
                                     Text = "Star Difficulty",
                                     Alpha = 0,
                                     Margin = new MarginPadding { Bottom = 1 },
@@ -192,9 +190,11 @@ namespace osu.Game.Overlays.BeatmapSet
         public class DifficultySelectorButton : OsuClickableContainer, IStateful<DifficultySelectorState>
         {
             private const float transition_duration = 100;
-            private const float size = 52;
+            private const float size = 54;
+            private const float background_size = size - 2;
 
-            private readonly Container bg;
+            private readonly Container background;
+            private readonly Box backgroundBox;
             private readonly DifficultyIcon icon;
 
             public readonly BeatmapInfo Beatmap;
@@ -230,16 +230,16 @@ namespace osu.Game.Overlays.BeatmapSet
 
                 Children = new Drawable[]
                 {
-                    bg = new Container
+                    background = new Container
                     {
-                        RelativeSizeAxes = Axes.Both,
+                        Size = new Vector2(background_size),
                         Masking = true,
                         CornerRadius = 4,
-                        Child = new Box
+                        Child = backgroundBox = new Box
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Colour = Color4.Black.Opacity(0.5f),
-                        },
+                            Alpha = 0.5f
+                        }
                     },
                     icon = new DifficultyIcon(beatmap, shouldShowTooltip: false)
                     {
@@ -273,15 +273,21 @@ namespace osu.Game.Overlays.BeatmapSet
 
             private void fadeIn()
             {
-                bg.FadeIn(transition_duration);
+                background.FadeIn(transition_duration);
                 icon.FadeIn(transition_duration);
             }
 
             private void fadeOut()
             {
-                bg.FadeOut();
+                background.FadeOut();
                 icon.FadeTo(0.7f, transition_duration);
             }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                backgroundBox.Colour = colourProvider.Background6;
+            }
         }
 
         private class Statistic : FillFlowContainer
@@ -314,13 +320,13 @@ namespace osu.Game.Overlays.BeatmapSet
                         Origin = Anchor.CentreLeft,
                         Icon = icon,
                         Shadow = true,
-                        Size = new Vector2(13),
+                        Size = new Vector2(12),
                     },
                     text = new OsuSpriteText
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
-                        Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold, italics: true)
+                        Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold, italics: true),
                     },
                 };
             }
diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs
index 53003b0488..e64256b850 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/HeaderDownloadButton.cs
@@ -22,6 +22,8 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
 {
     public class HeaderDownloadButton : BeatmapDownloadTrackingComposite, IHasTooltip
     {
+        private const int text_size = 12;
+
         private readonly bool noVideo;
 
         public string TooltipText => button.Enabled.Value ? "download this beatmap" : "login to download";
@@ -80,8 +82,7 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
                                     Anchor = Anchor.CentreRight,
                                     Origin = Anchor.CentreRight,
                                     Icon = FontAwesome.Solid.Download,
-                                    Size = new Vector2(16),
-                                    Margin = new MarginPadding { Right = 5 },
+                                    Size = new Vector2(18),
                                 },
                             }
                         },
@@ -120,7 +121,7 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
                             new OsuSpriteText
                             {
                                 Text = "Downloading...",
-                                Font = OsuFont.GetFont(size: 13, weight: FontWeight.Bold)
+                                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold)
                             },
                         };
                         break;
@@ -131,7 +132,7 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
                             new OsuSpriteText
                             {
                                 Text = "Importing...",
-                                Font = OsuFont.GetFont(size: 13, weight: FontWeight.Bold)
+                                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold)
                             },
                         };
                         break;
@@ -146,12 +147,12 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
                             new OsuSpriteText
                             {
                                 Text = "Download",
-                                Font = OsuFont.GetFont(size: 13, weight: FontWeight.Bold)
+                                Font = OsuFont.GetFont(size: text_size, weight: FontWeight.Bold)
                             },
                             new OsuSpriteText
                             {
                                 Text = getVideoSuffixText(),
-                                Font = OsuFont.GetFont(size: 11, weight: FontWeight.Bold)
+                                Font = OsuFont.GetFont(size: text_size - 2, weight: FontWeight.Bold)
                             },
                         };
                         this.FadeIn(200);
diff --git a/osu.Game/Overlays/BeatmapSet/Details.cs b/osu.Game/Overlays/BeatmapSet/Details.cs
index 488e181fa2..680487ffbb 100644
--- a/osu.Game/Overlays/BeatmapSet/Details.cs
+++ b/osu.Game/Overlays/BeatmapSet/Details.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Overlays.BeatmapSet
                     {
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
-                        Margin = new MarginPadding { Vertical = 10 },
+                        Padding = new MarginPadding { Vertical = 10 }
                     },
                 },
                 new DetailBox
diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index 29f09a1ad8..c1e9ce2008 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -144,12 +144,15 @@ namespace osu.Game.Overlays.BeatmapSet
                                                     },
                                                 }
                                             },
-                                            artist = new OsuSpriteText { Font = OsuFont.GetFont(size: 20, weight: FontWeight.Medium, italics: true) },
+                                            artist = new OsuSpriteText
+                                            {
+                                                Font = OsuFont.GetFont(size: 20, weight: FontWeight.Medium, italics: true),
+                                                Margin = new MarginPadding { Bottom = 20 }
+                                            },
                                             new Container
                                             {
                                                 RelativeSizeAxes = Axes.X,
                                                 AutoSizeAxes = Axes.Y,
-                                                Margin = new MarginPadding { Top = 20 },
                                                 Child = author = new AuthorInfo(),
                                             },
                                             beatmapAvailability = new BeatmapAvailability(),
diff --git a/osu.Game/Overlays/BeatmapSet/Info.cs b/osu.Game/Overlays/BeatmapSet/Info.cs
index 85e871baca..0f2d6a9e35 100644
--- a/osu.Game/Overlays/BeatmapSet/Info.cs
+++ b/osu.Game/Overlays/BeatmapSet/Info.cs
@@ -20,8 +20,9 @@ namespace osu.Game.Overlays.BeatmapSet
     public class Info : Container
     {
         private const float transition_duration = 250;
-        private const float metadata_width = 225;
+        private const float metadata_width = 175;
         private const float spacing = 20;
+        private const float base_height = 220;
 
         private readonly Box successRateBackground;
         private readonly Box background;
@@ -41,7 +42,7 @@ namespace osu.Game.Overlays.BeatmapSet
             OsuSpriteText unrankedPlaceholder;
 
             RelativeSizeAxes = Axes.X;
-            Height = 220;
+            Height = base_height;
             Masking = true;
             EdgeEffect = new EdgeEffectParameters
             {
@@ -135,6 +136,7 @@ namespace osu.Game.Overlays.BeatmapSet
                 var setHasLeaderboard = b.NewValue?.OnlineInfo?.Status > 0;
                 successRate.Alpha = setHasLeaderboard ? 1 : 0;
                 unrankedPlaceholder.Alpha = setHasLeaderboard ? 0 : 1;
+                Height = setHasLeaderboard ? 270 : base_height;
             };
         }
 
@@ -176,8 +178,8 @@ namespace osu.Game.Overlays.BeatmapSet
                     new OsuSpriteText
                     {
                         Text = title,
-                        Font = OsuFont.GetFont(size: 14, weight: FontWeight.Black),
-                        Margin = new MarginPadding { Top = 20 },
+                        Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold),
+                        Margin = new MarginPadding { Top = 15 },
                     },
                     textFlow = new OsuTextFlowContainer
                     {
diff --git a/osu.Game/Overlays/BeatmapSet/LeaderboardScopeSelector.cs b/osu.Game/Overlays/BeatmapSet/LeaderboardScopeSelector.cs
index 20a3b09db4..48062ef3f0 100644
--- a/osu.Game/Overlays/BeatmapSet/LeaderboardScopeSelector.cs
+++ b/osu.Game/Overlays/BeatmapSet/LeaderboardScopeSelector.cs
@@ -37,7 +37,6 @@ namespace osu.Game.Overlays.BeatmapSet
             public ScopeSelectorTabItem(BeatmapLeaderboardScope value)
                 : base(value)
             {
-                Text.Font = OsuFont.GetFont(size: 16);
             }
 
             protected override bool OnHover(HoverEvent e)
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs b/osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
index bb85b4a37b..382155117e 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             AutoSizeAxes = Axes.Y;
 
             Masking = true;
-            CornerRadius = 5;
+            CornerRadius = 4;
             EdgeEffect = new EdgeEffectParameters
             {
                 Type = EdgeEffectType.Shadow,
@@ -46,7 +46,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                     {
                         Vertical = 10,
                         Left = 10,
-                        Right = 25,
+                        Right = 30,
                     },
                     Children = new Drawable[]
                     {
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/NotSupporterPlaceholder.cs b/osu.Game/Overlays/BeatmapSet/Scores/NotSupporterPlaceholder.cs
index ba08a78a61..b2c87a1477 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/NotSupporterPlaceholder.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/NotSupporterPlaceholder.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             {
                 AutoSizeAxes = Axes.Both,
                 Direction = FillDirection.Vertical,
-                Spacing = new Vector2(0, 10),
+                Spacing = new Vector2(0, 20),
                 Children = new Drawable[]
                 {
                     new OsuSpriteText
@@ -29,9 +29,9 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
                         Text = @"You need to be an osu!supporter to access the friend and country rankings!",
-                        Font = OsuFont.GetFont(weight: FontWeight.Bold),
+                        Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold),
                     },
-                    text = new LinkFlowContainer(t => t.Font = t.Font.With(size: 12))
+                    text = new LinkFlowContainer(t => t.Font = t.Font.With(size: 11))
                     {
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 99b3870bc1..9c886dfa75 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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;
@@ -22,7 +22,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
     public class ScoreTable : TableContainer
     {
         private const float horizontal_inset = 20;
-        private const float row_height = 25;
+        private const float row_height = 22;
         private const int text_size = 12;
 
         private readonly FillFlowContainer backgroundFlow;
@@ -63,7 +63,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                     return;
 
                 for (int i = 0; i < value.Count; i++)
-                    backgroundFlow.Add(new ScoreTableRowBackground(i, value[i]));
+                    backgroundFlow.Add(new ScoreTableRowBackground(i, value[i], row_height));
 
                 Columns = createHeaders(value[0]);
                 Content = value.Select((s, i) => createContent(i, s)).ToArray().ToRectangular();
@@ -99,6 +99,9 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
 
         private Drawable[] createContent(int index, ScoreInfo score)
         {
+            var username = new LinkFlowContainer(t => t.Font = OsuFont.GetFont(size: text_size)) { AutoSizeAxes = Axes.Both };
+            username.AddUserLink(score.User);
+
             var content = new List<Drawable>
             {
                 new OsuSpriteText
@@ -108,7 +111,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 },
                 new UpdateableRank(score.Rank)
                 {
-                    Size = new Vector2(30, 20)
+                    Size = new Vector2(28, 14)
                 },
                 new OsuSpriteText
                 {
@@ -123,35 +126,18 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                     Font = OsuFont.GetFont(size: text_size),
                     Colour = score.Accuracy == 1 ? highAccuracyColour : Color4.White
                 },
-            };
-
-            var username = new LinkFlowContainer(t => t.Font = OsuFont.GetFont(size: text_size)) { AutoSizeAxes = Axes.Both };
-            username.AddUserLink(score.User);
-
-            content.AddRange(new Drawable[]
-            {
-                new FillFlowContainer
+                new UpdateableFlag(score.User.Country)
                 {
-                    AutoSizeAxes = Axes.Both,
-                    Direction = FillDirection.Horizontal,
-                    Margin = new MarginPadding { Right = horizontal_inset },
-                    Spacing = new Vector2(5, 0),
-                    Children = new Drawable[]
-                    {
-                        new UpdateableFlag(score.User.Country)
-                        {
-                            Size = new Vector2(20, 13),
-                            ShowPlaceholderOnNull = false,
-                        },
-                        username
-                    }
+                    Size = new Vector2(19, 13),
+                    ShowPlaceholderOnNull = false,
                 },
+                username,
                 new OsuSpriteText
                 {
                     Text = $@"{score.MaxCombo:N0}x",
                     Font = OsuFont.GetFont(size: text_size)
                 }
-            });
+            };
 
             foreach (var kvp in score.SortedStatistics)
             {
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTableRowBackground.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTableRowBackground.cs
index 83271efe09..d84e1eff8c 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTableRowBackground.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTableRowBackground.cs
@@ -22,13 +22,13 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
         private readonly int index;
         private readonly ScoreInfo score;
 
-        public ScoreTableRowBackground(int index, ScoreInfo score)
+        public ScoreTableRowBackground(int index, ScoreInfo score, float height)
         {
             this.index = index;
             this.score = score;
 
             RelativeSizeAxes = Axes.X;
-            Height = 25;
+            Height = height;
 
             CornerRadius = 5;
             Masking = true;
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index 8560232209..3cb77c6450 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -90,9 +90,9 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                     Origin = Anchor.TopCentre,
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
-                    Width = 0.95f,
                     Direction = FillDirection.Vertical,
-                    Margin = new MarginPadding { Vertical = spacing },
+                    Padding = new MarginPadding { Horizontal = 50 },
+                    Margin = new MarginPadding { Vertical = 20 },
                     Children = new Drawable[]
                     {
                         new FillFlowContainer
@@ -121,7 +121,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                         {
                             AutoSizeAxes = Axes.Y,
                             RelativeSizeAxes = Axes.X,
-                            Margin = new MarginPadding { Vertical = spacing },
+                            Margin = new MarginPadding { Top = spacing },
                             Children = new Drawable[]
                             {
                                 noScoresPlaceholder = new NoScoresPlaceholder
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index a7066c4827..a15dc57d23 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
         private const float bottom_columns_min_width = 45;
 
         private readonly FontUsage smallFont = OsuFont.GetFont(size: 16);
-        private readonly FontUsage largeFont = OsuFont.GetFont(size: 22);
+        private readonly FontUsage largeFont = OsuFont.GetFont(size: 22, weight: FontWeight.Light);
 
         private readonly TextColumn totalScoreColumn;
         private readonly TextColumn accuracyColumn;
@@ -47,7 +47,6 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
                 Direction = FillDirection.Vertical,
-                Spacing = new Vector2(10, 8),
                 Children = new Drawable[]
                 {
                     new FillFlowContainer
@@ -117,6 +116,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             public InfoColumn(string title, Drawable content, float? minWidth = null)
             {
                 AutoSizeAxes = Axes.Both;
+                Margin = new MarginPadding { Vertical = 5 };
 
                 InternalChild = new GridContainer
                 {
@@ -128,7 +128,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                     RowDimensions = new[]
                     {
                         new Dimension(GridSizeMode.AutoSize),
-                        new Dimension(GridSizeMode.Absolute, 4),
+                        new Dimension(GridSizeMode.Absolute, 2),
                         new Dimension(GridSizeMode.AutoSize)
                     },
                     Content = new[]
@@ -138,21 +138,24 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                             text = new OsuSpriteText
                             {
                                 Font = OsuFont.GetFont(size: 10, weight: FontWeight.Bold),
-                                Text = title.ToUpper()
+                                Text = title.ToUpper(),
+                                // 2px padding bottom + 1px vertical to compensate for the additional spacing because of 1.25 line-height in osu-web
+                                Padding = new MarginPadding { Top = 1, Bottom = 3 }
                             }
                         },
                         new Drawable[]
                         {
                             separator = new Box
                             {
-                                Anchor = Anchor.CentreLeft,
+                                Anchor = Anchor.TopLeft,
                                 RelativeSizeAxes = Axes.X,
-                                Height = 2
-                            }
+                                Height = 2,
+                            },
                         },
                         new[]
                         {
-                            content
+                            // osu-web has 4px margin here but also uses 0.9 line-height, reducing margin to 2px seems like a good alternative to that
+                            content.With(c => c.Margin = new MarginPadding { Top = 2 })
                         }
                     }
                 };
@@ -194,9 +197,10 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             public ModsInfoColumn()
                 : this(new FillFlowContainer
                 {
-                    AutoSizeAxes = Axes.Both,
+                    AutoSizeAxes = Axes.X,
                     Direction = FillDirection.Horizontal,
                     Spacing = new Vector2(1),
+                    Height = 18f
                 })
             {
             }
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
index 8a368aa535..4e253018c3 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                         Origin = Anchor.Centre,
                         Size = new Vector2(70),
                         Masking = true,
-                        CornerRadius = 5,
+                        CornerRadius = 4,
                         EdgeEffect = new EdgeEffectParameters
                         {
                             Type = EdgeEffectType.Shadow,
diff --git a/osu.Game/Overlays/BeatmapSet/SuccessRate.cs b/osu.Game/Overlays/BeatmapSet/SuccessRate.cs
index 15216b6e69..3bb36545cd 100644
--- a/osu.Game/Overlays/BeatmapSet/SuccessRate.cs
+++ b/osu.Game/Overlays/BeatmapSet/SuccessRate.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Overlays.BeatmapSet
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.TopCentre,
                             Text = "Success Rate",
-                            Font = OsuFont.GetFont(size: 13)
+                            Font = OsuFont.GetFont(size: 12)
                         },
                         successRate = new Bar
                         {
@@ -82,7 +82,7 @@ namespace osu.Game.Overlays.BeatmapSet
                             {
                                 Anchor = Anchor.TopRight,
                                 Origin = Anchor.TopCentre,
-                                Font = OsuFont.GetFont(size: 13),
+                                Font = OsuFont.GetFont(size: 12),
                             },
                         },
                         new OsuSpriteText
@@ -90,7 +90,7 @@ namespace osu.Game.Overlays.BeatmapSet
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.TopCentre,
                             Text = "Points of Failure",
-                            Font = OsuFont.GetFont(size: 13),
+                            Font = OsuFont.GetFont(size: 12),
                             Margin = new MarginPadding { Vertical = 20 },
                         },
                     },
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 7ab91677a9..44fac32360 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -51,7 +51,6 @@ namespace osu.Game.Screens.Select.Details
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
-                Spacing = new Vector2(4f),
                 Children = new[]
                 {
                     FirstValue = new StatisticRow(), //circle size/key amount
@@ -199,6 +198,7 @@ namespace osu.Game.Screens.Select.Details
                 this.forceDecimalPlaces = forceDecimalPlaces;
                 RelativeSizeAxes = Axes.X;
                 AutoSizeAxes = Axes.Y;
+                Padding = new MarginPadding { Vertical = 2.5f };
 
                 Children = new Drawable[]
                 {
@@ -206,9 +206,11 @@ namespace osu.Game.Screens.Select.Details
                     {
                         Width = name_width,
                         AutoSizeAxes = Axes.Y,
+                        // osu-web uses 1.25 line-height, which at 12px font size makes the element 14px tall - this compentates that difference
+                        Padding = new MarginPadding { Vertical = 1 },
                         Child = name = new OsuSpriteText
                         {
-                            Font = OsuFont.GetFont(size: 13)
+                            Font = OsuFont.GetFont(size: 12)
                         },
                     },
                     bar = new Bar
@@ -239,7 +241,7 @@ namespace osu.Game.Screens.Select.Details
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
-                            Font = OsuFont.GetFont(size: 13)
+                            Font = OsuFont.GetFont(size: 12)
                         },
                     },
                 };
diff --git a/osu.Game/Screens/Select/Details/UserRatings.cs b/osu.Game/Screens/Select/Details/UserRatings.cs
index c1e01e3572..cf5e3ba1b3 100644
--- a/osu.Game/Screens/Select/Details/UserRatings.cs
+++ b/osu.Game/Screens/Select/Details/UserRatings.cs
@@ -71,31 +71,32 @@ namespace osu.Game.Screens.Select.Details
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.TopCentre,
                             Text = "User Rating",
-                            Font = OsuFont.GetFont(size: 13)
+                            Font = OsuFont.GetFont(size: 12),
+                            Margin = new MarginPadding { Bottom = 5 },
                         },
                         ratingsBar = new Bar
                         {
                             RelativeSizeAxes = Axes.X,
                             Height = 5,
-                            Margin = new MarginPadding { Top = 5 },
                         },
                         new Container
                         {
                             RelativeSizeAxes = Axes.X,
                             AutoSizeAxes = Axes.Y,
+                            Margin = new MarginPadding { Bottom = 10 },
                             Children = new[]
                             {
                                 negativeRatings = new OsuSpriteText
                                 {
                                     Text = "0",
-                                    Font = OsuFont.GetFont(size: 13)
+                                    Font = OsuFont.GetFont(size: 12)
                                 },
                                 positiveRatings = new OsuSpriteText
                                 {
                                     Anchor = Anchor.TopRight,
                                     Origin = Anchor.TopRight,
                                     Text = @"0",
-                                    Font = OsuFont.GetFont(size: 13)
+                                    Font = OsuFont.GetFont(size: 12)
                                 },
                             },
                         },
@@ -104,8 +105,8 @@ namespace osu.Game.Screens.Select.Details
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.TopCentre,
                             Text = "Rating Spread",
-                            Font = OsuFont.GetFont(size: 13),
-                            Margin = new MarginPadding { Top = 10, Bottom = 5 },
+                            Font = OsuFont.GetFont(size: 12),
+                            Margin = new MarginPadding { Bottom = 5 },
                         },
                     },
                 },

From 64a9b9c6fbea86aaf1cf2ead68fa8797dc1f9aa1 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Sun, 16 Feb 2020 21:52:08 +0100
Subject: [PATCH 0539/1142] Remove redundant using directives

---
 osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs | 1 -
 osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs            | 2 --
 osu.Game/Overlays/BeatmapSet/LeaderboardScopeSelector.cs | 1 -
 osu.Game/Screens/Select/Details/AdvancedStats.cs         | 1 -
 4 files changed, 5 deletions(-)

diff --git a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
index 182ab055b3..c60bd0286e 100644
--- a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
+++ b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs b/osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs
index 265e2d32f9..66886b0882 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs
@@ -6,7 +6,6 @@ using System.Linq;
 using osu.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -19,7 +18,6 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Overlays.BeatmapSet
 {
diff --git a/osu.Game/Overlays/BeatmapSet/LeaderboardScopeSelector.cs b/osu.Game/Overlays/BeatmapSet/LeaderboardScopeSelector.cs
index 48062ef3f0..607355b7bf 100644
--- a/osu.Game/Overlays/BeatmapSet/LeaderboardScopeSelector.cs
+++ b/osu.Game/Overlays/BeatmapSet/LeaderboardScopeSelector.cs
@@ -3,7 +3,6 @@
 
 using osu.Game.Screens.Select.Leaderboards;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Graphics;
 using osu.Framework.Allocation;
 using osuTK.Graphics;
 using osu.Framework.Graphics.UserInterface;
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 44fac32360..af0d36ea9a 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.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 osuTK;
 using osuTK.Graphics;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;

From c85a8a14cc629bd919f4c692b9f6eff4eb6093b4 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 17 Feb 2020 00:08:28 +0300
Subject: [PATCH 0540/1142] Use property instead of function to set text size

---
 osu.Game/Overlays/BeatmapListing/BeatmapSearchFilter.cs      | 4 ++--
 osu.Game/Overlays/BeatmapListing/SmallBeatmapSearchFilter.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilter.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilter.cs
index 57e8282798..825d157918 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilter.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilter.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Overlays.BeatmapListing
 
         protected class FilterTabItem : TabItem<T>
         {
-            protected virtual float TextSize() => 13;
+            protected virtual float TextSize => 13;
 
             [Resolved]
             private OverlayColourProvider colourProvider { get; set; }
@@ -55,7 +55,7 @@ namespace osu.Game.Overlays.BeatmapListing
                 {
                     text = new OsuSpriteText
                     {
-                        Font = OsuFont.GetFont(size: TextSize(), weight: FontWeight.Regular),
+                        Font = OsuFont.GetFont(size: TextSize, weight: FontWeight.Regular),
                         Text = GetText(value)
                     },
                     new HoverClickSounds()
diff --git a/osu.Game/Overlays/BeatmapListing/SmallBeatmapSearchFilter.cs b/osu.Game/Overlays/BeatmapListing/SmallBeatmapSearchFilter.cs
index ca387f08cf..b5d2ad5d4e 100644
--- a/osu.Game/Overlays/BeatmapListing/SmallBeatmapSearchFilter.cs
+++ b/osu.Game/Overlays/BeatmapListing/SmallBeatmapSearchFilter.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.BeatmapListing
             {
             }
 
-            protected override float TextSize() => 10;
+            protected override float TextSize => 10;
         }
     }
 }

From ea285fd005f07cf42f3f0e06bd4c57e749818136 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 17 Feb 2020 00:44:55 +0300
Subject: [PATCH 0541/1142] Refactor with including headers

---
 .../TestSceneBeatmapSearchFilter.cs           |  26 ++-
 .../BeatmapListing/BeatmapSearchFilter.cs     |  97 ------------
 .../BeatmapListing/BeatmapSearchFilterRow.cs  | 149 ++++++++++++++++++
 .../BeatmapSearchRulesetFilter.cs             |  36 -----
 .../BeatmapSearchRulesetFilterRow.cs          |  46 ++++++
 .../BeatmapSearchSmallFilterRow.cs            |  32 ++++
 .../SmallBeatmapSearchFilter.cs               |  22 ---
 7 files changed, 246 insertions(+), 162 deletions(-)
 delete mode 100644 osu.Game/Overlays/BeatmapListing/BeatmapSearchFilter.cs
 create mode 100644 osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
 delete mode 100644 osu.Game/Overlays/BeatmapListing/BeatmapSearchRulesetFilter.cs
 create mode 100644 osu.Game/Overlays/BeatmapListing/BeatmapSearchRulesetFilterRow.cs
 create mode 100644 osu.Game/Overlays/BeatmapListing/BeatmapSearchSmallFilterRow.cs
 delete mode 100644 osu.Game/Overlays/BeatmapListing/SmallBeatmapSearchFilter.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs
index b82ad86fb8..30cd34be50 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -17,29 +18,40 @@ namespace osu.Game.Tests.Visual.UserInterface
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
-            typeof(BeatmapSearchFilter<>),
-            typeof(BeatmapSearchRulesetFilter)
+            typeof(BeatmapSearchFilterRow<>),
+            typeof(BeatmapSearchRulesetFilterRow),
+            typeof(BeatmapSearchSmallFilterRow<>),
         };
 
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
+        private readonly FillFlowContainer resizableContainer;
+
         public TestSceneBeatmapSearchFilter()
         {
-            Add(new FillFlowContainer
+            Add(resizableContainer = new FillFlowContainer
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                AutoSizeAxes = Axes.Both,
+                AutoSizeAxes = Axes.Y,
+                RelativeSizeAxes = Axes.X,
                 Direction = FillDirection.Vertical,
                 Spacing = new Vector2(0, 10),
                 Children = new Drawable[]
                 {
-                    new BeatmapSearchRulesetFilter(),
-                    new BeatmapSearchFilter<BeatmapSearchCategory>(),
-                    new SmallBeatmapSearchFilter<BeatmapSearchCategory>()
+                    new BeatmapSearchRulesetFilterRow(),
+                    new BeatmapSearchFilterRow<BeatmapSearchCategory>("Categories"),
+                    new BeatmapSearchSmallFilterRow<BeatmapSearchCategory>("Header Name")
                 }
             });
         }
+
+        [Test]
+        public void TestResize()
+        {
+            AddStep("Resize to 0.3", () => resizableContainer.ResizeWidthTo(0.3f, 1000));
+            AddStep("Resize to 1", () => resizableContainer.ResizeWidthTo(1, 1000));
+        }
     }
 }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilter.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilter.cs
deleted file mode 100644
index 825d157918..0000000000
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilter.cs
+++ /dev/null
@@ -1,97 +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 System;
-using osu.Framework.Allocation;
-using osu.Framework.Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Input.Events;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
-using osuTK;
-using osuTK.Graphics;
-
-namespace osu.Game.Overlays.BeatmapListing
-{
-    public class BeatmapSearchFilter<T> : TabControl<T>
-    {
-        public BeatmapSearchFilter()
-        {
-            AutoSizeAxes = Axes.Both;
-
-            if (typeof(T).IsEnum)
-            {
-                foreach (var val in (T[])Enum.GetValues(typeof(T)))
-                    AddItem(val);
-            }
-        }
-
-        protected override Dropdown<T> CreateDropdown() => null;
-
-        protected override TabItem<T> CreateTabItem(T value) => new FilterTabItem(value);
-
-        protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
-        {
-            AutoSizeAxes = Axes.Both,
-            Spacing = new Vector2(10),
-        };
-
-        protected class FilterTabItem : TabItem<T>
-        {
-            protected virtual float TextSize => 13;
-
-            [Resolved]
-            private OverlayColourProvider colourProvider { get; set; }
-
-            private readonly OsuSpriteText text;
-
-            public FilterTabItem(T value)
-                : base(value)
-            {
-                AutoSizeAxes = Axes.Both;
-                AddRangeInternal(new Drawable[]
-                {
-                    text = new OsuSpriteText
-                    {
-                        Font = OsuFont.GetFont(size: TextSize, weight: FontWeight.Regular),
-                        Text = GetText(value)
-                    },
-                    new HoverClickSounds()
-                });
-
-                Enabled.Value = true;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                updateState();
-            }
-
-            protected virtual string GetText(T value) => (value as Enum)?.GetDescription() ?? value.ToString();
-
-            protected override bool OnHover(HoverEvent e)
-            {
-                base.OnHover(e);
-                updateState();
-                return true;
-            }
-
-            protected override void OnHoverLost(HoverLostEvent e)
-            {
-                base.OnHoverLost(e);
-                updateState();
-            }
-
-            protected override void OnActivated() => updateState();
-
-            protected override void OnDeactivated() => updateState();
-
-            private void updateState() => text.FadeColour(Active.Value ? Color4.White : getStateColour(), 200, Easing.OutQuint);
-
-            private Color4 getStateColour() => IsHovered ? colourProvider.Light1 : colourProvider.Light3;
-        }
-    }
-}
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
new file mode 100644
index 0000000000..05578a36b5
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
@@ -0,0 +1,149 @@
+// 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 JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+    public class BeatmapSearchFilterRow<T> : CompositeDrawable, IHasCurrentValue<T>
+    {
+        private readonly BindableWithCurrent<T> current = new BindableWithCurrent<T>();
+
+        public Bindable<T> Current
+        {
+            get => current.Current;
+            set => current.Current = value;
+        }
+
+        public BeatmapSearchFilterRow(string headerName)
+        {
+            AutoSizeAxes = Axes.Y;
+            RelativeSizeAxes = Axes.X;
+            AddInternal(new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Y,
+                RelativeSizeAxes = Axes.X,
+                Spacing = new Vector2(0, 7),
+                Children = new Drawable[]
+                {
+                    new Container
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        AutoSizeAxes = Axes.Y,
+                        Width = 100,
+                        Child = new OsuSpriteText
+                        {
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            Font = OsuFont.GetFont(size: 10),
+                            Text = headerName.ToUpper()
+                        }
+                    },
+                    CreateFilter().With(f =>
+                    {
+                        f.Anchor = Anchor.CentreLeft;
+                        f.Origin = Anchor.CentreLeft;
+                        f.Current = current;
+                    })
+                }
+            });
+        }
+
+        [NotNull]
+        protected virtual BeatmapSearchFilter CreateFilter() => new BeatmapSearchFilter();
+
+        protected class BeatmapSearchFilter : TabControl<T>
+        {
+            public BeatmapSearchFilter()
+            {
+                AutoSizeAxes = Axes.Both;
+
+                if (typeof(T).IsEnum)
+                {
+                    foreach (var val in (T[])Enum.GetValues(typeof(T)))
+                        AddItem(val);
+                }
+            }
+
+            protected override Dropdown<T> CreateDropdown() => null;
+
+            protected override TabItem<T> CreateTabItem(T value) => new FilterTabItem(value);
+
+            protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Spacing = new Vector2(10),
+            };
+
+            protected class FilterTabItem : TabItem<T>
+            {
+                protected virtual float TextSize => 13;
+
+                [Resolved]
+                private OverlayColourProvider colourProvider { get; set; }
+
+                private readonly OsuSpriteText text;
+
+                public FilterTabItem(T value)
+                    : base(value)
+                {
+                    AutoSizeAxes = Axes.Both;
+                    AddRangeInternal(new Drawable[]
+                    {
+                        text = new OsuSpriteText
+                        {
+                            Font = OsuFont.GetFont(size: TextSize, weight: FontWeight.Regular),
+                            Text = GetText(value)
+                        },
+                        new HoverClickSounds()
+                    });
+
+                    Enabled.Value = true;
+                }
+
+                [BackgroundDependencyLoader]
+                private void load()
+                {
+                    updateState();
+                }
+
+                protected virtual string GetText(T value) => (value as Enum)?.GetDescription() ?? value.ToString();
+
+                protected override bool OnHover(HoverEvent e)
+                {
+                    base.OnHover(e);
+                    updateState();
+                    return true;
+                }
+
+                protected override void OnHoverLost(HoverLostEvent e)
+                {
+                    base.OnHoverLost(e);
+                    updateState();
+                }
+
+                protected override void OnActivated() => updateState();
+
+                protected override void OnDeactivated() => updateState();
+
+                private void updateState() => text.FadeColour(Active.Value ? Color4.White : getStateColour(), 200, Easing.OutQuint);
+
+                private Color4 getStateColour() => IsHovered ? colourProvider.Light1 : colourProvider.Light3;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchRulesetFilter.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchRulesetFilter.cs
deleted file mode 100644
index ffe5693eeb..0000000000
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchRulesetFilter.cs
+++ /dev/null
@@ -1,36 +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.Game.Rulesets;
-using osu.Framework.Graphics.UserInterface;
-
-namespace osu.Game.Overlays.BeatmapListing
-{
-    public class BeatmapSearchRulesetFilter : BeatmapSearchFilter<RulesetInfo>
-    {
-        [BackgroundDependencyLoader]
-        private void load(RulesetStore rulesets)
-        {
-            AddItem(new RulesetInfo
-            {
-                Name = @"Any"
-            });
-
-            foreach (var r in rulesets.AvailableRulesets)
-                AddItem(r);
-        }
-
-        protected override TabItem<RulesetInfo> CreateTabItem(RulesetInfo value) => new RulesetTabItem(value);
-
-        private class RulesetTabItem : FilterTabItem
-        {
-            public RulesetTabItem(RulesetInfo value)
-                : base(value)
-            {
-            }
-
-            protected override string GetText(RulesetInfo value) => value.Name;
-        }
-    }
-}
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchRulesetFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchRulesetFilterRow.cs
new file mode 100644
index 0000000000..d30364ab0d
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchRulesetFilterRow.cs
@@ -0,0 +1,46 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Rulesets;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+    public class BeatmapSearchRulesetFilterRow : BeatmapSearchFilterRow<RulesetInfo>
+    {
+        public BeatmapSearchRulesetFilterRow()
+            : base(@"Mode")
+        {
+        }
+
+        protected override BeatmapSearchFilter CreateFilter() => new RulesetFilter();
+
+        private class RulesetFilter : BeatmapSearchFilter
+        {
+            [BackgroundDependencyLoader]
+            private void load(RulesetStore rulesets)
+            {
+                AddItem(new RulesetInfo
+                {
+                    Name = @"Any"
+                });
+
+                foreach (var r in rulesets.AvailableRulesets)
+                    AddItem(r);
+            }
+
+            protected override TabItem<RulesetInfo> CreateTabItem(RulesetInfo value) => new RulesetTabItem(value);
+
+            private class RulesetTabItem : FilterTabItem
+            {
+                public RulesetTabItem(RulesetInfo value)
+                    : base(value)
+                {
+                }
+
+                protected override string GetText(RulesetInfo value) => value.Name;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchSmallFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchSmallFilterRow.cs
new file mode 100644
index 0000000000..6daa7cb0e0
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchSmallFilterRow.cs
@@ -0,0 +1,32 @@
+// 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.UserInterface;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+    public class BeatmapSearchSmallFilterRow<T> : BeatmapSearchFilterRow<T>
+    {
+        public BeatmapSearchSmallFilterRow(string headerName)
+            : base(headerName)
+        {
+        }
+
+        protected override BeatmapSearchFilter CreateFilter() => new SmallBeatmapSearchFilter();
+
+        private class SmallBeatmapSearchFilter : BeatmapSearchFilter
+        {
+            protected override TabItem<T> CreateTabItem(T value) => new SmallTabItem(value);
+
+            private class SmallTabItem : FilterTabItem
+            {
+                public SmallTabItem(T value)
+                    : base(value)
+                {
+                }
+
+                protected override float TextSize => 10;
+            }
+        }
+    }
+}
diff --git a/osu.Game/Overlays/BeatmapListing/SmallBeatmapSearchFilter.cs b/osu.Game/Overlays/BeatmapListing/SmallBeatmapSearchFilter.cs
deleted file mode 100644
index b5d2ad5d4e..0000000000
--- a/osu.Game/Overlays/BeatmapListing/SmallBeatmapSearchFilter.cs
+++ /dev/null
@@ -1,22 +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.Graphics.UserInterface;
-
-namespace osu.Game.Overlays.BeatmapListing
-{
-    public class SmallBeatmapSearchFilter<T> : BeatmapSearchFilter<T>
-    {
-        protected override TabItem<T> CreateTabItem(T value) => new SmallTabItem(value);
-
-        protected class SmallTabItem : FilterTabItem
-        {
-            public SmallTabItem(T value)
-                : base(value)
-            {
-            }
-
-            protected override float TextSize => 10;
-        }
-    }
-}

From a9f366fda3a74c2054d450251f9bbaf07f34f37d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 17 Feb 2020 02:20:53 +0300
Subject: [PATCH 0542/1142] Implement OverlaySortTabControl component

---
 .../Online/TestSceneCommentsContainer.cs      |   2 +-
 .../Visual/Online/TestSceneCommentsHeader.cs  |   2 +-
 osu.Game/Overlays/Comments/CommentsHeader.cs  |  33 ++--
 osu.Game/Overlays/Comments/SortTabControl.cs  | 110 -------------
 osu.Game/Overlays/OverlaySortTabControl.cs    | 147 ++++++++++++++++++
 5 files changed, 159 insertions(+), 135 deletions(-)
 delete mode 100644 osu.Game/Overlays/Comments/SortTabControl.cs
 create mode 100644 osu.Game/Overlays/OverlaySortTabControl.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
index 2a43ba3f99..ece280659c 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Tests.Visual.Online
             typeof(CommentsHeader),
             typeof(DrawableComment),
             typeof(HeaderButton),
-            typeof(SortTabControl),
+            typeof(OverlaySortTabControl<>),
             typeof(ShowChildrenButton),
             typeof(DeletedCommentsCounter),
             typeof(VotePill),
diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsHeader.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsHeader.cs
index a60f220e4b..c688d600a3 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsHeader.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsHeader.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             typeof(CommentsHeader),
             typeof(HeaderButton),
-            typeof(SortTabControl),
+            typeof(OverlaySortTabControl<>),
         };
 
         [Cached]
diff --git a/osu.Game/Overlays/Comments/CommentsHeader.cs b/osu.Game/Overlays/Comments/CommentsHeader.cs
index ad80e67330..1aa40201f1 100644
--- a/osu.Game/Overlays/Comments/CommentsHeader.cs
+++ b/osu.Game/Overlays/Comments/CommentsHeader.cs
@@ -16,8 +16,6 @@ namespace osu.Game.Overlays.Comments
 {
     public class CommentsHeader : CompositeDrawable
     {
-        private const int font_size = 14;
-
         public readonly Bindable<CommentsSortCriteria> Sort = new Bindable<CommentsSortCriteria>();
         public readonly BindableBool ShowDeleted = new BindableBool();
 
@@ -40,29 +38,11 @@ namespace osu.Game.Overlays.Comments
                     Padding = new MarginPadding { Horizontal = 50 },
                     Children = new Drawable[]
                     {
-                        new FillFlowContainer
+                        new OverlaySortTabControl<CommentsSortCriteria>
                         {
-                            AutoSizeAxes = Axes.Both,
-                            Direction = FillDirection.Horizontal,
-                            Spacing = new Vector2(10, 0),
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
-                            Children = new Drawable[]
-                            {
-                                new OsuSpriteText
-                                {
-                                    Anchor = Anchor.CentreLeft,
-                                    Origin = Anchor.CentreLeft,
-                                    Font = OsuFont.GetFont(size: font_size),
-                                    Text = @"Sort by"
-                                },
-                                new SortTabControl
-                                {
-                                    Anchor = Anchor.CentreLeft,
-                                    Origin = Anchor.CentreLeft,
-                                    Current = Sort
-                                }
-                            }
+                            Current = Sort
                         },
                         new ShowDeletedButton
                         {
@@ -106,7 +86,7 @@ namespace osu.Game.Overlays.Comments
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
-                            Font = OsuFont.GetFont(size: font_size),
+                            Font = OsuFont.GetFont(size: 12),
                             Text = @"Show deleted"
                         }
                     },
@@ -126,4 +106,11 @@ namespace osu.Game.Overlays.Comments
             }
         }
     }
+
+    public enum CommentsSortCriteria
+    {
+        New,
+        Old,
+        Top
+    }
 }
diff --git a/osu.Game/Overlays/Comments/SortTabControl.cs b/osu.Game/Overlays/Comments/SortTabControl.cs
deleted file mode 100644
index 700d63351f..0000000000
--- a/osu.Game/Overlays/Comments/SortTabControl.cs
+++ /dev/null
@@ -1,110 +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.Graphics.Containers;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Graphics.Sprites;
-using osu.Game.Graphics;
-using osuTK;
-using osu.Game.Graphics.UserInterface;
-using osu.Framework.Input.Events;
-using osu.Framework.Bindables;
-using osu.Framework.Allocation;
-using osu.Game.Graphics.Sprites;
-using osuTK.Graphics;
-
-namespace osu.Game.Overlays.Comments
-{
-    public class SortTabControl : OsuTabControl<CommentsSortCriteria>
-    {
-        protected override Dropdown<CommentsSortCriteria> CreateDropdown() => null;
-
-        protected override TabItem<CommentsSortCriteria> CreateTabItem(CommentsSortCriteria value) => new SortTabItem(value);
-
-        protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
-        {
-            AutoSizeAxes = Axes.Both,
-            Direction = FillDirection.Horizontal,
-            Spacing = new Vector2(5, 0),
-        };
-
-        public SortTabControl()
-        {
-            AutoSizeAxes = Axes.Both;
-        }
-
-        private class SortTabItem : TabItem<CommentsSortCriteria>
-        {
-            public SortTabItem(CommentsSortCriteria value)
-                : base(value)
-            {
-                AutoSizeAxes = Axes.Both;
-                Child = new TabButton(value) { Active = { BindTarget = Active } };
-            }
-
-            protected override void OnActivated()
-            {
-            }
-
-            protected override void OnDeactivated()
-            {
-            }
-
-            private class TabButton : HeaderButton
-            {
-                public readonly BindableBool Active = new BindableBool();
-
-                [Resolved]
-                private OverlayColourProvider colourProvider { get; set; }
-
-                private readonly SpriteText text;
-
-                public TabButton(CommentsSortCriteria value)
-                {
-                    Add(text = new OsuSpriteText
-                    {
-                        Font = OsuFont.GetFont(size: 14),
-                        Text = value.ToString()
-                    });
-                }
-
-                protected override void LoadComplete()
-                {
-                    base.LoadComplete();
-
-                    Active.BindValueChanged(active =>
-                    {
-                        updateBackgroundState();
-
-                        text.Font = text.Font.With(weight: active.NewValue ? FontWeight.Bold : FontWeight.Medium);
-                        text.Colour = active.NewValue ? colourProvider.Light1 : Color4.White;
-                    }, true);
-                }
-
-                protected override bool OnHover(HoverEvent e)
-                {
-                    updateBackgroundState();
-                    return true;
-                }
-
-                protected override void OnHoverLost(HoverLostEvent e) => updateBackgroundState();
-
-                private void updateBackgroundState()
-                {
-                    if (Active.Value || IsHovered)
-                        ShowBackground();
-                    else
-                        HideBackground();
-                }
-            }
-        }
-    }
-
-    public enum CommentsSortCriteria
-    {
-        New,
-        Old,
-        Top
-    }
-}
diff --git a/osu.Game/Overlays/OverlaySortTabControl.cs b/osu.Game/Overlays/OverlaySortTabControl.cs
new file mode 100644
index 0000000000..0b91de2682
--- /dev/null
+++ b/osu.Game/Overlays/OverlaySortTabControl.cs
@@ -0,0 +1,147 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
+using osuTK;
+using osu.Game.Graphics.UserInterface;
+using osu.Framework.Input.Events;
+using osu.Framework.Bindables;
+using osu.Framework.Allocation;
+using osu.Game.Graphics.Sprites;
+using osuTK.Graphics;
+using osu.Game.Overlays.Comments;
+using JetBrains.Annotations;
+
+namespace osu.Game.Overlays
+{
+    public class OverlaySortTabControl<T> : CompositeDrawable, IHasCurrentValue<T>
+    {
+        private readonly BindableWithCurrent<T> current = new BindableWithCurrent<T>();
+
+        public Bindable<T> Current
+        {
+            get => current.Current;
+            set => current.Current = value;
+        }
+
+        public OverlaySortTabControl()
+        {
+            AutoSizeAxes = Axes.Both;
+            AddInternal(new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Horizontal,
+                Spacing = new Vector2(10, 0),
+                Children = new Drawable[]
+                {
+                    new OsuSpriteText
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Font = OsuFont.GetFont(size: 12),
+                        Text = @"Sort by"
+                    },
+                    CreateControl().With(c =>
+                    {
+                        c.Anchor = Anchor.CentreLeft;
+                        c.Origin = Anchor.CentreLeft;
+                        c.Current = current;
+                    })
+                }
+            });
+        }
+
+        [NotNull]
+        protected virtual SortTabControl CreateControl() => new SortTabControl();
+
+        protected class SortTabControl : OsuTabControl<T>
+        {
+            protected override Dropdown<T> CreateDropdown() => null;
+
+            protected override TabItem<T> CreateTabItem(T value) => new SortTabItem(value);
+
+            protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Horizontal,
+                Spacing = new Vector2(5, 0),
+            };
+
+            public SortTabControl()
+            {
+                AutoSizeAxes = Axes.Both;
+            }
+
+            protected class SortTabItem : TabItem<T>
+            {
+                public SortTabItem(T value)
+                    : base(value)
+                {
+                    AutoSizeAxes = Axes.Both;
+                    Child = new TabButton(value) { Active = { BindTarget = Active } };
+                }
+
+                protected override void OnActivated()
+                {
+                }
+
+                protected override void OnDeactivated()
+                {
+                }
+
+                private class TabButton : HeaderButton
+                {
+                    public readonly BindableBool Active = new BindableBool();
+
+                    [Resolved]
+                    private OverlayColourProvider colourProvider { get; set; }
+
+                    private readonly SpriteText text;
+
+                    public TabButton(T value)
+                    {
+                        Add(text = new OsuSpriteText
+                        {
+                            Font = OsuFont.GetFont(size: 12),
+                            Text = value.ToString()
+                        });
+                    }
+
+                    protected override void LoadComplete()
+                    {
+                        base.LoadComplete();
+                        Active.BindValueChanged(_ => updateState(), true);
+                    }
+
+                    protected override bool OnHover(HoverEvent e)
+                    {
+                        updateHoverState();
+                        return true;
+                    }
+
+                    protected override void OnHoverLost(HoverLostEvent e) => updateHoverState();
+
+                    private void updateState()
+                    {
+                        updateHoverState();
+                        text.Font = text.Font.With(weight: Active.Value ? FontWeight.Bold : FontWeight.Medium);
+                    }
+
+                    private void updateHoverState()
+                    {
+                        if (Active.Value || IsHovered)
+                            ShowBackground();
+                        else
+                            HideBackground();
+
+                        text.Colour = Active.Value && !IsHovered ? colourProvider.Light1 : Color4.White;
+                    }
+                }
+            }
+        }
+    }
+}

From 2ba0bd872bd41428a9da62a020be1d231f73a321 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 17 Feb 2020 02:35:46 +0300
Subject: [PATCH 0543/1142] Implement basic BeatmapListingSortTabControl

---
 .../TestSceneBeatmapListingSort.cs            | 33 +++++++++++++++++++
 .../BeatmapListingSortTabControl.cs           | 24 ++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSort.cs
 create mode 100644 osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSort.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSort.cs
new file mode 100644
index 0000000000..28549f4306
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSort.cs
@@ -0,0 +1,33 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Overlays;
+using osu.Game.Overlays.BeatmapListing;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneBeatmapListingSort : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(BeatmapListingSortTabControl),
+            typeof(OverlaySortTabControl<>),
+        };
+
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+
+        public TestSceneBeatmapListingSort()
+        {
+            Add(new BeatmapListingSortTabControl
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            });
+        }
+    }
+}
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs
new file mode 100644
index 0000000000..0a002325e7
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs
@@ -0,0 +1,24 @@
+// 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.BeatmapListing
+{
+    public class BeatmapListingSortTabControl : OverlaySortTabControl<BeatmapSortCriteria>
+    {
+        public BeatmapListingSortTabControl()
+        {
+            Current.Value = BeatmapSortCriteria.Ranked;
+        }
+    }
+
+    public enum BeatmapSortCriteria
+    {
+        Title,
+        Artist,
+        Difficulty,
+        Ranked,
+        Rating,
+        Plays,
+        Favourites,
+    }
+}

From fe7923b7e824449c0d06baf2a6729ccf935ae4ed Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 17 Feb 2020 03:38:14 +0300
Subject: [PATCH 0544/1142] Add SortDirection Bindable and refactor to make
 everything work

---
 .../TestSceneBeatmapListingSort.cs            | 30 +++++-
 .../BeatmapListingSortTabControl.cs           | 95 +++++++++++++++++++
 osu.Game/Overlays/OverlaySortTabControl.cs    | 53 +++++++----
 3 files changed, 161 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSort.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSort.cs
index 28549f4306..40c694e224 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSort.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSort.cs
@@ -5,8 +5,11 @@ using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapListing;
+using osuTK;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
@@ -20,14 +23,39 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+        private readonly FillFlowContainer placeholder;
+        private readonly BeatmapListingSortTabControl control;
 
         public TestSceneBeatmapListingSort()
         {
-            Add(new BeatmapListingSortTabControl
+            Add(control = new BeatmapListingSortTabControl
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             });
+
+            Add(placeholder = new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 5),
+            });
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            control.SortDirection.BindValueChanged(_ => updateBindablesVisual());
+            control.Current.BindValueChanged(_ => updateBindablesVisual(), true);
+        }
+
+        private void updateBindablesVisual()
+        {
+            placeholder.Clear();
+
+            placeholder.Add(new OsuSpriteText { Text = $"Current: {control.Current.Value}" });
+            placeholder.Add(new OsuSpriteText { Text = $"Sort direction: {control.SortDirection.Value}" });
         }
     }
 }
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs
index 0a002325e7..3f69c76da7 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs
@@ -1,14 +1,109 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Graphics;
+using osuTK.Graphics;
+using osuTK;
+using osu.Framework.Input.Events;
+
 namespace osu.Game.Overlays.BeatmapListing
 {
     public class BeatmapListingSortTabControl : OverlaySortTabControl<BeatmapSortCriteria>
     {
+        public readonly Bindable<SortDirection> SortDirection = new Bindable<SortDirection>(Overlays.SortDirection.Descending);
+
         public BeatmapListingSortTabControl()
         {
             Current.Value = BeatmapSortCriteria.Ranked;
         }
+
+        protected override SortTabControl CreateControl() => new BeatmapSortTabControl
+        {
+            SortDirection = { BindTarget = SortDirection }
+        };
+
+        private class BeatmapSortTabControl : SortTabControl
+        {
+            public readonly Bindable<SortDirection> SortDirection = new Bindable<SortDirection>();
+
+            protected override TabItem<BeatmapSortCriteria> CreateTabItem(BeatmapSortCriteria value) => new BeatmapSortTabItem(value)
+            {
+                SortDirection = { BindTarget = SortDirection }
+            };
+
+            private class BeatmapSortTabItem : SortTabItem
+            {
+                public readonly Bindable<SortDirection> SortDirection = new Bindable<SortDirection>();
+
+                public BeatmapSortTabItem(BeatmapSortCriteria value)
+                    : base(value)
+                {
+                }
+
+                protected override TabButton CreateTabButton(BeatmapSortCriteria value) => new BeatmapTabButton(value)
+                {
+                    Active = { BindTarget = Active },
+                    SortDirection = { BindTarget = SortDirection }
+                };
+
+                private class BeatmapTabButton : TabButton
+                {
+                    public readonly Bindable<SortDirection> SortDirection = new Bindable<SortDirection>();
+
+                    protected override Color4 ContentColour
+                    {
+                        set
+                        {
+                            base.ContentColour = value;
+                            icon.Colour = value;
+                        }
+                    }
+
+                    private readonly SpriteIcon icon;
+
+                    public BeatmapTabButton(BeatmapSortCriteria value)
+                        : base(value)
+                    {
+                        Add(icon = new SpriteIcon
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            AlwaysPresent = true,
+                            Alpha = 0,
+                            Size = new Vector2(6)
+                        });
+                    }
+
+                    protected override void LoadComplete()
+                    {
+                        base.LoadComplete();
+
+                        SortDirection.BindValueChanged(direction =>
+                        {
+                            icon.Icon = direction.NewValue == Overlays.SortDirection.Ascending ? FontAwesome.Solid.CaretUp : FontAwesome.Solid.CaretDown;
+                            icon.Margin = direction.NewValue == Overlays.SortDirection.Ascending ? new MarginPadding { Top = 1 } : new MarginPadding { Top = 2 };
+                        }, true);
+                    }
+
+                    protected override void UpdateState()
+                    {
+                        base.UpdateState();
+                        icon.FadeTo(Active.Value || IsHovered ? 1 : 0, 200, Easing.OutQuint);
+                    }
+
+                    protected override bool OnClick(ClickEvent e)
+                    {
+                        if (Active.Value)
+                            SortDirection.Value = SortDirection.Value == Overlays.SortDirection.Ascending ? Overlays.SortDirection.Descending : Overlays.SortDirection.Ascending;
+
+                        return base.OnClick(e);
+                    }
+                }
+            }
+        }
     }
 
     public enum BeatmapSortCriteria
diff --git a/osu.Game/Overlays/OverlaySortTabControl.cs b/osu.Game/Overlays/OverlaySortTabControl.cs
index 0b91de2682..487dd70db9 100644
--- a/osu.Game/Overlays/OverlaySortTabControl.cs
+++ b/osu.Game/Overlays/OverlaySortTabControl.cs
@@ -82,9 +82,15 @@ namespace osu.Game.Overlays
                     : base(value)
                 {
                     AutoSizeAxes = Axes.Both;
-                    Child = new TabButton(value) { Active = { BindTarget = Active } };
+                    Child = CreateTabButton(value);
                 }
 
+                [NotNull]
+                protected virtual TabButton CreateTabButton(T value) => new TabButton(value)
+                {
+                    Active = { BindTarget = Active }
+                };
+
                 protected override void OnActivated()
                 {
                 }
@@ -93,52 +99,67 @@ namespace osu.Game.Overlays
                 {
                 }
 
-                private class TabButton : HeaderButton
+                protected class TabButton : HeaderButton
                 {
                     public readonly BindableBool Active = new BindableBool();
 
+                    protected override Container<Drawable> Content => content;
+
+                    protected virtual Color4 ContentColour
+                    {
+                        set => text.Colour = value;
+                    }
+
                     [Resolved]
                     private OverlayColourProvider colourProvider { get; set; }
 
                     private readonly SpriteText text;
+                    private readonly FillFlowContainer content;
 
                     public TabButton(T value)
                     {
-                        Add(text = new OsuSpriteText
+                        base.Content.Add(content = new FillFlowContainer
                         {
-                            Font = OsuFont.GetFont(size: 12),
-                            Text = value.ToString()
+                            AutoSizeAxes = Axes.Both,
+                            Direction = FillDirection.Horizontal,
+                            Spacing = new Vector2(3, 0),
+                            Children = new Drawable[]
+                            {
+                                text = new OsuSpriteText
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    Font = OsuFont.GetFont(size: 12),
+                                    Text = value.ToString()
+                                }
+                            }
                         });
                     }
 
                     protected override void LoadComplete()
                     {
                         base.LoadComplete();
-                        Active.BindValueChanged(_ => updateState(), true);
+                        Active.BindValueChanged(_ => UpdateState(), true);
                     }
 
                     protected override bool OnHover(HoverEvent e)
                     {
-                        updateHoverState();
+                        UpdateState();
                         return true;
                     }
 
-                    protected override void OnHoverLost(HoverLostEvent e) => updateHoverState();
+                    protected override void OnHoverLost(HoverLostEvent e) => UpdateState();
 
-                    private void updateState()
-                    {
-                        updateHoverState();
-                        text.Font = text.Font.With(weight: Active.Value ? FontWeight.Bold : FontWeight.Medium);
-                    }
-
-                    private void updateHoverState()
+                    protected virtual void UpdateState()
                     {
                         if (Active.Value || IsHovered)
                             ShowBackground();
                         else
                             HideBackground();
 
-                        text.Colour = Active.Value && !IsHovered ? colourProvider.Light1 : Color4.White;
+                        ContentColour = Active.Value && !IsHovered ? colourProvider.Light1 : Color4.White;
+
+                        text.Font = text.Font.With(weight: Active.Value ? FontWeight.Bold : FontWeight.Medium);
                     }
                 }
             }

From d985a22f7758b8de3651f15141178b6a5140a53a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 17 Feb 2020 03:52:26 +0300
Subject: [PATCH 0545/1142] Add missing blank line

---
 .../Visual/UserInterface/TestSceneBeatmapListingSort.cs          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSort.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSort.cs
index 40c694e224..4638b2bb54 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSort.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSort.cs
@@ -23,6 +23,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+
         private readonly FillFlowContainer placeholder;
         private readonly BeatmapListingSortTabControl control;
 

From 480e5677edaa8cb93201042b8a1158bb3f4e9d51 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 17 Feb 2020 04:29:41 +0300
Subject: [PATCH 0546/1142] Use OverlayColourProvider for CounterPill in
 profile overlay

---
 .../Visual/Online/TestSceneProfileCounterPill.cs    |  5 +++++
 osu.Game/Overlays/Profile/Sections/CounterPill.cs   | 13 ++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneProfileCounterPill.cs b/osu.Game.Tests/Visual/Online/TestSceneProfileCounterPill.cs
index 468239cf08..5e2b125521 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneProfileCounterPill.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneProfileCounterPill.cs
@@ -4,8 +4,10 @@
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Game.Overlays;
 using osu.Game.Overlays.Profile.Sections;
 
 namespace osu.Game.Tests.Visual.Online
@@ -17,6 +19,9 @@ namespace osu.Game.Tests.Visual.Online
             typeof(CounterPill)
         };
 
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Red);
+
         private readonly CounterPill pill;
         private readonly BindableInt value = new BindableInt();
 
diff --git a/osu.Game/Overlays/Profile/Sections/CounterPill.cs b/osu.Game/Overlays/Profile/Sections/CounterPill.cs
index bd760c4139..52adefa4ad 100644
--- a/osu.Game/Overlays/Profile/Sections/CounterPill.cs
+++ b/osu.Game/Overlays/Profile/Sections/CounterPill.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Framework.Bindables;
 using osu.Game.Graphics.Sprites;
+using osu.Framework.Allocation;
 
 namespace osu.Game.Overlays.Profile.Sections
 {
@@ -16,9 +17,10 @@ namespace osu.Game.Overlays.Profile.Sections
 
         public readonly BindableInt Current = new BindableInt();
 
-        private readonly OsuSpriteText counter;
+        private OsuSpriteText counter;
 
-        public CounterPill()
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
         {
             AutoSizeAxes = Axes.Both;
             Alpha = 0;
@@ -28,14 +30,15 @@ namespace osu.Game.Overlays.Profile.Sections
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = OsuColour.Gray(0.05f)
+                    Colour = colourProvider.Background6
                 },
                 counter = new OsuSpriteText
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Margin = new MarginPadding { Horizontal = 10, Vertical = 5 },
-                    Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold)
+                    Font = OsuFont.GetFont(weight: FontWeight.Bold),
+                    Colour = colourProvider.Foreground1
                 }
             };
         }
@@ -54,7 +57,7 @@ namespace osu.Game.Overlays.Profile.Sections
                 return;
             }
 
-            counter.Text = value.NewValue.ToString();
+            counter.Text = value.NewValue.ToString("N0");
             this.FadeIn(duration, Easing.OutQuint);
         }
     }

From b1e7d1f99588c865e49cf41459e787fabcb288c1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 Feb 2020 11:09:33 +0900
Subject: [PATCH 0547/1142] Slight rewording

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 67027bb9f3..e6d297c47f 100644
--- a/README.md
+++ b/README.md
@@ -13,9 +13,9 @@ Rhythm is just a *click* away. The future of [osu!](https://osu.ppy.sh) and the
 
 ## Status
 
-This project is still heavily under development, but is in a state where users are encouraged to try it out and keep it installed alongside the stable *osu!* client. It will continue to evolve over the coming months and hopefully bring some new unique features to the table.
+This project under heavy development, but is in a stable state. Users are encouraged to try it out and keep it installed alongside the stable *osu!* client. It will continue to evolve to the point of eventually replacing the existing stable client as an update.
 
-We are accepting bug reports (please report with as much detail as possible). Feature requests are welcome as long as you read and understand the contribution guidelines listed below.
+We are accepting bug reports (please report with as much detail as possible). Feature requests are also welcome, but understand that our focus is on completing the game to feature parity before adding new features.
 
 Detailed changelogs are published on the [official osu! site](https://osu.ppy.sh/home/changelog).
 

From 8b2b159a0c4b93a0eb844c8b75d7616d21f66f39 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 Feb 2020 11:09:46 +0900
Subject: [PATCH 0548/1142] Link to details on project management

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e6d297c47f..0a3ed7f0e7 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ This project under heavy development, but is in a stable state. Users are encour
 
 We are accepting bug reports (please report with as much detail as possible). Feature requests are also welcome, but understand that our focus is on completing the game to feature parity before adding new features.
 
-Detailed changelogs are published on the [official osu! site](https://osu.ppy.sh/home/changelog).
+Detailed changelogs are published on the [official osu! site](https://osu.ppy.sh/home/changelog). You can also learn more about our approach to [project management](https://github.com/ppy/osu/wiki/Project-management).
 
 ## Requirements
 

From 2c3e510051b76a11b514d2879e83c935b168c5ef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 Feb 2020 11:10:26 +0900
Subject: [PATCH 0549/1142] Link directly to lazer changelog now that this is
 supported by osu-web

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0a3ed7f0e7..3f50c39cfe 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ This project under heavy development, but is in a stable state. Users are encour
 
 We are accepting bug reports (please report with as much detail as possible). Feature requests are also welcome, but understand that our focus is on completing the game to feature parity before adding new features.
 
-Detailed changelogs are published on the [official osu! site](https://osu.ppy.sh/home/changelog). You can also learn more about our approach to [project management](https://github.com/ppy/osu/wiki/Project-management).
+Detailed release changelogs are available on the [official osu! site](https://osu.ppy.sh/home/changelog/lazer). You can also learn more about our approach to [project management](https://github.com/ppy/osu/wiki/Project-management).
 
 ## Requirements
 

From 7e052e9894f5448b5cb7c4b16c38e97e75d54f95 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 Feb 2020 12:49:47 +0900
Subject: [PATCH 0550/1142] Update README.md

Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3f50c39cfe..90ec1d0b39 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Rhythm is just a *click* away. The future of [osu!](https://osu.ppy.sh) and the
 
 ## Status
 
-This project under heavy development, but is in a stable state. Users are encouraged to try it out and keep it installed alongside the stable *osu!* client. It will continue to evolve to the point of eventually replacing the existing stable client as an update.
+This project is under heavy development, but is in a stable state. Users are encouraged to try it out and keep it installed alongside the stable *osu!* client. It will continue to evolve to the point of eventually replacing the existing stable client as an update.
 
 We are accepting bug reports (please report with as much detail as possible). Feature requests are also welcome, but understand that our focus is on completing the game to feature parity before adding new features.
 

From 06fcb48d652480e7dfff0ab53d28a9de6033fc62 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 Feb 2020 14:19:39 +0900
Subject: [PATCH 0551/1142] Move SkinnableTestScene to main project for
 consumption by other rulesets

---
 osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs    | 1 +
 osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs       | 1 +
 osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs            | 1 +
 osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs               | 1 +
 .../Tests/Visual}/SkinnableTestScene.cs                      | 5 ++---
 5 files changed, 6 insertions(+), 3 deletions(-)
 rename {osu.Game.Rulesets.Osu.Tests => osu.Game/Tests/Visual}/SkinnableTestScene.cs (95%)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
index ac627aa23e..02d4406809 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
@@ -10,6 +10,7 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
index 90f1cdb2ea..7b96e2ec6a 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneGameplayCursor.cs
@@ -10,6 +10,7 @@ using osu.Framework.Testing.Input;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Osu.UI.Cursor;
 using osu.Game.Screens.Play;
+using osu.Game.Tests.Visual;
 using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
index 098e277fff..ae5a28217c 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircle.cs
@@ -14,6 +14,7 @@ using osu.Game.Rulesets.Mods;
 using System.Linq;
 using NUnit.Framework;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
index e8386363be..defd3a6f22 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSlider.cs
@@ -22,6 +22,7 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Objects.Drawables.Pieces;
+using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
diff --git a/osu.Game.Rulesets.Osu.Tests/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
similarity index 95%
rename from osu.Game.Rulesets.Osu.Tests/SkinnableTestScene.cs
rename to osu.Game/Tests/Visual/SkinnableTestScene.cs
index d4c3000d3f..c149ecd33f 100644
--- a/osu.Game.Rulesets.Osu.Tests/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -10,9 +10,8 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
 using osu.Game.Skinning;
-using osu.Game.Tests.Visual;
 
-namespace osu.Game.Rulesets.Osu.Tests
+namespace osu.Game.Tests.Visual
 {
     public abstract class SkinnableTestScene : OsuGridTestScene
     {
@@ -29,7 +28,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [BackgroundDependencyLoader]
         private void load(AudioManager audio, SkinManager skinManager)
         {
-            var dllStore = new DllResourceStore(typeof(SkinnableTestScene).Assembly);
+            var dllStore = new DllResourceStore(GetType().Assembly);
 
             metricsSkin = new TestLegacySkin(new SkinInfo(), new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), audio, true);
             defaultSkin = skinManager.GetSkin(DefaultLegacySkin.Info);

From 958c891d1517dc2fb4a9cf1a59e2deb1d1902d43 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 17 Feb 2020 15:06:14 +0900
Subject: [PATCH 0552/1142] Update with framework-side bindable list changes

---
 osu.Game.Rulesets.Osu/Objects/Slider.cs       |  3 +-
 .../Online/TestSceneLeaderboardModSelector.cs | 43 +++++++++++--------
 .../Screens/Editors/TournamentEditorScreen.cs | 17 +++++++-
 .../Ladder/Components/LadderEditorSettings.cs | 31 +++++++++++--
 .../Screens/Ladder/LadderScreen.cs            | 31 +++++++------
 .../BeatmapSet/Scores/ScoresContainer.cs      |  3 +-
 .../Objects/Drawables/DrawableHitObject.cs    |  3 +-
 osu.Game/Rulesets/Objects/SliderPath.cs       | 23 +++++-----
 .../Compose/Components/BlueprintContainer.cs  | 23 +++++-----
 .../Screens/Multi/Components/BeatmapTitle.cs  |  3 +-
 .../Multi/Components/BeatmapTypeInfo.cs       |  3 +-
 .../Screens/Multi/Components/ModeTypeInfo.cs  |  3 +-
 .../Components/MultiplayerBackgroundSprite.cs |  3 +-
 .../Screens/Multi/DrawableRoomPlaylist.cs     | 12 ++++--
 .../Screens/Multi/DrawableRoomPlaylistItem.cs |  3 +-
 15 files changed, 127 insertions(+), 77 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Slider.cs b/osu.Game.Rulesets.Osu/Objects/Slider.cs
index 95fb6d9d48..77f8ec6cc8 100644
--- a/osu.Game.Rulesets.Osu/Objects/Slider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Slider.cs
@@ -116,8 +116,7 @@ namespace osu.Game.Rulesets.Osu.Objects
 
         public Slider()
         {
-            SamplesBindable.ItemsAdded += _ => updateNestedSamples();
-            SamplesBindable.ItemsRemoved += _ => updateNestedSamples();
+            SamplesBindable.CollectionChanged += (_, __) => updateNestedSamples();
             Path.Version.ValueChanged += _ => updateNestedPositions();
         }
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneLeaderboardModSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneLeaderboardModSelector.cs
index e0e5a088ce..7327e80d06 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneLeaderboardModSelector.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneLeaderboardModSelector.cs
@@ -4,6 +4,8 @@
 using osu.Game.Overlays.BeatmapSet;
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Mania;
@@ -15,6 +17,7 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Bindables;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -44,27 +47,31 @@ namespace osu.Game.Tests.Visual.Online
                 Ruleset = { BindTarget = ruleset }
             });
 
-            modSelector.SelectedMods.ItemsAdded += mods =>
+            modSelector.SelectedMods.CollectionChanged += (_, args) =>
             {
-                mods.ForEach(mod => selectedMods.Add(new OsuSpriteText
+                switch (args.Action)
                 {
-                    Text = mod.Acronym,
-                }));
-            };
-
-            modSelector.SelectedMods.ItemsRemoved += mods =>
-            {
-                mods.ForEach(mod =>
-                {
-                    foreach (var selected in selectedMods)
-                    {
-                        if (selected.Text == mod.Acronym)
+                    case NotifyCollectionChangedAction.Add:
+                        args.NewItems.Cast<Mod>().ForEach(mod => selectedMods.Add(new OsuSpriteText
                         {
-                            selectedMods.Remove(selected);
-                            break;
-                        }
-                    }
-                });
+                            Text = mod.Acronym,
+                        }));
+                        break;
+
+                    case NotifyCollectionChangedAction.Remove:
+                        args.OldItems.Cast<Mod>().ForEach(mod =>
+                        {
+                            foreach (var selected in selectedMods)
+                            {
+                                if (selected.Text == mod.Acronym)
+                                {
+                                    selectedMods.Remove(selected);
+                                    break;
+                                }
+                            }
+                        });
+                        break;
+                }
             };
 
             AddStep("osu ruleset", () => ruleset.Value = new OsuRuleset().RulesetInfo);
diff --git a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
index 32cf6bbcc8..5598910824 100644
--- a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Specialized;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
@@ -71,8 +73,19 @@ namespace osu.Game.Tournament.Screens.Editors
                 }
             });
 
-            Storage.ItemsAdded += items => items.ForEach(i => flow.Add(CreateDrawable(i)));
-            Storage.ItemsRemoved += items => items.ForEach(i => flow.RemoveAll(d => d.Model == i));
+            Storage.CollectionChanged += (_, args) =>
+            {
+                switch (args.Action)
+                {
+                    case NotifyCollectionChangedAction.Add:
+                        args.NewItems.Cast<TModel>().ForEach(i => flow.Add(CreateDrawable(i)));
+                        break;
+
+                    case NotifyCollectionChangedAction.Remove:
+                        args.OldItems.Cast<TModel>().ForEach(i => flow.RemoveAll(d => d.Model == i));
+                        break;
+                }
+            };
 
             foreach (var model in Storage)
                 flow.Add(CreateDrawable(model));
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
index 0864d25a2f..8ab083ddaf 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -90,8 +91,19 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
                 foreach (var r in rounds.Prepend(new TournamentRound()))
                     add(r);
 
-                rounds.ItemsRemoved += items => items.ForEach(i => Control.RemoveDropdownItem(i));
-                rounds.ItemsAdded += items => items.ForEach(add);
+                rounds.CollectionChanged += (_, args) =>
+                {
+                    switch (args.Action)
+                    {
+                        case NotifyCollectionChangedAction.Add:
+                            args.NewItems.Cast<TournamentRound>().ForEach(add);
+                            break;
+
+                        case NotifyCollectionChangedAction.Remove:
+                            args.OldItems.Cast<TournamentRound>().ForEach(i => Control.RemoveDropdownItem(i));
+                            break;
+                    }
+                };
             }
 
             private readonly List<IUnbindable> refBindables = new List<IUnbindable>();
@@ -122,8 +134,19 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
                 foreach (var t in teams.Prepend(new TournamentTeam()))
                     add(t);
 
-                teams.ItemsRemoved += items => items.ForEach(i => Control.RemoveDropdownItem(i));
-                teams.ItemsAdded += items => items.ForEach(add);
+                teams.CollectionChanged += (_, args) =>
+                {
+                    switch (args.Action)
+                    {
+                        case NotifyCollectionChangedAction.Add:
+                            args.NewItems.Cast<TournamentTeam>().ForEach(add);
+                            break;
+
+                        case NotifyCollectionChangedAction.Remove:
+                            args.OldItems.Cast<TournamentTeam>().ForEach(i => Control.RemoveDropdownItem(i));
+                            break;
+                    }
+                };
             }
 
             private readonly List<IUnbindable> refBindables = new List<IUnbindable>();
diff --git a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
index 66e68a0f37..8ea366e1b4 100644
--- a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
+++ b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Specialized;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Caching;
@@ -68,22 +69,24 @@ namespace osu.Game.Tournament.Screens.Ladder
             foreach (var match in LadderInfo.Matches)
                 addMatch(match);
 
-            LadderInfo.Rounds.ItemsAdded += _ => layout.Invalidate();
-            LadderInfo.Rounds.ItemsRemoved += _ => layout.Invalidate();
-
-            LadderInfo.Matches.ItemsAdded += matches =>
+            LadderInfo.Rounds.CollectionChanged += (_, __) => layout.Invalidate();
+            LadderInfo.Matches.CollectionChanged += (_, args) =>
             {
-                foreach (var p in matches)
-                    addMatch(p);
-                layout.Invalidate();
-            };
-
-            LadderInfo.Matches.ItemsRemoved += matches =>
-            {
-                foreach (var p in matches)
+                switch (args.Action)
                 {
-                    foreach (var d in MatchesContainer.Where(d => d.Match == p))
-                        d.Expire();
+                    case NotifyCollectionChangedAction.Add:
+                        foreach (var p in args.NewItems.Cast<TournamentMatch>())
+                            addMatch(p);
+                        break;
+
+                    case NotifyCollectionChangedAction.Remove:
+                        foreach (var p in args.NewItems.Cast<TournamentMatch>())
+                        {
+                            foreach (var d in MatchesContainer.Where(d => d.Match == p))
+                                d.Expire();
+                        }
+
+                        break;
                 }
 
                 layout.Invalidate();
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index 8560232209..2d8bd10b13 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -191,8 +191,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             scope.BindValueChanged(_ => getScores());
             ruleset.BindValueChanged(_ => getScores());
 
-            modSelector.SelectedMods.ItemsAdded += _ => getScores();
-            modSelector.SelectedMods.ItemsRemoved += _ => getScores();
+            modSelector.SelectedMods.CollectionChanged += (_, __) => getScores();
 
             Beatmap.BindValueChanged(onBeatmapChanged);
             user.BindValueChanged(onUserChanged, true);
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index d3a0b3450f..6f20bcf595 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -125,8 +125,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             }
 
             samplesBindable = HitObject.SamplesBindable.GetBoundCopy();
-            samplesBindable.ItemsAdded += _ => loadSamples();
-            samplesBindable.ItemsRemoved += _ => loadSamples();
+            samplesBindable.CollectionChanged += (_, __) => loadSamples();
 
             updateState(ArmedState.Idle, true);
             onDefaultsApplied();
diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index 62a5b6f0b5..ff5f1e3e1e 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Linq;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
@@ -47,18 +48,20 @@ namespace osu.Game.Rulesets.Objects
         {
             ExpectedDistance.ValueChanged += _ => invalidate();
 
-            ControlPoints.ItemsAdded += items =>
+            ControlPoints.CollectionChanged += (_, args) =>
             {
-                foreach (var c in items)
-                    c.Changed += invalidate;
+                switch (args.Action)
+                {
+                    case NotifyCollectionChangedAction.Add:
+                        foreach (var c in args.NewItems.Cast<PathControlPoint>())
+                            c.Changed += invalidate;
+                        break;
 
-                invalidate();
-            };
-
-            ControlPoints.ItemsRemoved += items =>
-            {
-                foreach (var c in items)
-                    c.Changed -= invalidate;
+                    case NotifyCollectionChangedAction.Remove:
+                        foreach (var c in args.NewItems.Cast<PathControlPoint>())
+                            c.Changed -= invalidate;
+                        break;
+                }
 
                 invalidate();
             };
diff --git a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
index 417d32ca4f..c81c6059cc 100644
--- a/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -70,18 +71,20 @@ namespace osu.Game.Screens.Edit.Compose.Components
                 AddBlueprintFor(obj);
 
             selectedHitObjects.BindTo(beatmap.SelectedHitObjects);
-            selectedHitObjects.ItemsAdded += objects =>
+            selectedHitObjects.CollectionChanged += (selectedObjects, args) =>
             {
-                foreach (var o in objects)
-                    SelectionBlueprints.FirstOrDefault(b => b.HitObject == o)?.Select();
+                switch (args.Action)
+                {
+                    case NotifyCollectionChangedAction.Add:
+                        foreach (var o in args.NewItems)
+                            SelectionBlueprints.FirstOrDefault(b => b.HitObject == o)?.Select();
+                        break;
 
-                SelectionChanged?.Invoke(selectedHitObjects);
-            };
-
-            selectedHitObjects.ItemsRemoved += objects =>
-            {
-                foreach (var o in objects)
-                    SelectionBlueprints.FirstOrDefault(b => b.HitObject == o)?.Deselect();
+                    case NotifyCollectionChangedAction.Remove:
+                        foreach (var o in args.OldItems)
+                            SelectionBlueprints.FirstOrDefault(b => b.HitObject == o)?.Deselect();
+                        break;
+                }
 
                 SelectionChanged?.Invoke(selectedHitObjects);
             };
diff --git a/osu.Game/Screens/Multi/Components/BeatmapTitle.cs b/osu.Game/Screens/Multi/Components/BeatmapTitle.cs
index baf11dfe0d..9e7a59d7d2 100644
--- a/osu.Game/Screens/Multi/Components/BeatmapTitle.cs
+++ b/osu.Game/Screens/Multi/Components/BeatmapTitle.cs
@@ -26,8 +26,7 @@ namespace osu.Game.Screens.Multi.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            Playlist.ItemsAdded += _ => updateText();
-            Playlist.ItemsRemoved += _ => updateText();
+            Playlist.CollectionChanged += (_, __) => updateText();
 
             updateText();
         }
diff --git a/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs b/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs
index a1334101b8..ce3b612262 100644
--- a/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs
+++ b/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs
@@ -51,8 +51,7 @@ namespace osu.Game.Screens.Multi.Components
                 }
             };
 
-            Playlist.ItemsAdded += _ => updateInfo();
-            Playlist.ItemsRemoved += _ => updateInfo();
+            Playlist.CollectionChanged += (_, __) => updateInfo();
 
             updateInfo();
         }
diff --git a/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs b/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs
index 258541bbd6..0015feb26a 100644
--- a/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs
+++ b/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs
@@ -48,8 +48,7 @@ namespace osu.Game.Screens.Multi.Components
 
             Type.BindValueChanged(type => gameTypeContainer.Child = new DrawableGameType(type.NewValue) { Size = new Vector2(height) }, true);
 
-            Playlist.ItemsAdded += _ => updateBeatmap();
-            Playlist.ItemsRemoved += _ => updateBeatmap();
+            Playlist.CollectionChanged += (_, __) => updateBeatmap();
 
             updateBeatmap();
         }
diff --git a/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs b/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs
index 5e2f2e530a..2240e55e2f 100644
--- a/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs
+++ b/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs
@@ -23,8 +23,7 @@ namespace osu.Game.Screens.Multi.Components
         {
             InternalChild = sprite = CreateBackgroundSprite();
 
-            Playlist.ItemsAdded += _ => updateBeatmap();
-            Playlist.ItemsRemoved += _ => updateBeatmap();
+            Playlist.CollectionChanged += (_, __) => updateBeatmap();
 
             updateBeatmap();
         }
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
index b139c61166..9a3fcb1cdc 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Specialized;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
@@ -29,10 +30,15 @@ namespace osu.Game.Screens.Multi
             base.LoadComplete();
 
             // Scheduled since items are removed and re-added upon rearrangement
-            Items.ItemsRemoved += items => Schedule(() =>
+            Items.CollectionChanged += (_, args) => Schedule(() =>
             {
-                if (!Items.Contains(SelectedItem.Value))
-                    SelectedItem.Value = null;
+                switch (args.Action)
+                {
+                    case NotifyCollectionChangedAction.Remove:
+                        if (args.OldItems.Contains(SelectedItem))
+                            SelectedItem.Value = null;
+                        break;
+                }
             });
         }
 
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
index 75c751aa61..ca85aec4e4 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
@@ -84,8 +84,7 @@ namespace osu.Game.Screens.Multi
             beatmap.BindValueChanged(_ => scheduleRefresh());
             ruleset.BindValueChanged(_ => scheduleRefresh());
 
-            requiredMods.ItemsAdded += _ => scheduleRefresh();
-            requiredMods.ItemsRemoved += _ => scheduleRefresh();
+            requiredMods.CollectionChanged += (_, __) => scheduleRefresh();
 
             refresh();
         }

From c78534d14e1e6455ace738296fb7b657887853eb Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 17 Feb 2020 10:07:32 +0300
Subject: [PATCH 0553/1142] Fix possible error in SpotlightsLayout

---
 osu.Game/Overlays/Rankings/SpotlightsLayout.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Rankings/SpotlightsLayout.cs b/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
index 33811cc982..e609fa1487 100644
--- a/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Overlays.Rankings
         private void getSpotlights()
         {
             spotlightsRequest = new GetSpotlightsRequest();
-            spotlightsRequest.Success += response => selector.Spotlights = response.Spotlights;
+            spotlightsRequest.Success += response => Schedule(() => selector.Spotlights = response.Spotlights);
             api.Queue(spotlightsRequest);
         }
 
@@ -151,11 +151,11 @@ namespace osu.Game.Overlays.Rankings
 
         protected override void Dispose(bool isDisposing)
         {
-            base.Dispose(isDisposing);
-
             spotlightsRequest?.Cancel();
             getRankingsRequest?.Cancel();
             cancellationToken?.Cancel();
+
+            base.Dispose(isDisposing);
         }
     }
 }

From bdd6f3af991cea1333a0de4876e3d8d2aa20c2b9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 Feb 2020 16:09:31 +0900
Subject: [PATCH 0554/1142] Show skinnable test skin names and autosized
 component sizes

---
 osu.Game/Tests/Visual/SkinnableTestScene.cs | 83 +++++++++++++++++++--
 1 file changed, 75 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index c149ecd33f..90f719998e 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.cs
@@ -7,9 +7,13 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Skinning;
+using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual
 {
@@ -30,10 +34,10 @@ namespace osu.Game.Tests.Visual
         {
             var dllStore = new DllResourceStore(GetType().Assembly);
 
-            metricsSkin = new TestLegacySkin(new SkinInfo(), new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), audio, true);
+            metricsSkin = new TestLegacySkin(new SkinInfo { Name = "metrics-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/metrics_skin"), audio, true);
             defaultSkin = skinManager.GetSkin(DefaultLegacySkin.Info);
-            specialSkin = new TestLegacySkin(new SkinInfo(), new NamespacedResourceStore<byte[]>(dllStore, "Resources/special_skin"), audio, true);
-            oldSkin = new TestLegacySkin(new SkinInfo(), new NamespacedResourceStore<byte[]>(dllStore, "Resources/old_skin"), audio, true);
+            specialSkin = new TestLegacySkin(new SkinInfo { Name = "special-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/special_skin"), audio, true);
+            oldSkin = new TestLegacySkin(new SkinInfo { Name = "old-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/old_skin"), audio, true);
         }
 
         public void SetContents(Func<Drawable> creationFunction)
@@ -47,13 +51,76 @@ namespace osu.Game.Tests.Visual
 
         private Drawable createProvider(Skin skin, Func<Drawable> creationFunction)
         {
-            var mainProvider = new SkinProvidingContainer(skin);
+            var created = creationFunction();
+            var autoSize = created.RelativeSizeAxes == Axes.None;
 
-            return mainProvider
-                .WithChild(new SkinProvidingContainer(Ruleset.Value.CreateInstance().CreateLegacySkinProvider(mainProvider))
+            var mainProvider = new SkinProvidingContainer(skin)
+            {
+                RelativeSizeAxes = !autoSize ? Axes.Both : Axes.None,
+                AutoSizeAxes = autoSize ? Axes.Both : Axes.None,
+            };
+
+            return new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                BorderColour = Color4.White,
+                BorderThickness = 5,
+                Masking = true,
+
+                Children = new Drawable[]
                 {
-                    Child = creationFunction()
-                });
+                    new Box
+                    {
+                        AlwaysPresent = true,
+                        Alpha = 0,
+                        RelativeSizeAxes = Axes.Both,
+                    },
+                    new OsuSpriteText
+                    {
+                        Text = skin?.SkinInfo?.Name ?? "none",
+                        Scale = new Vector2(1.5f),
+                        Padding = new MarginPadding(5),
+                    },
+                    new Container
+                    {
+                        RelativeSizeAxes = !autoSize ? Axes.Both : Axes.None,
+                        AutoSizeAxes = autoSize ? Axes.Both : Axes.None,
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Children = new Drawable[]
+                        {
+                            new OutlineBox { Alpha = autoSize ? 1 : 0 },
+                            mainProvider.WithChild(
+                                new SkinProvidingContainer(Ruleset.Value.CreateInstance().CreateLegacySkinProvider(mainProvider))
+                                {
+                                    Child = created,
+                                    RelativeSizeAxes = !autoSize ? Axes.Both : Axes.None,
+                                    AutoSizeAxes = autoSize ? Axes.Both : Axes.None,
+                                }
+                            )
+                        }
+                    },
+                }
+            };
+        }
+
+        private class OutlineBox : CompositeDrawable
+        {
+            public OutlineBox()
+            {
+                BorderColour = Color4.IndianRed;
+                BorderThickness = 5;
+                Masking = true;
+                RelativeSizeAxes = Axes.Both;
+
+                InternalChild = new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Alpha = 0,
+                    Colour = Color4.Brown,
+                    AlwaysPresent = true
+                };
+            }
         }
 
         private class TestLegacySkin : LegacySkin

From f7f8622436e56f5072d336d06c639312644859a8 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Mon, 17 Feb 2020 15:42:52 +0800
Subject: [PATCH 0555/1142] make TestSceneDrawableJudgement use scene from
 osu.Game.Tests

---
 .../SkinnableTestScene.cs                     | 46 -------------------
 .../TestSceneDrawableJudgement.cs             |  1 +
 2 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Mania.Tests/SkinnableTestScene.cs

diff --git a/osu.Game.Rulesets.Mania.Tests/SkinnableTestScene.cs b/osu.Game.Rulesets.Mania.Tests/SkinnableTestScene.cs
deleted file mode 100644
index 80b1b3df8e..0000000000
--- a/osu.Game.Rulesets.Mania.Tests/SkinnableTestScene.cs
+++ /dev/null
@@ -1,46 +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 System;
-using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Skinning;
-using osu.Game.Tests.Visual;
-
-namespace osu.Game.Rulesets.Mania.Tests
-{
-    public abstract class SkinnableTestScene : OsuGridTestScene
-    {
-        private Skin defaultSkin;
-
-        protected SkinnableTestScene()
-            : base(1, 2)
-        {
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(AudioManager audio, SkinManager skinManager)
-        {
-            defaultSkin = skinManager.GetSkin(DefaultLegacySkin.Info);
-        }
-
-        public void SetContents(Func<Drawable> creationFunction)
-        {
-            Cell(0).Child = createProvider(null, creationFunction);
-            Cell(1).Child = createProvider(defaultSkin, creationFunction);
-        }
-
-        private Drawable createProvider(Skin skin, Func<Drawable> creationFunction)
-        {
-            var mainProvider = new SkinProvidingContainer(skin);
-
-            return mainProvider
-                .WithChild(new SkinProvidingContainer(Ruleset.Value.CreateInstance().CreateLegacySkinProvider(mainProvider))
-                {
-                    Child = creationFunction()
-                });
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableJudgement.cs
index eea1a36a19..692d079c16 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableJudgement.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableJudgement.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
+using osu.Game.Tests.Visual;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;

From 5ca93758dc40e50094897877749391ec9dea0d5b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 17 Feb 2020 16:59:35 +0900
Subject: [PATCH 0556/1142] Fix music playlist being enumerated asynchronously

---
 osu.Game/Overlays/Music/PlaylistOverlay.cs |  8 ++++--
 osu.Game/Overlays/MusicController.cs       | 30 +++++++++++++++++-----
 osu.Game/Overlays/NowPlayingOverlay.cs     | 11 +++++---
 3 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/Music/PlaylistOverlay.cs b/osu.Game/Overlays/Music/PlaylistOverlay.cs
index 8f753fd3aa..b878aba489 100644
--- a/osu.Game/Overlays/Music/PlaylistOverlay.cs
+++ b/osu.Game/Overlays/Music/PlaylistOverlay.cs
@@ -75,8 +75,6 @@ namespace osu.Game.Overlays.Music
                 },
             };
 
-            list.Items.BindTo(beatmapSets);
-
             filter.Search.OnCommit = (sender, newText) =>
             {
                 BeatmapInfo toSelect = list.FirstVisibleSet?.Beatmaps?.FirstOrDefault();
@@ -87,7 +85,13 @@ namespace osu.Game.Overlays.Music
                     beatmap.Value.Track.Restart();
                 }
             };
+        }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            list.Items.BindTo(beatmapSets);
             beatmap.BindValueChanged(working => list.SelectedSet.Value = working.NewValue.BeatmapSetInfo, true);
         }
 
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 7c7daf6eb9..d788929739 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -25,7 +25,16 @@ namespace osu.Game.Overlays
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
-        public IBindableList<BeatmapSetInfo> BeatmapSets => beatmapSets;
+        public IBindableList<BeatmapSetInfo> BeatmapSets
+        {
+            get
+            {
+                if (LoadState < LoadState.Ready)
+                    throw new InvalidOperationException($"{nameof(BeatmapSets)} should not be accessed before the music controller is loaded.");
+
+                return beatmapSets;
+            }
+        }
 
         /// <summary>
         /// Point in time after which the current track will be restarted on triggering a "previous track" action.
@@ -54,16 +63,18 @@ namespace osu.Game.Overlays
         [BackgroundDependencyLoader]
         private void load()
         {
-            beatmapSets.AddRange(beatmaps.GetAllUsableBeatmapSets().OrderBy(_ => RNG.Next()));
             beatmaps.ItemAdded += handleBeatmapAdded;
             beatmaps.ItemRemoved += handleBeatmapRemoved;
+
+            beatmapSets.AddRange(beatmaps.GetAllUsableBeatmapSets().OrderBy(_ => RNG.Next()));
         }
 
         protected override void LoadComplete()
         {
+            base.LoadComplete();
+
             beatmap.BindValueChanged(beatmapChanged, true);
             mods.BindValueChanged(_ => ResetTrackAdjustments(), true);
-            base.LoadComplete();
         }
 
         /// <summary>
@@ -82,11 +93,16 @@ namespace osu.Game.Overlays
         /// </summary>
         public bool IsPlaying => current?.Track.IsRunning ?? false;
 
-        private void handleBeatmapAdded(BeatmapSetInfo set) =>
-            Schedule(() => beatmapSets.Add(set));
+        private void handleBeatmapAdded(BeatmapSetInfo set) => Schedule(() =>
+        {
+            if (!beatmapSets.Contains(set))
+                beatmapSets.Add(set);
+        });
 
-        private void handleBeatmapRemoved(BeatmapSetInfo set) =>
-            Schedule(() => beatmapSets.RemoveAll(s => s.ID == set.ID));
+        private void handleBeatmapRemoved(BeatmapSetInfo set) => Schedule(() =>
+        {
+            beatmapSets.RemoveAll(s => s.ID == set.ID);
+        });
 
         private ScheduledDelegate seekDelegate;
 
diff --git a/osu.Game/Overlays/NowPlayingOverlay.cs b/osu.Game/Overlays/NowPlayingOverlay.cs
index dfcf99d30c..118cb037cb 100644
--- a/osu.Game/Overlays/NowPlayingOverlay.cs
+++ b/osu.Game/Overlays/NowPlayingOverlay.cs
@@ -58,6 +58,9 @@ namespace osu.Game.Overlays
         [Resolved]
         private Bindable<WorkingBeatmap> beatmap { get; set; }
 
+        [Resolved]
+        private OsuColour colours { get; set; }
+
         public NowPlayingOverlay()
         {
             Width = 400;
@@ -65,7 +68,7 @@ namespace osu.Game.Overlays
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load()
         {
             Children = new Drawable[]
             {
@@ -182,15 +185,15 @@ namespace osu.Game.Overlays
                     }
                 }
             };
-
-            playlist.BeatmapSets.BindTo(musicController.BeatmapSets);
-            playlist.State.ValueChanged += s => playlistButton.FadeColour(s.NewValue == Visibility.Visible ? colours.Yellow : Color4.White, 200, Easing.OutQuint);
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
+            playlist.BeatmapSets.BindTo(musicController.BeatmapSets);
+            playlist.State.BindValueChanged(s => playlistButton.FadeColour(s.NewValue == Visibility.Visible ? colours.Yellow : Color4.White, 200, Easing.OutQuint), true);
+
             beatmap.BindDisabledChanged(beatmapDisabledChanged, true);
 
             musicController.TrackChanged += trackChanged;

From f9145ce5b47555072d215c712809be66695952b1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 17 Feb 2020 17:02:19 +0900
Subject: [PATCH 0557/1142] Fix playlist items added with the wrong IDs

---
 osu.Game/Screens/Select/MatchSongSelect.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/MatchSongSelect.cs b/osu.Game/Screens/Select/MatchSongSelect.cs
index a115ab9841..2f3674642e 100644
--- a/osu.Game/Screens/Select/MatchSongSelect.cs
+++ b/osu.Game/Screens/Select/MatchSongSelect.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Screens.Select
         {
             PlaylistItem item = new PlaylistItem
             {
-                ID = (Playlist.LastOrDefault()?.ID + 1) ?? 0,
+                ID = Playlist.Count == 0 ? 0 : Playlist.Max(p => p.ID) + 1
             };
 
             populateItemFromCurrent(item);

From 84ea279c947b03be9ace0d9bd23e157983a648cd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 17 Feb 2020 17:04:58 +0900
Subject: [PATCH 0558/1142] Add test

---
 .../Multiplayer/TestSceneMatchSongSelect.cs      | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
index 5820da811d..2c6f34d8a6 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSongSelect.cs
@@ -134,6 +134,22 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("playlist has 2 items", () => Room.Playlist.Count == 2);
         }
 
+        [Test]
+        public void TestAddItemAfterRearrangement()
+        {
+            AddStep("create new item", () => songSelect.BeatmapDetails.CreateNewItem());
+            AddStep("create new item", () => songSelect.BeatmapDetails.CreateNewItem());
+            AddStep("rearrange", () =>
+            {
+                var item = Room.Playlist[0];
+                Room.Playlist.RemoveAt(0);
+                Room.Playlist.Add(item);
+            });
+
+            AddStep("create new item", () => songSelect.BeatmapDetails.CreateNewItem());
+            AddAssert("new item has id 2", () => Room.Playlist.Last().ID == 2);
+        }
+
         private class TestMatchSongSelect : MatchSongSelect
         {
             public new MatchBeatmapDetailArea BeatmapDetails => (MatchBeatmapDetailArea)base.BeatmapDetails;

From 6ce25b39371522dbacc491ffae5c8e805fbd822b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 17 Feb 2020 08:10:20 +0000
Subject: [PATCH 0559/1142] Bump Sentry from 2.0.2 to 2.0.3

Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 2.0.2 to 2.0.3.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/2.0.2...2.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Game/osu.Game.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 6dcb529dc4..5e78c69f4d 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2020.216.0" />
-    <PackageReference Include="Sentry" Version="2.0.2" />
+    <PackageReference Include="Sentry" Version="2.0.3" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />

From 328ab8ba78eb4b14165ebe7d198373892de09269 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 17 Feb 2020 08:10:37 +0000
Subject: [PATCH 0560/1142] Bump ppy.osu.Framework.NativeLibs from 2019.1104.0
 to 2020.213.0

Bumps [ppy.osu.Framework.NativeLibs](https://github.com/ppy/osu-framework) from 2019.1104.0 to 2020.213.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.1104.0...2020.213.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.iOS.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.iOS.props b/osu.iOS.props
index 946d039195..351126e3b9 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -87,6 +87,6 @@
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
-    <PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2019.1104.0" ExcludeAssets="all" />
+    <PackageReference Include="ppy.osu.Framework.NativeLibs" Version="2020.213.0" ExcludeAssets="all" />
   </ItemGroup>
 </Project>

From a3e0f84fcc36ddb1f76873fb1918bdbddf14ea79 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 Feb 2020 14:40:07 +0900
Subject: [PATCH 0561/1142] Update catcher test to use SkinnableTestScene

---
 .../metrics-skin/fruit-apple-overlay@2x.png   | Bin 0 -> 38217 bytes
 .../Resources/metrics-skin/fruit-apple@2x.png | Bin 0 -> 13140 bytes
 .../metrics-skin/fruit-bananas-overlay@2x.png | Bin 0 -> 38217 bytes
 .../metrics-skin/fruit-bananas@2x.png         | Bin 0 -> 13140 bytes
 .../metrics-skin/fruit-catcher-idle@2x.png    | Bin 0 -> 4154 bytes
 .../Resources/metrics-skin/fruit-drop@2x.png  | Bin 0 -> 11935 bytes
 .../metrics-skin/fruit-grapes-overlay@2x.png  | Bin 0 -> 38217 bytes
 .../metrics-skin/fruit-grapes@2x.png          | Bin 0 -> 13140 bytes
 .../metrics-skin/fruit-orange-overlay@2x.png  | Bin 0 -> 38217 bytes
 .../metrics-skin/fruit-orange@2x.png          | Bin 0 -> 13140 bytes
 .../metrics-skin/fruit-pear-overlay@2x.png    | Bin 0 -> 38217 bytes
 .../Resources/metrics-skin/fruit-pear@2x.png  | Bin 0 -> 13140 bytes
 .../old-skin/fruit-apple-overlay.png          | Bin 0 -> 5035 bytes
 .../Resources/old-skin/fruit-apple.png        | Bin 0 -> 5083 bytes
 .../Resources/old-skin/fruit-drop.png         | Bin 0 -> 4203 bytes
 .../old-skin/fruit-grapes-overlay.png         | Bin 0 -> 11873 bytes
 .../Resources/old-skin/fruit-grapes.png       | Bin 0 -> 3985 bytes
 .../old-skin/fruit-orange-overlay.png         | Bin 0 -> 4096 bytes
 .../Resources/old-skin/fruit-orange.png       | Bin 0 -> 9021 bytes
 .../Resources/old-skin/fruit-pear-overlay.png | Bin 0 -> 7194 bytes
 .../Resources/old-skin/fruit-pear.png         | Bin 0 -> 4873 bytes
 .../Resources/old-skin/fruit-plate.png        | Bin 0 -> 3583 bytes
 .../Resources/old-skin/fruit-ryuuta.png       | Bin 0 -> 11722 bytes
 .../Resources/old-skin/hit0.png               | Bin 0 -> 9518 bytes
 .../Resources/old-skin/hit100.png             | Bin 0 -> 27548 bytes
 .../Resources/old-skin/hit300.png             | Bin 0 -> 30325 bytes
 .../Resources/old-skin/hit50.png              | Bin 0 -> 22638 bytes
 .../special-skin/fruit-apple-overlay.png      | Bin 0 -> 4677 bytes
 .../Resources/special-skin/fruit-apple.png    | Bin 0 -> 4677 bytes
 .../special-skin/fruit-bananas-overlay.png    | Bin 0 -> 4949 bytes
 .../Resources/special-skin/fruit-bananas.png  | Bin 0 -> 4949 bytes
 .../special-skin/fruit-catcher-fail.png       | Bin 0 -> 63150 bytes
 .../special-skin/fruit-catcher-idle.png       | Bin 0 -> 133664 bytes
 .../special-skin/fruit-catcher-kiai.png       | Bin 0 -> 36673 bytes
 .../special-skin/fruit-drop-overlay.png       | Bin 0 -> 4677 bytes
 .../Resources/special-skin/fruit-drop.png     | Bin 0 -> 4677 bytes
 .../special-skin/fruit-grapes-overlay.png     | Bin 0 -> 4677 bytes
 .../Resources/special-skin/fruit-grapes.png   | Bin 0 -> 4633 bytes
 .../special-skin/fruit-orange-overlay.png     | Bin 0 -> 4633 bytes
 .../Resources/special-skin/fruit-orange.png   | Bin 0 -> 4633 bytes
 .../special-skin/fruit-pear-overlay.png       | Bin 0 -> 4633 bytes
 .../Resources/special-skin/fruit-pear.png     | Bin 0 -> 4633 bytes
 .../TestSceneCatcher.cs                       |  87 ++----------------
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs     |   1 -
 44 files changed, 7 insertions(+), 81 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-apple-overlay@2x.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-apple@2x.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-bananas-overlay@2x.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-bananas@2x.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-catcher-idle@2x.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-drop@2x.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-grapes-overlay@2x.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-grapes@2x.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-orange-overlay@2x.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-orange@2x.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-pear-overlay@2x.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-pear@2x.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-apple-overlay.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-apple.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-drop.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-grapes-overlay.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-grapes.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-orange-overlay.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-orange.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-pear-overlay.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-pear.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-plate.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-ryuuta.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/old-skin/hit0.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/old-skin/hit100.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/old-skin/hit300.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/old-skin/hit50.png
 create mode 100755 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-apple-overlay.png
 create mode 100755 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-apple.png
 create mode 100755 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-bananas-overlay.png
 create mode 100755 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-bananas.png
 create mode 100755 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-fail.png
 create mode 100755 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle.png
 create mode 100755 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-kiai.png
 create mode 100755 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-drop-overlay.png
 create mode 100755 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-drop.png
 create mode 100755 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-grapes-overlay.png
 create mode 100755 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-grapes.png
 create mode 100755 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-orange-overlay.png
 create mode 100755 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-orange.png
 create mode 100755 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-pear-overlay.png
 create mode 100755 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-pear.png

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-apple-overlay@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-apple-overlay@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..4233d9bb6e6aa88c7da5c1998439789cc5f9c7b2
GIT binary patch
literal 38217
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-apple@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-apple@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..043bfbfae1a77317aec68051b2d917a42d143fb1
GIT binary patch
literal 13140
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
R|M{Pbx-w?>O~E?q{{RqUO*sGn

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-bananas-overlay@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-bananas-overlay@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..4233d9bb6e6aa88c7da5c1998439789cc5f9c7b2
GIT binary patch
literal 38217
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-bananas@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-bananas@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..043bfbfae1a77317aec68051b2d917a42d143fb1
GIT binary patch
literal 13140
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
R|M{Pbx-w?>O~E?q{{RqUO*sGn

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-catcher-idle@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-catcher-idle@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..76949ccfcc352e83987539cd524e31b5d0627290
GIT binary patch
literal 4154
zcmeHKO>7%Q6rQxCN?Ibqk5H7;vZW9N>;1FW*;P!N*dei~Lr4ucH)dyN?N#jE?d~Ra
zB7~w6N{SST9tstd8|nd2QN;;*D2GZ&;l!Vcil~Ij1tHW6QV$@+jJ<2zD6U;3M3G`?
z<(-)~-}~P8-n`MCn4Os#*gL!z05Fi9&ddR@ODE5I-ySma^@%rkk-vU-dfo?M-~III
z0dJof0-*PXl`jN^++htll^8S}9mi@FmskTZcCh9`w15Lf$3@FdvDYtLWEsmyu`eWY
zLe5R&k~O{J;Ug<Ed9<>CRD(VEBr{gi2tWk~kf~M5wy)JvY#mo4?{u1HnYu}^kYdNF
zL#B|MWzvp^nM6$CkQg6jl4?v;;)1L^!AOFr^1>)D%A6o-f}$moO!#AoH_tG&xy)0c
zFEUE8r66!Mp08G`v8o(%ydp2ED#4I=N#ckF=P%m<tZ}x#KSIc0A9<D=SdPt5M5sH9
zL5d|z8zEHOCamp;G7-V}8gzLvCeV=Th6ZZdxr<)8?%Y5;F5?Qe1E1K6O<T9*1dd;F
z+CVp#Z*oAS&E=Xtw&hZ(G+p??<Pr%Z6l7a#Kfml^eh&N2qKEM05}~=DM&oK}55vIm
z@{UuE5;Yr9W+W0dGm?YIvS|>HwQRu|7~m93@)qX=k~B3hCNw#rCE||@swM~x)0|^i
z=5k~z37jBtVlpo#HDaAmZ!#rCW557*G&YcCI$i~mkgW<VV&1ijEYlQHOFL!9BaR6>
zxph99PS1LdX_d)>KQ}eOWGB;#s45C4#l$+@Tu#f{egJKRvzZi2<cV39q2ai$Ktq%`
zH6cPS9yfJP7of<Af{diND#m3~kM?IAv`CA9?r)q2!$Ab&Z+fPvOG(L8IKvbOP&}UG
zAeIoPDv~ZDU6qqEiqM|%EOI1axfPYNG6<p~%E(lV1eX+a%*B%lm4HE$)8$cUVpB;%
z*`$SEuO)5T@=2DL!=rQr9}VBi7E>=D4I+9hQY@nNfDJaBwzkouE6?HnY6%n2TU1HI
zyYHAm6?%BQNVMys4*7QUeYkXM^4%q~!73u(wr>9!`A`~Ef_4#;KFhN-9G-ThMq>D_
zIjgU=bg#&qv_$&a?8Riz?B>`e&>rd4_Z3#k<XZSSn;Fm7uKarWeE%zlhK|E~?mF5(
zHT~#3d+pO#f7p2Az_D-n_xc_#jJ*EkPs{IL+x+O08=LDRSI55kycd8EzBzgJ+|yqG
z@X~98yTKs2b0+Qv;GsQ$xdb{4*G~5Xur>r%$;LzLJ)lqQG$gRpn0g_`s~7vv|2X`7
z5BP5ORPi{u%YF~tQ!whDU{f~jhpU5fPb(tj-Qr-IVdto}NYIhP7KUxa_`_U3@bQ`S
z_Yc6{RrJgCtIs{SRyeic1#i7G0A_x(Ufz6{JAH3MmTg$KiK**M-L9@tOr0|trhia>
zq*Jy0JG!=KNd3{(jwKO^d*`Sb9j30ShjIQ_#l4e+mSX!KCxN+i7<AWoZ@WS4lyuj1
z(f+!NRHsla_fq@g7pWe0>1epqS336kJ0=Mqp1g2boZnr~_r8slXNRwRR`|0>zwWb>
LGnsP}FCO~~7Cm-2

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-drop@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-drop@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec2fdbdbdbcf59c1f65d4919b14fc8cdd35c518b
GIT binary patch
literal 11935
zcmbVy2Ut^Cv@V1y5K4d$dI&{|KteMhJs}inp%+m?C;<Y5UQ{Hs(8~ylh)PimO?nyW
z9Th231Vp8c1yDgpVHEWpoYA@WefQn>-p%(VIXU_FYJ07<_t|Tu+gh7~IYc-Z7#P6j
zW>`Dm`zG+7U}ptB8<wih17AldX0G8344nLjZ$^gV5*PymOQpYqON5J+r4BJ9NQK}X
z;^m_f6GQ>f3=FykF%$wZ&?f@!<>TictcQ5l*^7Ytd+Q;bHLZ|V6pRna-z+Z7$3D*5
zffyG^)b>Ug=)-kmbN~WDJ`n_XOb|IZTqi~k@q?}oaD8}N6#@SNi3rp~7#%W%yI9%6
zF(F|-a7`60Wg<!g4L`1}g3{7Js%ssCt07U^sz|gdN?jR=(m`tJXdZ|E^FjdJ!n}QT
z?6A0hcmcok5Tu9*ijJykbab>zw7N=2n4c<2TN|LErmCi<3?P)lV}m0IG0MT=(myF+
zeZq-h{*(y+kYM;BMS@pIWP~09ko0dAf+)Yp28aJ+Cct2-F$9V#N(FhS(hs0F@fVH~
z8AkrW+?%NCL-q;s362N{u&7^H3MnKaB%BoTe<1zq@BhRAFs+r<FCPD;EI~oPScFHI
zL;-62W03z69qtfI@lmz&2@i=3Bl?&`0b)uYYD3Y%g!vF6Lc$zELdZWS%J!$oa5X?{
zxV#mC=pTHjgu;Iq;)5kb_~;>kdDBov0+XigfYQ`a*VNHeQ$lL%Ad!DVtwOy0ePe$@
z)sV_aHD%Os2h?#L6j}$R^`D@C(|8ji2>(~GH&MqoBrJ#ksO%p^@bgin1p6W2zYM8^
z2_c7s0gM6Z)c@msa}35dEX3EJ4EzypXKD;LH^FG3w6(O9)l^VF#I>^0F%J%pAOsVA
z%&~e1z&tAc{@yy8-d<>;hPJk{rkAFVvW5nlsEpP;j#BpVB6w+P5YSo#0^#R)YzQ&(
z&<TEy_x}GJZxiMZ1R;U^Kc)i&%fF`hNyP}zC>)sO@P9(dnBe!%71>|^P|ZUzf#}h|
zYU50dv~gGz%0%1PL<56CVzkw@G_}>V)YNrV4`T)x0RQ{yZz8JyJ+~j8tYhYX$UXKS
zp7uVWzqrGHIIj+Yco>v=2;!kP`gkM$x$XZyo{hiBMw5I1qW_JL{tXKc@r{Tkg!vfx
z0W<gi5Cy6~P4KrSs{gx^KMeIBlFd&zkiiZwf2B^~$FJn;6AWbBFd((+NMR%x802r5
zV~reQ7~k}>6?ynjkt=&A_N=Ysx_RB?8I5_c*y<(?L0dyCV_{{c1w&|x$pzkggyI&*
zK$F05D;2?xfS1X`8E<0fj1V{DxGR>uFVB6S$k`)sUA$*?V|;lJjKcZ&=$Vw)*0Pxw
z6n=!KH#JGf;GO1^WbWUO%fq_5^86;Rv}FVVKxWUHk{u*34|@KI5qxhpwCsJ7<MpSs
zF<V1U5u{{Q&#@N;h<dWQsHbU`q4)@qEo+3=M9MKSHil_(?Z_+<dcFU|{bxsqV3A5U
zKPTj_GSt%EG+evj)b}KYX$B?!0m%c_`E!t$tN*i$WJROY`)`ZhmLr`-X(v8Lp>7LE
zjnLht<~YFv!D!(V#Dcx?QU0Q|vyJRQBpiS7ROMMgx)Hb<Pi0&XV)N8xJv+&zoAO{6
z34ImhWvyVGg>N^mz6?vaMnU&vba7wY)p<MoZs(3BQBN%We4}vNOj&|bDF5{VM7Pnn
zf=L=`)5)xEeSXj{l=sujs={)j(5`8VOJ_BOy=|my!IgHFaw52|bKd8tSgkoCIpI5@
z<U4~Q6!7U0u3PlsSgNA;r8D4fsb_GqA}Pwd^=LQRV+z~ED0!>A$UcLYI9r$JHcC#o
z7|Qy-i28ipYaAP39!pLJ>GPtMrxFsJ$jL()=156SJXH+3_FVn@OJ#uwSz11t)6`Rd
zV_)h{--&tIfBD1Gh!lxbK-ARC>6=PtSvDIubGS65FpP|h*>uAOFOXY4Mz)+=klr66
zom(NngFA^&YNoJ94TzOwo*|Y+{;M`q&Jgo<N-UbEci7V7FH28OF$gR{P6NL0$7n@2
zUehz$E8k<*kS>KxpG8zpNq+25R%7YSzT_pNpA?Q_=2;6nu(lBjx8U>2x+`d>x4?b?
zGkr~AQR&w>Sv{~zJ<lZS#Q;Toh)>5_7j~8Srk8Zz(ucRE&+=Z;!QZmv))rSYQY00U
z@`_YnTE$M@Kd_oGj;%^`s!F6|GMKfwhIG49zDW1x9Gfq++5wl;4u0Gh@qJzOYmR9;
z9G3|&i2?tZf#0<H*h{W7q;S`b9W-}YIfy8PB*)!AO|l(B-WO}FymwYzjj6c--o(zb
zkr!tJX7!?Y>X8$yi~}$aS+Dx!z2y4HR(N{et4*$+gI(t)9jm0c`(-RdI%Mm9%&81L
zq|oh^I6eGNZ~2HE3`JS@S)NLM5b?)UUno_%k>Sb(D3{%;tz(<kgVob&BTD%S`Ik|1
zXK`NatmPLx8D6YV$MUHh8f7eCdhYnB*s(`tk|UmEPp*;F_N>r~fO--N-|rBlgO!10
z2~kWp?u~u88>ZNklD{uJF+kQc|HT^qWzCM9c{Nl;&i&D4CU@ebVJc3B-7F8LiZ*F}
zqbCym$=S01NxmEx=XOF6QX~llpW<ny4|rM*qzhlLp<_6grV@QMJW)^+-!(_w+}qN8
zgAD{vu}_@!3j@td2bK}HL7*^FKkxXka=ucz3YqqSg1$cL-{EY-_iLVqoOjNop@p8C
z)=X#(vK+ZuCISZXf`5WVXLWSW@vLya+HmKaeA;B{d5|O*mx(42sa(Qp-f8rHnUWF|
zs*GD01Oh>1%pyoe{KY6i9-KtlxM`{t#f8*n8Z&43-2P24OSAGL0*oU@{H1r7uX*8q
zbO|k?e$7JfU)S~d8p>!r_+ek<?erp2Ol04p^awx}!Zi1}VR2#yyF7Dar+tipEV{sS
zme_4riNRvAv#oBH1IbzGM<UH4Rex+U*M1-S8Y8A^Qq5%Qc?0>7yQh9SsJN?wTLDx}
zvD&yaMn1X3V=&UzA>c=BY*hd<-j94XUykqKX7fVi402r)hwPI*O~-MDhKT{A{yQxE
z>-ulgbhE(}+Z7Bo2%qkI^OB9S9Km>GC|T#Glcj7mQq*RZn)Sps<tvCS?vcvs<HQFo
z@?&{ku<OHr<oBAMgr(eAXIM^I-?`H&`-|ak4@1?X`t~R&s6zEH%aP79j?4&ldQ;>0
z+&7WE=pf6k94n?9oZA^6`KA-cGpdGVEXRt9Y-zLi?^UpZi&CFRAIH64kfwOW+?P|a
zrDQ^{M14hRzxQ4FBK%NCG@*INN|!dcQ`{=`i(%rm9U!9%cVO{?pZXV%ILenM2o$nD
z&>r!=+@VwRUVeVGk;=sMHLomz^vA3hM9$mNl8y<OGqa@%sPANsb?4*GNnvRzPqKHw
zR;Mqmy%`%blz2WF!~0O@3u}DZalofqDu+w#l3^9WDYGJ4672-}oY9bosQ8t%K3%Lh
zBH-NYvF~qF_xXC$vIg)}42Wqei!}GIV%3*RStm_{ha{y%SBH?#dsa`B*I1@2r?Pw|
z$OLDV2q~|UPSIk~FdLVPKhs43c!~3Pxya~Bl!++YL|-t~_nrBM<K3Y%>*jZ|=1vdZ
zX1W0;r~2M>>i*>=b^3E=yYhE(EOWLc(f1y@i3J&w@JSX}UE#k_&(d_X*?WyS^|RUP
z6n^FA)a}&tSGngyZ<LGOIk~_R-hF$7c8ro8xE>WRxd^8yeq!I4B7gi>kIh1iEOe!E
zOf&x*TCXek@lJj9QzavQtv<~DUe;eaUxb!3htUi??)-oj5WPXI4i*Ld>@NaA=^sER
zyzcD%`9V|l_tDp(Cweo_$x$Lb-x+53cH3mg&8{W)Ia0HC-*j9#GjdkofEMr-J3c7a
zAw{sc_LOELJ*d3k!~^+}wQCk(%hc6<jkov~srW)9ER&b_Pv<|x_J-6wAm$X@iZm5u
z7l`}i!t=EO$A;<=k4^N`LS)-T*D@2M=cLP_Hzs4;{l2X26(!}aI@Z_&>B{Sk2vxL!
zC1+4CBdh~SfJ3F=^|)vCUp213-X8O%K7equw;<-)HOjb;vh`d<YVZ894WI0^uM=l(
z@j^~m(jP5$qq&I`CfqAVNT3bNouQbL1oy}&YfnFoSGGP`PJ3UB4w7pSXIWIZ$vJV@
z^EQS`ZoB3Oe(+)cMRfG=)wu<HB95GOMrQj?vwJ9LWZlBS<pCscl81s;>5t67t+w<X
zW#WvaH&vy4d-Wt#=(vd-bB`q5D6@$Rydd0bwg7#eakW$VTfbo^r+g_yNG9viVq^z1
zZJlktX=o`F(vy02N7<xs|MY+}C^M3doY%b&=G4~8Chf<pFJzXlxK%4W7>XY-W%|x{
zJd$`&F{BS^@s#hmY+KbFvMO;7eAG1)68P*{2PkAkzC}SteTNZ9B87G1AI|#uK8XQ+
z&)@mokg=*smPLagKf!rUkzyjY`EnPk`6<7YQL<0i=x7j{BV>hRJ4o5Q)>S%G)=n%%
zJ0pi(OxPtML2=7<Mecdllj4k%ptD4jn$Jo8sf@G>hg5vTR`zzISw)okL1KL9W3Rlq
zbBr^TP><a5T*4s-Y;FC_y0spHJutLvgA1)I9@;s)xY$;SQ?cHsl=9(S6*zQCg!heC
zZif~bj2f6{2{yovvgGhMD8#||8^H0&Ln4=4!u4rHit-(NMBIuymE-1E#lzN#$*7O=
zJy#o!78felbMf6~<^~`5Eib>>Z4V&JU|1%&N+cq}z;}kH(enTS^^uj{U1n>$7Sojv
zRN=8a%(J~yA_iOf0B0mr$sNz)jn->$U+L;d`r=V{BS6@9?E_UW(b{@oy#wU#k_4$a
zBjGGP{4!r*iKQ-$o&H|7H_h*_^BY@KX(n*meJ7k~btvBRc3<?GY4@7lT$oymm(VpI
zw1~nT<7XnjxqOxLlsqu#qQ6?F@`J!S4o{wT@0!L#v=u3qr7ZZx>Z#Ok9dIP_{hRGG
z%9Oht8Y{_tqe<44EA9(y{Iya)cCM|EwxO9Akfc%dQ<nqX-3v>$fyoMQqm8xZ_xpH2
zj4XQ2zv3ybC!i}$)puLC_}uYx4m$~0+Pd0lyMn<pD2er*3_-zgi+q>v2@F`pu=*+G
zR6(ApsN&R0?<s*%k*sE>BOLdgXuiN24cZ$K=}mX8ZoCe9zkk~Jf{B8PA$X#hRmSN?
z(yr^Nv`&FHqOeTgjXd;2!NuEMyxIl?`K5w7>+A&sisef0nwH$}*z6KHav~=rvAmNa
zrJsqZ^-Z56B2@-YqR-$B#Kh>2%kI+-WKVCmqct1&iwo<5`Rew=JZXI<i_^X*ECiv%
z3nc;(VG^hNZo$Z!7PS(ip7sa4${7>j?KCF`5mM#W0n+J-xG5_zR6(J7_Z?L@QE5Hb
zM{DX1%X;K|>i53N{jNFr#?9=$_E3ZPN{_yDYA!1j0q>X+46T(rrzu5qSS+4RY}|j`
zR~Je@;c?sX7H%7YR(ZAIx6e7z&t7BhHFtu4F!WM+nhl#sB)ze-b3HUTw<Nzo9AF7n
zMr$>kU8yEt0O#0ISuNSO#UsL?sjHTU!<KlDu3H~?Oyj9iW_YT$N|@`m-;KV064tg&
z>n6SLF;gbx{K1_PD{uP1Tb;9F(QDphlBQX$n_q><QR$iB<L9J-C$bdPzZ?%5e%}v+
zV=Bo(0sX#cEed9NL43ES7@s=`>Xg4vQL7HknS(cOW{vn!_@6mM7#ka=DvDm&c8}-R
zMm1==71jmuDWlaIwBug}LL{eDRuYq~1iRC(Qe<%M!;qQ@fBLYiS*xhf0!Z1+b_eY2
zcNLaI1O?rX%Mf4+jT_)>9AMf-I99iM61RB|Fd5CZnKQLs>5fELPjY&UV<*SC<5N5=
z4#My9_hl~(HXiwkx1GPJv7WSVyHecId;HDOTo$xG(s;V2C{2}6<S5@5P?GfxZ8QA>
zmg=-Iz0LKwx=}C6R6Vijy3EX~%Xt6!UBukydksLc0OtMkx_6DO*B{`K-J;}sOW6ZF
z5Jf(`e@U;-0%yKG|7U5(dHz<<$9-i~(X~&{GE4*d$z(xT6-iBQHHND#L&oXZH(0i0
zscUC8lGTcx^ggI}?DL{RgPvQ#M{gD}v7)3W=fs(mhhXGVy0AeXNz7BwytZp*m-Vev
zgq<-HsQS&T>oIwcLoMLB^xC6=BcITUJG72#RiP!T^uBxP)^A5d(Zh<rxoAuF-RXd2
zF9oH8^AScDXO`)YtQT18?$5K-p=BC)C;uu7XjLO8D+_9_DQ1n5Y7D*p5K9`~uPg5c
ziI#y2M`951%bEG>{19(o2uoIfKlSSRgzwTxPMlY6=|$1JwPq*kP{tNb)e}<bf1H8F
z21StCZ#*B#ZyWwZvTwVS#*UUpdQ99z8*zt+QalsNt74c(;UTiJPRq|=i4O#VlK9N<
zDKD?RP!PLln`yat_ona(LT;bcr^lY04`FG_k)O_!Y2tM^hcZq`H1BqlS1<|cFn{Sh
z5loQRPw@5GDo;ydsvlCcKd52W7K28-Kdzh0e~4a$Ne)V)PIkTlonS7`^SrLwA^k!O
z2Fn0A&=YoDc%nxJ9Ym@a-PzhWzLgzmUt!>Cf<TmBFulrs?l07!nOdF@aP=%a-cFsH
zU7(<@h69$B%Oa6;^=c5CAS|bjSKuqRs8?5Eo(pP}z$zDTc{H8MDkHz2);T9kn+Eh&
z2^{Vr4TbN@Xp#nZsa@qScVxI*A&>|42KtGj0<C3^Gz-h@GoQ|Re>ap>^Vw<w;n<?M
zm&Nz&0`<PyQXTx-*O3k`M(Ka-h0d-9o0ziAn`R72NVHyyUr?VaCwmCtsY%FTO7tk^
zK=!@eMv~FdJue1*5{vAm=hureZ@1R;TaQU0T5}C*wDgg@SDK!cf}gN_SBja>VNLB?
z>ia}@`19Da0jiU&*I%=%aNR87rJyV(rp$cj!0Oy9B8!}YY4_ujw6aDn#motTQ44S}
zu?0iC^xM(v^ac>*fgiKhphpG=$;7ZwN+PH8HSG<P^8L7rpid`@#A-IqFMNh&ls0!Z
zDB)Zf)Bk9$=WbWh(cHZN(KxY0L@h`)=yL#IfzDD9{&hcHfmmdd>C`<L4MLY-o{PTZ
z=#!!vI+Rg+{G-&Q7Z28_+bV+qOL`d;@Y2?g*2ishlye8f-2#H#s_C2W5YKFRqTg`D
zEg$A%v5XTPVX*`7sqqU6JGkY=jeRK_lNZ=|``J`lV~t>*{L?5{(&ZM;1xC@*gf4Nb
zrox9PfvTowbnuC?(?|m@lwt$Xv$OQ#QIx=zyLI}bY@@{9Kxf)Ih%>KrIOlpgnID$s
z;2JWU5d>lkUpEg+1VLYKqh<;24;1is#ZjC*fkL)rn3N$6ntNL4SiwgpKFtN~otC<X
z+0!LsIe^7=pq{1xwwPIRxF&7sR+^3j`?ItP<&jTRC!cOt?h~tX=ml%S@pUFsw(5va
zyituMkX!eNO3U@H9#E-cc}tT@sjiaJc?w$(5pCESMV{d#UBOs{T}AU~qdMe)RK14u
zv?PzbNES0=P}E*xNf48^K*2{}1sp3YRwQd@*HGdi`ow42%SKeHXAVTx;sc*JR6YPV
zRW@g+YSLy@UfZtZsmH}(iL#zL!^m>2J6n6<S(sUY@7ZG`$KH&vembIoxP9M}*y<(i
zbKVFmh$9Awy<F`mGta*qsl^}OSocSs{6jO#!4pg1A$Ea0^+z?KeoQFcJjE?eJ97G8
zid~fh?rC&<3omD5;U9VJWX6geR=1XuctgV!oqCaK?m-|o3*B7cXl`(Z1#nfP1aooU
zk({FL-041|S&c;%bSqk^$Amj13B;7Iu*IoHhLJ{;K4}Wpmzw*jdchP6<U<xyi2{`h
zpDjwkjNp+gLc-z&AEo%_V0<xhIqkehpeENW`){LQ%?0p~#m`c?mj$v7v56@ot_ga;
z-c<>q*eF#g;-wGr-Q14k>Ngy>OB`x)e6^ERp2*FZ8AM{#;_$xz`L}>9!-_6FrnAgB
z>^iahNw&AKu@BmMxYds-7*!CUUIJ=9=S@-rxcawHXhhy>cAsj+g`!+gsuKQLQ&6@R
z*2Id0OJw<c56O;qJ@eb3?YKtY88EN1n!R68Q99nDpq+fRRH7=%-BZs2p;}b)h}QwG
zxOLKwYd$#b<r+!Xk2=9ol=K59-N;ZC#m1^Nq`Lt|D$NT+#-stH8W-0F@me%k$hN*&
zYkZI*d*8jSzlf&wrZ^u#IzD^uE0<wPQ;*yr!-iv#U#XbLF@OD3ML@PWf|lL8<739H
zn|U+s%mNW<pDWYcHX3Z}I5b@C^imb@UW?Tzp6M@Or+S=nSlZ_tr`lX1s4(sG^)wL~
zdamQ9boMj^N-TxQUaA9yN7msmwYEtmJ+}laLaj?7S9*?OG$FGO+_P9u1{hugK*}^$
zkDA%E02zQ(e2mx$Zw>hEkZN2aE?rK;-HtK#P;O?cyO(BCIhfC%%wXL2gwyCD77-+V
znXzM4;6jT6=VDfm2Z2Tgv#&)(Y?DB31FB3j_!N-c>?=_aWMc}!o_47KfiLg!ahK#&
zw$h9j|6TgG*H0k_8mk9cC~7yz)b~JfwI!<?<j&G_@wL70tEqBKqUAJ*T#b!YQj*_#
z07BT+V4pQvjT(A9m|f?j+B0ST84vD|FH1=1m9ZSXb%f>SKBnA;eQe!cxW3ew=5!4_
z;2?Wn$;!avq+=Q1N7B@BjWQ0^)vf#wAjT`);LoWE2?FWzxg>LKZ;Jw#HZIM(^K!Xb
z*z+e7S-W`e@&2jD$bxmqtj7DB$F>~K$*otn1M3t`f)eQ={==k$USOp-Z(oVAE|@9g
z5GasuBnQE&13!NDpHCJrdXCS&yc?45EAzS1*PHHWn-p+zlNNVqMPDu>!#^jXuOy2#
zs`5A85$|=F&)X;Z-h5T>$g*^-$^fbe%<U!$rv2`?^EFoR7;nKxS;lNLd<`C4eXNR`
zvk+kP0mUr1<S0#}KRv~y+y-OuId7H7D&QS}=`J>OY)I}es==oFTunC`^N)7k5O+Y3
zG+i#TkTACMmu2XtnQ^VYHAaOKib&?>LLf*h%eb}QRId1wlN0Vv`Nrc!3O=HM;4B`0
z{K|^aO6LI)<|_|q-<`(6Y$A<<XpcAdfm%EhntEjVy;@vW^3jjKIC{ze7_Y_3Eu;lr
zd2@<~$;vtXcXl8=K`+YfnyIklt_fD@+{HsPYl%lW6kxC!@s%QJuk*34XZWTvuE6-9
zOS%oQr8qxPBID+vieP!q+VaJ**S0U;v92o1-2a@B0JR*Y*k|{dIc$>c#|MpNEsi}Q
zkN3%CsN}YI@+Atht|@O6d=zA?i(zBZCBRwX_07sCwhuq-wF^mAxG#;sWcv<cnuUSI
zK=25ZNVvJw{GM(&wK!jtqy<oOAL1fsS-eq1v46!AsneD20#|ZNntI^<qWSSfLPBSi
z-($UVCU7fO52WzLR~7_BN$tGq`K1rZMBP9>U+LSms$&F>fNq~b<a4@VWN9ghfptaj
z5c_gUQo8l5LRiR6$is50!7V7kNd`chAq6uJo^JWZiibzENu&~*{>XDK?%hP1;Wa^s
z)GNO5N-rLtZjZ#_B5{AMhw7-0@uI*PU9%YE)|K?(g_G09;_vBU?Lo#BFM&1a&HET3
zb)<e*aDATymE&4a(s9%zuv%0mIPdV8d>6lxn^vOGru8^8---EfaeIgJbt5;XZ{l+;
z{W@0^yf0zOHH6;|!I<B?ryI|zsB7tZ@jc4|>=~sh6>{m`uBMIY_3WEEPndFDfu&e4
ziEqKGGwwjmE;EsIzP)<b+d*;bp`C6Lb(P>wBauBzfn!;?ZjiRD#h#+tcDYAJ^i-NF
zY(sOfC6<-X$Tg(Elks%=cvf^A>V4SF(|(<$5|f8ZywynH0&e;$X*dqHDJ;n~8HZAn
zOb2!Zkc-lF#bk2EM<nx=iKu~7mhHe&95~3i4`U_mkvIHjiI?O~qzYLLS^^T|Vl79E
zC;fM_KpZ+XeQ#rCIn0jTIMK+L`l?nkpz)R{*9bActLd2>EhR?F?hn`S)}o{o9ns_<
z%H_ii&)zFaLwSu_Kpr7)l<e0?1D2wouoxlLihCguLD91-N0i`==X_Tq#popHH>f%9
zc&q#Vwae1>_^R6D_XrTTai>*nk0+A3UY8E3ee4kLBost_2$g&`EKp@ND5DJUEURt5
zQjq^w#jNf-=gjjvyi2tSL+`(crh1i>8<@xuwTi#yJ{;8GDF*|FvQ2rsQ*628d}aL0
zn}qBgKPCCbgSUoypX?p_R?Mt!%0ai^`A?cu0?v2bY{%03`s=0T%D^w>5*OMNArC@O
zZ%6SNh|{AI)N7!#seyt!hBqx1@2Zrt@V9n~b4I>_FK1~16us^Y%5T?ur1pAAyznd<
z&E}k07Wc<mFW#+%sG6QmV}87~6ty7S?s6nu@B<pUZe}ux{U&j*V$o7EigtMy^8Wt3
z&yjD5tdnWiXIm#%f^-S8GEU=HJNR!5v779fKnZ+poCe1oHYdyglGUJQ%9%fVgR$Lv
zHN#~^X)I30Uc+C-26q`vc%(3i@e<*l9na6_zaCR^7jpEp+Xw<DexGg)U4R-i{{~Td
z%Q!w*l_9cwdyK(*-?PIl^Hm7lw(ZUlQor8PQ~5ae$JRsMx<Q8zGhPRvP6GcMHQn4{
z_Jx6KQG3PDy=SHIZ7Nm$6)^~{lLx0Bv##5o%1taRaM6BDWYDj8)i_3WkaF|>Lg^8X
zk+-`=_Q)?~iN@OHj_H;LnwE<kcVU4jy+r9I)|Wa>+o+$;)D?A|d^1wKE<`c{6f1>X
z47HK@j4I!Iu!=qqwyy)F7xM4kfMtIb?9Tb!%r@xG`9Ysb6A9y6P1jZ6Ky71OT8%$4
zNa!59LF3`m=hGN|zf!l(#iDFwra`8&DL0lz#GJh~5b|61s&`>>BMuaW;)pj}F`!&G
z6NplX{+&UI1?%Y>(wvd<MZxDf`rHATD{60Zr0v_we2@vAZGE_dI+ZO~W9Bv2A(k0>
zr~GoL2adS$bPV0w(*5|Wj2dUGj~*T@hkKijkI0vwYn?$#_BL_II%R8jK-oOA%Kb?=
zan_=jgR5VBSD%@I%Ylb(n(u)`Rk~XH<`TPD(t|0Iphc~Y0Zv*4XWi+%`#k>)E?(rX
zz%Hk{Ctp?GLlp}@$~bnYzqdR#_B${BaZkF|!MNfjm&j**?{*Z(wXd`fSoYS1uVf$G
zj+<`HXEt)Rv86`uG@EVeu<&dyQN(CBJg++*YYe!S>wAidb!JUDdtPICBR78(e~TQ%
zIkxVcAKjJy&h74p>BR4CA~H^O?V;NGsZS&S$R5++pN$>V%$M6Jth3UL5xbDVEVLHn
z@dPpo)IFO4Xt$&%R0Y>?vmL20p`lR{9JX-*QFwp;636&(uDZxF?S}i^cPpBwh??fL
zam}GBpZd}-`6d{^go5ACj6JulAP0@D_aao?;AqF$>Oi&?`I2l_;1uU$heZ9_bK6@=
zEaVqYQj6Z*&oTkL_+kL^NHq5Q7J2%^-AgOybkp4HaKO2il=Y}f3DMt9bwR6SQ}&eb
zJ!yG&enljc!8j?D^G;*LnSq#+^x1#{m-F9}MR&eaN@Y!Mrp5cz);xv%6@Jrcar4s5
zs)2M!oZuNu&7JJQ+)!<a#^RJ8#SDuDh|T(ubIeuc%tsJmi8?%)QIRGCP||$!+^;&x
z(<w=V%u`VJQ2Dnl5yy$n+X=rrIUJsue~e>!K5%`%dO}SguiSBVCEV>{Xt1}0VqqP(
zW{0S=$@eYYW&hXuDT5S_7j8_Dn&*G)bE*u%PR?vQrW3m*v<)7mmNYq5iA=7RXF(sY
z(=G+;9WXy$=b6tN+H~%_j8A_KZ`8<KCN!w)!v4a`00n$U`iRE46T}|29l;jYyASdQ
zAM@5prE9JWmSlNQ3g2QcFWh$w&NwAf1!Sa*4Ejh!iD2xEz&Son<)`gC3MC1y^QA+@
z;o|X0s%s}N$zif*$lJcX*#{zp_njPMp@109>nHZPDqZd}g-XRIJgFn3YaSi!T{StC
z^YoZi<*?ysb!5d2?`2pOwwxU6P%0sWm1tzRF=~G)nDbOFTj-ruc%yH3W<8v?g&O}2
z1X9b~)sBt+%V^_rzT!q<VL2-&C2Hh+XyeL<{mff6Bau2KX}*C*UJpAZ`H>=zD~$af
zn(^_r27C~f*4=nNR*#6?C{VV-YQ9)Ik#9Oa=x1`_QTKygDY0yY`QL_?cAs|$d|5?Y
z(_Hb8(eZ|gtWh+BLtQt@&6E@iB5y$_O?xiwQc6;Yl+L$Sed+tG-^j`qwR(OlJo~IU
zj~B(pP0BI8ml7*JMkigBHprN*uyDn5&&7zm#GXciX{(cWqv0yU7gk3P>jyKbs_RD%
zxNgiYo&XLG3@goVRXF?(Y*fyqTVf2D&$~+$cCeh8h?$v5wDJ7yZT9HH4$j+KKq2Ju
zv2)P+HJ$C6W-VrBaRkSN){y_{?9B7h>%o6wruMK7Wr7A7r+%A$!GkvYv*c}1rsysr
z$D~FA-uS6I1B36gLL2+B95YTV#Y9}`N*e!kCtO`6SHL#CG{np{(^>j?)`8BWZLj{9
zNRPcweIBGCsiHcX*`HjK>lepXaoZL0YvL_ZAFhuxZEhoqUoDNbtDVLPD*kzzaZYDh
zL|gB@?Kw8nwX5a0r%y!MO9gNAap{?rzl?#g5#)kLMg>i<<0cs;+|y4K#pwf!5>0*n
z`QOtu%6p$3&2{Ta{D63#-L+-2AavZVO*~Wyx>gb6!E^DIt3;m>Y2+c=&3W@{vzCyB
zSitG7Q5%Gx@3Lf-@w2<Cr6SoKD(^#tqlXt0XLc02$cvvwZcJw|?Pf^GPk+#*Che%i
zXNS1hHFNVZGG6%-%G~n;1@0049ZnQcv`rtnE1PQ}{x<uZ-g*=4A?2cH$g~fsm2A2a
z)s>RFs;TEt?iUC7vZj5&D^zCfr|<$kvuJ!OBS@q3UY&^e<=u+0ExMtBOk5ksY?<&y
zip56l*v$2z+dKZ#Cod`YD|GPjtW?CD<bnREv;|Jb?Q3%nd7vfK3##uQ#f}C<c9c=S
z?yUC3IFui`B50p!UX*uO9<M6AXbSdS!7q#c<u3DqIi4CgP1k7MNA)D%SQF52b^le-
zRNl(v3{{j{k65k{a7;@~Wb&3<@%-9I^fcHOh9wK|@m+cJt2kR7!N_<71gcznJBG;@
zYQ38EAXKzc>8aMC%Zu*wmH%7bj!Uaw<G_|=zN>JIt_EuKDI(g$mi;!8q+qH@x*q6z
zq7~??Z3Tu=LCvG)SEcz8i_Dl*t^k-mdNKd3^rRPcI0kfiEq=WDT+V<GeE`*AWyAZc
zfncnsL*U7pZ%O98OO<XkUkCWKl)CXVVYlsL&9_S*eO}OPkk;bh8b$tTnkt~6=1uR%
zptXr!#^P$sGG=*jny%XTpxAguSL*0a%uVyu+q>-XR8!^NkD+qbgXfD9ggy%VtjEp`
zW&u@mknfuD0oFMTXzVa7$E0$!l+GWO9dRQ?izSx;$If7;3M51tghBCsMT%V*H5a}J
z*_=v~)9^yQAgK77_<F`|1X<49NnqPaQ?&69<$=1OOjpFV6W*<yCCyzN`lpKRz!NDD
zpI8>detSjXq&*c&;}RqpfkB&dn;}X;tbw~n#1gD*(@WfD%S8(5IO$5l2^slPa1hV}
zAu_Fqk-k3o9A$n>fuk}5N;j+#Y-Eg2wpooW$@uaS`%9Um?7mz3G659Xi4onC_9+66
zBwQW$$5%9vTb{kNYW*B#`q_f8D3LuN-*ion@1aZb??vhDD8c%%E2+>b=o>}6A(q8W
zIadk|eU4$gyk@Mi`Ky;EK)gX|VxTOB<K?=Rz%eVqCEFC;&1p$MJnq;QM4XMG1fN3r
z9$<Z`50ii$bsWmTe87PkA{Rs9jvA=zfaSh=eORLI9;`rf(WF;=Er*1TS#hdql$q0@
z*g%{p0>NRi%VIh7kR2^XTjT3C`@8Ro$htbSuadeZd?4_cSmtviO$W%l&-n99u^F%Q
zjzGM}YB`uf1+0g1iZVmiamN}|(zS1~qi|0-sv;c(dy@GZq+hHlE+-33Rr^&BX`#iA
z5@6T+Cn;dJ+RR^3BJNDJSwo(K9tj@Qi(#<Y5*{IhY|}7#tE>l%?d1>e9(J<*=<A5f
z4@EPa8GwxsxyLX>ui<Ci)i)cI^i#VV`EYBRr?S&y+(LeJ!F1aykF3q?GtXnd)jP+&
zCDL|5&~ipAl95Akg5qqcB&(O`cIx>CCby~N=v~w0w98ZU_Fuy5dnz4pMvXuhKwDc=
zsgHM9D~a4Mh$xZi46y*<w1R5@S(`h(ASS3|IVxb;f3br{b?ePfeX4V-hM)_~qF&+T
z)a(ZR)N<TjF;Zw|7kYX$Fh+C+$x`?Ex1UXCiuP2u*-}WM*IP%Rd(X*iI>Sk$j4$Z(
p-5&r4r+NGTqVMm&X%2k<olzbfBN#TL0Y7XZH#f1y-ZAz}{9hurv2FkW

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-grapes-overlay@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-grapes-overlay@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..4233d9bb6e6aa88c7da5c1998439789cc5f9c7b2
GIT binary patch
literal 38217
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-grapes@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-grapes@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..043bfbfae1a77317aec68051b2d917a42d143fb1
GIT binary patch
literal 13140
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
R|M{Pbx-w?>O~E?q{{RqUO*sGn

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-orange-overlay@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-orange-overlay@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..4233d9bb6e6aa88c7da5c1998439789cc5f9c7b2
GIT binary patch
literal 38217
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-orange@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-orange@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..043bfbfae1a77317aec68051b2d917a42d143fb1
GIT binary patch
literal 13140
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
R|M{Pbx-w?>O~E?q{{RqUO*sGn

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-pear-overlay@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-pear-overlay@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..4233d9bb6e6aa88c7da5c1998439789cc5f9c7b2
GIT binary patch
literal 38217
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-pear@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/metrics-skin/fruit-pear@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..043bfbfae1a77317aec68051b2d917a42d143fb1
GIT binary patch
literal 13140
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
R|M{Pbx-w?>O~E?q{{RqUO*sGn

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-apple-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-apple-overlay.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d9608cfc9ba4157de11450e29d1124bdc93255c
GIT binary patch
literal 5035
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-apple.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-apple.png
new file mode 100644
index 0000000000000000000000000000000000000000..be1bda03836114f8aae20ded1598e00364e61792
GIT binary patch
literal 5083
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-drop.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-drop.png
new file mode 100644
index 0000000000000000000000000000000000000000..12c74f46e227957667386ef1fe1017c515778a28
GIT binary patch
literal 4203
zcmV-x5R~tUP)<h;3K|Lk000e1NJLTq002?|003tQ1ONa4Ig;HD00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU>{YgYYRCoc@
zmW6LSM-WEe-tB>zxy(%Bk{BxLA75r>2*-}$uA@&YUAeV?m^^)Z6MmY>WX*MWb9;Zb
zygMXaIHT}%K`um~>JCXdAd;XFL|xTG3Og-2u>{@QCn-S@8;RkGiHs70+)ivM2voAl
zEtYhK^hn95)1Xb$PEQnuyk*UjOP0opEgQ-1l#)W>R>*p&x+uXKZH7!)Fk@_WN*n~X
ztT^YGpZSFodtMqV)`oNq=?avaD;X3MnoM|zCwYuVxQ`y`AJ%5al_Y=QM~;kN#IdO_
zgX+$>>8g(K#FNnA9-ieD;~`h`<VK7G2##yDuC$(V#);{E$G66JRvmH5%Gj`$Y#}6i
zvm_%Da>hK*8@%ZTbvg{`(j>*>h%6<A=6%GkT(DH*%C)I}%~z)RgYlzet*?^ZiJKtm
zsg@>Xz>~c027MMx=+UA<PC|qy5<6BbIpf@N$}jw!o{Uzb@>$OLiSPM_uZ(Z`A@uc%
zZ4ia>CM=GTnAbzxUo*j(`8K7Pk!W|kCBhln53X2h-rt+iul}@q*<C-%m3e<^d|`aa
zk6Nx(82;{X(I6?!n1*S_x%5&aAv5f0NYdg!qlbbGORf76)>Cu(DLa|3=e%U*AM%0a
zQ@-Pf3w6{{9NJO;m%HW<|1!M<Q^OmPM4g3j>9puGQ&&&<)!e?~8-A%@KD2#+7kG!a
zd6!T4o@17*4j+6B5S%i`JjPQ=)TKi$bTJQ-k`1TVsfZeN+H@H+Wx|jK&aIof2e^+u
z4HCdfuF^YLGNr}6JWjnyR|C(bsDTH(QdKdkRpr#w*@-ct$<D3XCc2<ajTk6!mJ+Az
zD;YFB8GY_4<_T?D<fIZbD#=RD;&mF8Jels(K0`~+I$HM2`^~ye0vb082TB?-bw)f=
zBsJR9wc9~7C<<cbk3>fJED1Sv`bLMC%XB^FetJk#qNQ<wBtRruOtw=`OMjQr6jH1R
z{i_74XQC=qPrLMKQM&VbF=K%THbx=Q13DQXq02+ttf~7Z3us*kL#+e@k%)y;<%4cc
ziyj?PF8r#?J>=|kajKvDNminfrOtS_i0IL!F2&U1s}->rm7*g4PzO;m+D4tL=&Z?%
zhHiotJEPoJ(uG7?p9gnYn*l8iJpaqM<9|@BaFwi4(-m8AoEKwSY{M&3Y3?H_Q4!H%
zzMZCw=#fh^#Vg`3!>({biaNt*_1#VCIF8fph?Xv^rJcL|#|@FNf%7naXqpW&qgtKc
z+BXa5#?_q<KXDvrQrhxj`+b+08UOLi%zO`@W!`PWO`O=dd!*55qVXJe_A*psr{LPp
z{PgMty>bYcpk*z<V&792Jv%@@o$s^Bj0t11%2-#(sHHTd1CEQWZ4TL{ZIG^{n<6=u
zez&5jn@;?pU(fdGFlNAnMZ~Ojw~alQxK`X)<1#y}X}4~GdaSm^fa9QgOKj08w{BCT
zmt+Uj7$|1dh@OUpe<5AOh(|nJPW$a4`ATE;!_fedBB2mV$XE0Ou&ZoEH{+GY^z)q3
zXRKOA&;S`QbtQAgV+P~)kU2{=)kVw^4HCVg#E|n6zj@A8nc=_P&A-AkdJ^Y4N#$aY
z$mMgHdG)h{5t%*S5gpV(98&bm1EhTki5%A$Gv?vZQZdg36Yr9$l`O;`0|q%Grt$v*
zs6#4dAy?!jh*;`F9&m#`BL*Mj0Z-|Z31)P8fDD-0-4>jqeFQ!wEM2WSjB07q;yU{2
zmWy@S=l>Y+YC8Kok9fkE%w1j$>Dh`I%Xw{qY2`4k5#g^$PR6f@xvoNvoCO<PW<;Oc
z+sn_3niCe53AqR)AX+Yz7sqfo0}Lvbs2m^*S^~LXn`;c{bM`(y%RTzC67qkqhV&=<
z7))%L{uw6Q=5Qdmys)g7q>^^H##6@i>{Hz45d$)ft7;{Eo}MDzcEoYOsIP-2L@m`)
zVQ8|TEtrQK^Njnue1<zbv++j`B4h-FROVQ<1`Tv{c0>n^uu)HUb=`E78>`FbwAtjU
zB$LJ;<WoGLCoV6d%hOUXrZTNwPh{qjmUPeM?KG^hY?2{}nwrx?)od{rmtW-xZ@2R=
zaGxhkm`nKNRqn2n$`WO(!3JxZ76@TtN65kkOmCNpsqWTEbCZk~8S7l8M~|mRe2xb^
zXA+keWstf+xx@jx9d_y3L?X1y*d|LcMaiWeqGcke1t|-f<YeOVE1WW}O+G5gnKK!G
z5}z4S7PK<)+vghH9rkGJd?z|wE#kVyVfrig@VUGt88oRZQGP(u;ZwYyU2&e?xD-<F
zn9}8lt7&q`E-ghgOejSw#k8|pgcZc5V6KZM>u}5mxhiXP@AFEP)Y;?}u5>tHOQyOC
z8ONDwOah=GN)IQPmQdJ|rAn>A`?w(w)$XJO(sM$)9I?L59v!(ly1N=QY8X-Lf~k<I
z=N7v(;RYwt#_HutVoMRpVjR@cZMMYO^>R1+p3}Qn`3U8nF+H1fxWqbabIcK4b$Gdw
zs^b<%95&cxTXgqZQrc72DqT)cQcd;LCnTcfHc7%U*V&+9kBpG+?5iAYNM_8|hVHU5
z%xagb+4wz|3C3J3)2#|wqHfWKYh2fOb+$AhrfhJH6S{j`q9(VSDWc82ZOpJh(BA|=
z-*r-ixlJor$XT=gP_x#l;X{|nhV(}_8Th&*4Uyeuk7G_+HSK;<RfJrjm{Z6t^(WW0
z^vfq`+QFNJ<y;-LCSAHbPl~Htk!=qXnIz17x?JWx99@#ut8OlTbXC}>;pfr@VWxU^
zq%rai<Q9z>IOgnz<a+-<X&$nVjy1K|m4{fbOxcF3gQ=48sam#Si$iws_$CR?-sgmq
zE{AN<T**;T;oJ($FaiZoF&&TBAZ14$ua6}v*<_!qY;LhnM-gL8`*#-xEdR;xlHjeh
zDQuF0OT80HLyO$!D5>qRNyD8TQYnca7luuMf<z7tI`9wzeUip`4H2{%`boW7TI3%4
z?|gJoXD4C2i7Ni}&c|6iC(@!#YL9kzYuIdYz@;{uv^3%ZUcB+&zP>{9!?LH)&_6{b
z*VyHd?mC;=YGYe`Y3-=!N&S1(lC~&Wi%Qy5_o$X^vaYSx%^mVr0{PkdPfJhQC!m`|
zL?v|(XP2WUTXY<;I#Mr)w=5k9a8$(<vyZsnt-a(n8x1-%Rrb(5*!N)yT!~i;VM1Ke
zg-p>BGR>wNXo6i^my~u|Ck+`K`>uS@yMTE%P0rYNVpd*IXlaa`WjlYaIkvDVuc2j%
zm9ABSRV(SMamsrHFE`RjoP08s#OgA(NdV<5O*avn{Y!>QR9MkWNu6UBNcGX&BPl7*
znG_)g^$5__h~W-yg}Gd3nPR!+8)3{?APZNr^wxS4H~xxU^<@NH0nJ54(NUTr1wAwm
zPE>NKCjVX$95{BRj%qlbpG8HjcrwT-bI3Slz+C8wGjnYs6z+_uT}dZWs|c6SQwB9%
zMQx8W7Dz2mAKmtd`8m0=SYqW-UL{wqE@fJVmP~ZCn|3||m!XGNlSpaV$h#ngT;ere
zc`lG<t38|_0k~o{P8ps7I;KDt3OP}wVs@^OEy+nPjn_d{*Vvu{L=3RtR7dmk0&S0T
z3~?$OGAww=Q;{^d+xEdm3>VB4Q_LK%hnp)J%+>bqSK!nXQ2{e~VkVomGdSY`r_AIs
zAG-xol^in4bt76#F!k0pqZUBh)GR_0D^4P!ioWjlK*`W!%2<5N9qw{UMgb1#k)1K1
zS4elC38Ef#5*GM=Y!05j59yRR4Kp1VC5V~A$v~};=P>6c_Ze9$D^s$^DfzfQ6o+T#
za&x+3mhQefAP(w*B8S<++oC&L2AK?=a+@c%3lWvnZO=2FFg)MxGhv;U=xLkq4u|h3
zc$TN66ZbA#wbXFbW~7dus*>WnAtQ2lgIhcoeM)oY1sQ!F@F3ehV<06WGpiO@S=vHf
zj%8dkmbXWBw3-ErcxtMEavn3}9QwS;ZP^<uqLRKDKjc2QiVyaaQ?^+XEi=*4K^!58
zkpB0eq(f!~DR6og9c3Kk4PNJAEXPqu-}IdDh@12#J7)}8*SZT&5tKrjQLbd{a)Og5
zf;p0EP{zE%+t?l>rS6uV@+r4?d+`FYFL~Z`-MCu;vRP8ye;W%J^a_jYmC<FUh>9sT
zX26g+yv8fsllXCGhcYl*j;(RXdza}NT`bRAhY%jI>$W4dLjCk{#Wfr=V#EY3T<=r#
z`7S?`yric5-n9&@$u`&X-9$>j5-~`ERv46{#W6+92EWXDMICzuaxCWor#xr2<d=M(
z-|Hr5Iiw<bl3;K7-XdwSrm5?db)O*;wF~A>HVrck6W3ABeVOts?~9Ii7zQ0nlvJy;
z$+g8!LYrn7_6i8=KULG=%A?ua;h1v)bRByv=KP57^9rY&lT!{EF=e~yJ$XHq`1Tz`
z)sWB%ZRm@$L?8Tg;ByVl)mm9Sfmir0zvKa9TP~JE#*}QA!^Oc;i{QiJN%ZpA6*KiR
z1Jgy7!g)JXK>5_Z@r)tMGrq$QdE07Q$|1|E7S=e))(Y)rT)hw;ifO2-o!SgF9aB71
z6w(p%1wY_>{E?@+*L{&%HSiT}x;&mW77|OSb|EknDp&m!P4Rp*kwd}sb0TUE=?mf_
z=VyF}UvZC-^^aAM-VJJ_sx7b1nsZe$j2_lKd-RG~h}eK9hdJ9^J)|eA)_lRw`8Ge}
zmX0$QudvdY<%qi~VE&EXW`ToPy|k5b`<6Z4f4a^V-D=`^9bqzxF+b(|{DPZUy&6yf
z83xD!cXWAHd~>k75ch3LGP@B<KI<z}I7L)f<T#{)s*+<C@PHrl6MiSP0<ns+5>oft
zT-S_g@%7PlU4v}UmD!Q#C?;9;prp51YZ5k6Pc+Fh=TH2EU-Bvs=`;0t_{AXoS#v;3
z9mn+eLiVw<)>!67U9@J}3O;=&!IxhSsZ)xH1kOws_D}dFzu@=Wl!%@=;>967A7`I4
z`aI%J@yY3pEFIFJ!<y)+S>vQsNp*FGG!$XUA>%Qx^GE)~>pbF&sf4G;^u-~=2J2E%
z3#Z)S4L(|YWOg-c3~7nkD=@z6tN*0kx<<Y&8yN65Z@sXa+~z)~D;h3e{#{z%`fJgV
z9l!tMeZ2pL-C(0u)4gzmtbxV0Pt^4JIXzx~VQ+9#UU}<_=jZ-@&R_q+Z-N!xx22xr
z3MVh@m@85`-6$zS6r*5DU*=&?xX&$a%Uez(X1eeX8vYfKuBUF;x6rpP_T)9PLk{HK
zgLMsfxpIMahC>B>VQ2Dr%0L|aQt#l^E_jWDTE)>iTWqqey^=J}x()<763XB_U?e?{
zHPG_68UJd?2x_ggZY5HJT&H0HuDy=Hdejtp#6s=A3bLY&Dr|h0pavl;Q22MTMD_0p
zNhqBPITwQvC_Ss;c>fqkBCa2b5)#4xLSO&;`U_Nfw4w~6^l$(G002ovPDHLkV1lpn
B0*L?s

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-grapes-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-grapes-overlay.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb37ba1920dc33ee2330f0ce865d5b4c072a6ab9
GIT binary patch
literal 11873
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
b00DRlW)UBum<gMx00000NkvXXu0mjf58FR1

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-grapes.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-grapes.png
new file mode 100644
index 0000000000000000000000000000000000000000..10699b1f31e31dd8ecabcb8d83ae561b92a1e8f2
GIT binary patch
literal 3985
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
YV(*RSdP7dq>HY%*Q%me)W7nAf0Kg&=UjP6A

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-orange-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-orange-overlay.png
new file mode 100644
index 0000000000000000000000000000000000000000..e86aa6e7e3c8a021e291f704733b43eb31d15cb5
GIT binary patch
literal 4096
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-orange.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-orange.png
new file mode 100644
index 0000000000000000000000000000000000000000..42cc80399f2b7d0a62ed8e82faf47dd0c90cf0bf
GIT binary patch
literal 9021
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-pear-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-pear-overlay.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c479da9546598c8f75352586fab283b4a392c22
GIT binary patch
literal 7194
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
Ub<SDk|IR(YP}fwaTpJVff69Al%m4rY

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-pear.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-pear.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fe400bdd1660c26afb5f3426ef398c9bc5f42e8
GIT binary patch
literal 4873
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-plate.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-plate.png
new file mode 100644
index 0000000000000000000000000000000000000000..1da1fdde85897f311db77924d7437538d432fd16
GIT binary patch
literal 3583
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
FV1l}?$m9S3

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-ryuuta.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-ryuuta.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7320923793b2d9f8fe9284748581168dd17756c
GIT binary patch
literal 11722
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/hit0.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/hit0.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d312ceefd87171f2b38c5d68b2352957b7872f4
GIT binary patch
literal 9518
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/hit100.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/hit100.png
new file mode 100644
index 0000000000000000000000000000000000000000..7884dc072d158832135ef370d5405e03afd5987c
GIT binary patch
literal 27548
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
b|JNWrIk6BTzE1A^-)dzAHThq%=3)N_&dpa@

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/hit300.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/hit300.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e4ec2e047e2fe6befda6d2c174a622f479edfb0
GIT binary patch
literal 30325
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/hit50.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/hit50.png
new file mode 100644
index 0000000000000000000000000000000000000000..f02ad11a17461e4032e969151dbe53ccdb298623
GIT binary patch
literal 22638
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
BI)VTI

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-apple-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-apple-overlay.png
new file mode 100755
index 0000000000000000000000000000000000000000..fe567d158d0b47f06c39eca9d055b9c8361b040a
GIT binary patch
literal 4677
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
Hu0mjfgVw2;

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-apple.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-apple.png
new file mode 100755
index 0000000000000000000000000000000000000000..17f3be9c262953cac52da794d601bb853d8dc276
GIT binary patch
literal 4677
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
Hu0mjf9r&r4

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-bananas-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-bananas-overlay.png
new file mode 100755
index 0000000000000000000000000000000000000000..2c94ea78bfdba901614472a3215401d7b0a2dd71
GIT binary patch
literal 4949
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
TP9|;Z00000NkvXXu0mjfQL*|-

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-bananas.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-bananas.png
new file mode 100755
index 0000000000000000000000000000000000000000..2c94ea78bfdba901614472a3215401d7b0a2dd71
GIT binary patch
literal 4949
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
TP9|;Z00000NkvXXu0mjfQL*|-

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-fail.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-fail.png
new file mode 100755
index 0000000000000000000000000000000000000000..1eea5c20830527df1d68c77b0d98d1cbd14547c0
GIT binary patch
literal 63150
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle.png
new file mode 100755
index 0000000000000000000000000000000000000000..17177f3246cafff0cf81669bca7efd0a22599f44
GIT binary patch
literal 133664
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
O0000<MNUMnLSTX~Qng3`

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-kiai.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-kiai.png
new file mode 100755
index 0000000000000000000000000000000000000000..31be03b014cc0985403815d8e740701df88a6649
GIT binary patch
literal 36673
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-drop-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-drop-overlay.png
new file mode 100755
index 0000000000000000000000000000000000000000..56bf4a92fb295a63fb88ac81e8ffe76e83710444
GIT binary patch
literal 4677
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
Hu0mjfi%6-N

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-drop.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-drop.png
new file mode 100755
index 0000000000000000000000000000000000000000..f259684055ad3ce25b2c3cdb5c3a53062b60a8e9
GIT binary patch
literal 4677
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
Hu0mjfQGBVH

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-grapes-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-grapes-overlay.png
new file mode 100755
index 0000000000000000000000000000000000000000..17f3be9c262953cac52da794d601bb853d8dc276
GIT binary patch
literal 4677
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
Hu0mjf9r&r4

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-grapes.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-grapes.png
new file mode 100755
index 0000000000000000000000000000000000000000..3dc60464cf31e3ba07d5585542d75d616f63da03
GIT binary patch
literal 4633
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
P00000NkvXXu0mjfY&D(f

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-orange-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-orange-overlay.png
new file mode 100755
index 0000000000000000000000000000000000000000..3dc60464cf31e3ba07d5585542d75d616f63da03
GIT binary patch
literal 4633
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
P00000NkvXXu0mjfY&D(f

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-orange.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-orange.png
new file mode 100755
index 0000000000000000000000000000000000000000..3dc60464cf31e3ba07d5585542d75d616f63da03
GIT binary patch
literal 4633
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
P00000NkvXXu0mjfY&D(f

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-pear-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-pear-overlay.png
new file mode 100755
index 0000000000000000000000000000000000000000..3dc60464cf31e3ba07d5585542d75d616f63da03
GIT binary patch
literal 4633
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
P00000NkvXXu0mjfY&D(f

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-pear.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-pear.png
new file mode 100755
index 0000000000000000000000000000000000000000..3dc60464cf31e3ba07d5585542d75d616f63da03
GIT binary patch
literal 4633
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
P00000NkvXXu0mjfY&D(f

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index 9b529a2e4c..4ff9f7a7fe 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -3,104 +3,31 @@
 
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Tests.Visual;
 using System;
 using System.Collections.Generic;
-using osu.Game.Skinning;
-using osu.Framework.Graphics.Shapes;
-using osuTK.Graphics;
-using osu.Framework.Audio.Sample;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics.Textures;
-using osu.Game.Audio;
-using osu.Game.Graphics.Sprites;
+using osu.Framework.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestSceneCatcher : OsuTestScene
+    public class TestSceneCatcher : SkinnableTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
-            typeof(CatcherSprite),
+            typeof(CatcherArea),
         };
 
-        private readonly Container container;
-
-        public TestSceneCatcher()
-        {
-            Child = container = new Container
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-            };
-        }
-
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddStep("show default catcher implementation", () => { container.Child = new CatcherSprite(); });
-
-            AddStep("show custom catcher implementation", () =>
+            SetContents(() => new CatcherArea.Catcher
             {
-                container.Child = new CatchCustomSkinSourceContainer
-                {
-                    Child = new CatcherSprite()
-                };
+                RelativePositionAxes = Axes.None,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
             });
         }
-
-        private class CatcherCustomSkin : Container
-        {
-            public CatcherCustomSkin()
-            {
-                RelativeSizeAxes = Axes.Both;
-
-                Children = new Drawable[]
-                {
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = Color4.Blue
-                    },
-                    new OsuSpriteText
-                    {
-                        Text = "custom"
-                    }
-                };
-            }
-        }
-
-        [Cached(typeof(ISkinSource))]
-        private class CatchCustomSkinSourceContainer : Container, ISkinSource
-        {
-            public event Action SourceChanged
-            {
-                add { }
-                remove { }
-            }
-
-            public Drawable GetDrawableComponent(ISkinComponent component)
-            {
-                switch (component.LookupName)
-                {
-                    case "Gameplay/catch/fruit-catcher-idle":
-                        return new CatcherCustomSkin();
-                }
-
-                return null;
-            }
-
-            public SampleChannel GetSample(ISampleInfo sampleInfo) =>
-                throw new NotImplementedException();
-
-            public Texture GetTexture(string componentName) =>
-                throw new NotImplementedException();
-
-            public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => throw new NotImplementedException();
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 1de0b6bfa3..e34d05ed15 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -133,7 +133,6 @@ namespace osu.Game.Rulesets.Catch.UI
                 X = 0.5f;
 
                 Origin = Anchor.TopCentre;
-                Anchor = Anchor.TopLeft;
 
                 Size = new Vector2(CATCHER_SIZE);
                 if (difficulty != null)

From 28c8a9f479c892bab87eed2a68c2817c02909ea2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 Feb 2020 16:37:09 +0900
Subject: [PATCH 0562/1142] Expose created drawables in SkinnableTestScene

---
 osu.Game/Tests/Visual/SkinnableTestScene.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/Tests/Visual/SkinnableTestScene.cs b/osu.Game/Tests/Visual/SkinnableTestScene.cs
index 90f719998e..7a5328d30c 100644
--- a/osu.Game/Tests/Visual/SkinnableTestScene.cs
+++ b/osu.Game/Tests/Visual/SkinnableTestScene.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.Text.RegularExpressions;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
@@ -40,8 +41,12 @@ namespace osu.Game.Tests.Visual
             oldSkin = new TestLegacySkin(new SkinInfo { Name = "old-skin" }, new NamespacedResourceStore<byte[]>(dllStore, "Resources/old_skin"), audio, true);
         }
 
+        private readonly List<Drawable> createdDrawables = new List<Drawable>();
+
         public void SetContents(Func<Drawable> creationFunction)
         {
+            createdDrawables.Clear();
+
             Cell(0).Child = createProvider(null, creationFunction);
             Cell(1).Child = createProvider(metricsSkin, creationFunction);
             Cell(2).Child = createProvider(defaultSkin, creationFunction);
@@ -49,9 +54,13 @@ namespace osu.Game.Tests.Visual
             Cell(4).Child = createProvider(oldSkin, creationFunction);
         }
 
+        protected IEnumerable<Drawable> CreatedDrawables => createdDrawables;
+
         private Drawable createProvider(Skin skin, Func<Drawable> creationFunction)
         {
             var created = creationFunction();
+            createdDrawables.Add(created);
+
             var autoSize = created.RelativeSizeAxes == Axes.None;
 
             var mainProvider = new SkinProvidingContainer(skin)

From c68309ac4f977a7fc104038bdc1ec6c78b0f8e0b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 Feb 2020 16:37:24 +0900
Subject: [PATCH 0563/1142] Update TestSceneCatcherArea to use
 SkinnableTestScene

---
 .../TestSceneCatcherArea.cs                       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index 3ae6886c31..83ea6359c2 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -3,8 +3,10 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.UI;
@@ -13,10 +15,9 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestSceneCatcherArea : OsuTestScene
+    public class TestSceneCatcherArea : SkinnableTestScene
     {
         private RulesetInfo catchRuleset;
-        private TestCatcherArea catcherArea;
 
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -26,20 +27,22 @@ namespace osu.Game.Rulesets.Catch.Tests
         public TestSceneCatcherArea()
         {
             AddSliderStep<float>("CircleSize", 0, 8, 5, createCatcher);
-            AddToggleStep("Hyperdash", t => catcherArea.ToggleHyperDash(t));
+            AddToggleStep("Hyperdash", t =>
+                CreatedDrawables.OfType<CatchInputManager>().Select(i => i.Child)
+                                .OfType<TestCatcherArea>().ForEach(c => c.ToggleHyperDash(t)));
         }
 
         private void createCatcher(float size)
         {
-            Child = new CatchInputManager(catchRuleset)
+            SetContents(() => new CatchInputManager(catchRuleset)
             {
                 RelativeSizeAxes = Axes.Both,
-                Child = catcherArea = new TestCatcherArea(new BeatmapDifficulty { CircleSize = size })
+                Child = new TestCatcherArea(new BeatmapDifficulty { CircleSize = size })
                 {
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.TopLeft
                 },
-            };
+            });
         }
 
         [BackgroundDependencyLoader]

From 0325f30e01e86c57075369dcd5d47b1b6a1bab20 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 Feb 2020 16:40:18 +0900
Subject: [PATCH 0564/1142] Fix TestSceneFruitObjects not displaying all
 representations

---
 osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
index 44517382f7..a7078fb5e7 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
@@ -58,13 +58,13 @@ namespace osu.Game.Rulesets.Catch.Tests
                 ? new Banana
                 {
                     StartTime = 1000000000000,
-                    IndexInBeatmap = index,
+                    ComboIndex = index,
                     Scale = 1.5f,
                 }
                 : new Fruit
                 {
                     StartTime = 1000000000000,
-                    IndexInBeatmap = index,
+                    ComboIndex = index,
                     Scale = 1.5f,
                 };
 

From ea6772ce04678c90ab1d4f52ba5d9e1dd9d57318 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 Feb 2020 16:46:58 +0900
Subject: [PATCH 0565/1142] Update TestSceneFruitObjects to use
 SkinnableTestScene

---
 .../TestSceneFruitObjects.cs                  | 65 ++++++++-----------
 1 file changed, 27 insertions(+), 38 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
index a7078fb5e7..51c821a1e8 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawable;
 using osu.Game.Rulesets.Catch.Objects.Drawable.Pieces;
@@ -15,68 +14,58 @@ using osuTK;
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestSceneFruitObjects : OsuTestScene
+    public class TestSceneFruitObjects : SkinnableTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(CatchHitObject),
             typeof(Fruit),
             typeof(Droplet),
+            typeof(Banana),
+            typeof(BananaShower),
             typeof(DrawableCatchHitObject),
             typeof(DrawableFruit),
             typeof(DrawableDroplet),
-            typeof(BananaShower),
+            typeof(DrawableBanana),
+            typeof(DrawableBananaShower),
             typeof(Pulp),
         };
 
-        public TestSceneFruitObjects()
+        protected override void LoadComplete()
         {
-            Add(new GridContainer
-            {
-                RelativeSizeAxes = Axes.Both,
-                Content = new[]
-                {
-                    new Drawable[]
-                    {
-                        createDrawable(0),
-                        createDrawable(1),
-                        createDrawable(2),
-                    },
-                    new Drawable[]
-                    {
-                        createDrawable(3),
-                        createDrawable(4),
-                        createDrawable(5),
-                    },
-                }
-            });
+            base.LoadComplete();
+
+            foreach (FruitVisualRepresentation rep in Enum.GetValues(typeof(FruitVisualRepresentation)))
+                AddStep($"show {rep}", () => SetContents(() => createDrawable(rep)));
         }
 
-        private DrawableFruit createDrawable(int index)
+        private DrawableFruit createDrawable(FruitVisualRepresentation rep)
         {
-            Fruit fruit = index == 5
-                ? new Banana
-                {
-                    StartTime = 1000000000000,
-                    ComboIndex = index,
-                    Scale = 1.5f,
-                }
-                : new Fruit
-                {
-                    StartTime = 1000000000000,
-                    ComboIndex = index,
-                    Scale = 1.5f,
-                };
+            Fruit fruit = new TestCatchFruit(rep)
+            {
+                StartTime = 1000000000000,
+                Scale = 1.5f,
+            };
 
             return new DrawableFruit(fruit)
             {
                 Anchor = Anchor.Centre,
-                RelativePositionAxes = Axes.Both,
+                RelativePositionAxes = Axes.None,
                 Position = Vector2.Zero,
                 Alpha = 1,
                 LifetimeStart = double.NegativeInfinity,
                 LifetimeEnd = double.PositiveInfinity,
             };
         }
+
+        private class TestCatchFruit : Fruit
+        {
+            public TestCatchFruit(FruitVisualRepresentation rep)
+            {
+                VisualRepresentation = rep;
+            }
+
+            public override FruitVisualRepresentation VisualRepresentation { get; }
+        }
     }
 }

From 7c5ae75c0c8986377d0d856e05931ada0576bbf8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 Feb 2020 18:19:41 +0900
Subject: [PATCH 0566/1142] Add link to blog faq

---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 90ec1d0b39..df4cabc24f 100644
--- a/README.md
+++ b/README.md
@@ -15,9 +15,11 @@ Rhythm is just a *click* away. The future of [osu!](https://osu.ppy.sh) and the
 
 This project is under heavy development, but is in a stable state. Users are encouraged to try it out and keep it installed alongside the stable *osu!* client. It will continue to evolve to the point of eventually replacing the existing stable client as an update.
 
-We are accepting bug reports (please report with as much detail as possible). Feature requests are also welcome, but understand that our focus is on completing the game to feature parity before adding new features.
+We are accepting bug reports (please report with as much detail as possible). Feature requests are also welcome, but understand that our focus is on completing the game to feature parity before adding new features. A few resources are available as starting points to getting involved and understanding the project:
 
-Detailed release changelogs are available on the [official osu! site](https://osu.ppy.sh/home/changelog/lazer). You can also learn more about our approach to [project management](https://github.com/ppy/osu/wiki/Project-management).
+- Detailed release changelogs are available on the [official osu! site](https://osu.ppy.sh/home/changelog/lazer).
+- You can learn more about our approach to [project management](https://github.com/ppy/osu/wiki/Project-management).
+- Read peppy's [latest blog post](https://blog.ppy.sh/a-definitive-lazer-faq/) exploring where lazer is currently and the roadmap going forward.
 
 ## Requirements
 

From 7ce00bebf0cbc94cba6624690089037fb07558d5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 Feb 2020 18:47:22 +0900
Subject: [PATCH 0567/1142] Add basic structure for skinning fruits

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs       |   4 +
 .../CatchSkinComponents.cs                    |   5 +
 .../Objects/Drawable/DrawableFruit.cs         | 259 ++---------------
 .../Objects/Drawable/FruitPiece.cs            | 269 ++++++++++++++++++
 .../Skinning/CatchLegacySkinTransformer.cs    |  47 +++
 5 files changed, 346 insertions(+), 238 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs
 create mode 100644 osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index e5c3647f99..b9d791fdb1 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -21,6 +21,8 @@ using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using System;
+using osu.Game.Rulesets.Catch.Skinning;
+using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Catch
 {
@@ -141,6 +143,8 @@ namespace osu.Game.Rulesets.Catch
 
         public override DifficultyCalculator CreateDifficultyCalculator(WorkingBeatmap beatmap) => new CatchDifficultyCalculator(this, beatmap);
 
+        public override ISkin CreateLegacySkinProvider(ISkinSource source) => new CatchLegacySkinTransformer(source);
+
         public override PerformanceCalculator CreatePerformanceCalculator(WorkingBeatmap beatmap, ScoreInfo score) => new CatchPerformanceCalculator(this, beatmap, score);
 
         public int LegacyID => 2;
diff --git a/osu.Game.Rulesets.Catch/CatchSkinComponents.cs b/osu.Game.Rulesets.Catch/CatchSkinComponents.cs
index 7e482d4045..f64902b8e5 100644
--- a/osu.Game.Rulesets.Catch/CatchSkinComponents.cs
+++ b/osu.Game.Rulesets.Catch/CatchSkinComponents.cs
@@ -5,5 +5,10 @@ namespace osu.Game.Rulesets.Catch
 {
     public enum CatchSkinComponents
     {
+        FruitBananas,
+        FruitApple,
+        FruitGrapes,
+        FruitOrange,
+        FruitPear,
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
index 53a018c9f4..0953293dcd 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
@@ -3,13 +3,9 @@
 
 using System;
 using osu.Framework.Allocation;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Effects;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Utils;
-using osu.Game.Rulesets.Catch.Objects.Drawable.Pieces;
+using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
 
@@ -17,21 +13,19 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
 {
     public class DrawableFruit : PalpableCatchHitObject<Fruit>
     {
-        private Circle border;
-
-        private const float drawable_radius = (float)CatchHitObject.OBJECT_RADIUS * radius_adjust;
+        public const float DRAWABLE_RADIUS = (float)CatchHitObject.OBJECT_RADIUS * RADIUS_ADJUST;
 
         /// <summary>
         /// Because we're adding a border around the fruit, we need to scale down some.
         /// </summary>
-        private const float radius_adjust = 1.1f;
+        public const float RADIUS_ADJUST = 1.1f;
 
         public DrawableFruit(Fruit h)
             : base(h)
         {
             Origin = Anchor.Centre;
 
-            Size = new Vector2(drawable_radius);
+            Size = new Vector2(DRAWABLE_RADIUS);
             Masking = false;
 
             Rotation = (float)(RNG.NextDouble() - 0.5f) * 40;
@@ -40,247 +34,36 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
         [BackgroundDependencyLoader]
         private void load()
         {
-            // todo: this should come from the skin.
+            AddInternal(new SkinnableDrawable(
+                new CatchSkinComponent(getComponent(HitObject.VisualRepresentation)), _ => new FruitPiece()));
+
             AccentColour.Value = colourForRepresentation(HitObject.VisualRepresentation);
-
-            AddRangeInternal(new[]
-            {
-                createPulp(HitObject.VisualRepresentation),
-                border = new Circle
-                {
-                    EdgeEffect = new EdgeEffectParameters
-                    {
-                        Hollow = !HitObject.HyperDash,
-                        Type = EdgeEffectType.Glow,
-                        Radius = 4 * radius_adjust,
-                        Colour = HitObject.HyperDash ? Color4.Red : AccentColour.Value.Darken(1).Opacity(0.6f)
-                    },
-                    Size = new Vector2(Height),
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    BorderColour = Color4.White,
-                    BorderThickness = 3f * radius_adjust,
-                    Children = new Framework.Graphics.Drawable[]
-                    {
-                        new Box
-                        {
-                            AlwaysPresent = true,
-                            Colour = AccentColour.Value,
-                            Alpha = 0,
-                            RelativeSizeAxes = Axes.Both
-                        }
-                    }
-                },
-            });
-
-            if (HitObject.HyperDash)
-            {
-                AddInternal(new Pulp
-                {
-                    RelativePositionAxes = Axes.Both,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    AccentColour = Color4.Red,
-                    Blending = BlendingParameters.Additive,
-                    Alpha = 0.5f,
-                    Scale = new Vector2(1.333f)
-                });
-            }
         }
 
-        private Framework.Graphics.Drawable createPulp(FruitVisualRepresentation representation)
+        private CatchSkinComponents getComponent(FruitVisualRepresentation hitObjectVisualRepresentation)
         {
-            const float large_pulp_3 = 8f * radius_adjust;
-            const float distance_from_centre_3 = 0.15f;
-
-            const float large_pulp_4 = large_pulp_3 * 0.925f;
-            const float distance_from_centre_4 = distance_from_centre_3 / 0.925f;
-
-            const float small_pulp = large_pulp_3 / 2;
-
-            static Vector2 positionAt(float angle, float distance) => new Vector2(
-                distance * MathF.Sin(angle * MathF.PI / 180),
-                distance * MathF.Cos(angle * MathF.PI / 180));
-
-            switch (representation)
+            switch (hitObjectVisualRepresentation)
             {
-                default:
-                    return new Container();
-
-                case FruitVisualRepresentation.Raspberry:
-                    return new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Children = new Framework.Graphics.Drawable[]
-                        {
-                            new Pulp
-                            {
-                                AccentColour = AccentColour.Value,
-                                Size = new Vector2(small_pulp),
-                                Y = -0.34f,
-                            },
-                            new Pulp
-                            {
-                                AccentColour = AccentColour.Value,
-                                Size = new Vector2(large_pulp_4),
-                                Position = positionAt(0, distance_from_centre_4),
-                            },
-                            new Pulp
-                            {
-                                AccentColour = AccentColour.Value,
-                                Size = new Vector2(large_pulp_4),
-                                Position = positionAt(90, distance_from_centre_4),
-                            },
-                            new Pulp
-                            {
-                                AccentColour = AccentColour.Value,
-                                Size = new Vector2(large_pulp_4),
-                                Position = positionAt(180, distance_from_centre_4),
-                            },
-                            new Pulp
-                            {
-                                Size = new Vector2(large_pulp_4),
-                                AccentColour = AccentColour.Value,
-                                Position = positionAt(270, distance_from_centre_4),
-                            },
-                        }
-                    };
-
-                case FruitVisualRepresentation.Pineapple:
-                    return new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Children = new Framework.Graphics.Drawable[]
-                        {
-                            new Pulp
-                            {
-                                AccentColour = AccentColour.Value,
-                                Size = new Vector2(small_pulp),
-                                Y = -0.3f,
-                            },
-                            new Pulp
-                            {
-                                AccentColour = AccentColour.Value,
-                                Size = new Vector2(large_pulp_4),
-                                Position = positionAt(45, distance_from_centre_4),
-                            },
-                            new Pulp
-                            {
-                                AccentColour = AccentColour.Value,
-                                Size = new Vector2(large_pulp_4),
-                                Position = positionAt(135, distance_from_centre_4),
-                            },
-                            new Pulp
-                            {
-                                AccentColour = AccentColour.Value,
-                                Size = new Vector2(large_pulp_4),
-                                Position = positionAt(225, distance_from_centre_4),
-                            },
-                            new Pulp
-                            {
-                                Size = new Vector2(large_pulp_4),
-                                AccentColour = AccentColour.Value,
-                                Position = positionAt(315, distance_from_centre_4),
-                            },
-                        }
-                    };
-
                 case FruitVisualRepresentation.Pear:
-                    return new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Children = new Framework.Graphics.Drawable[]
-                        {
-                            new Pulp
-                            {
-                                AccentColour = AccentColour.Value,
-                                Size = new Vector2(small_pulp),
-                                Y = -0.33f,
-                            },
-                            new Pulp
-                            {
-                                AccentColour = AccentColour.Value,
-                                Size = new Vector2(large_pulp_3),
-                                Position = positionAt(60, distance_from_centre_3),
-                            },
-                            new Pulp
-                            {
-                                AccentColour = AccentColour.Value,
-                                Size = new Vector2(large_pulp_3),
-                                Position = positionAt(180, distance_from_centre_3),
-                            },
-                            new Pulp
-                            {
-                                Size = new Vector2(large_pulp_3),
-                                AccentColour = AccentColour.Value,
-                                Position = positionAt(300, distance_from_centre_3),
-                            },
-                        }
-                    };
+                    return CatchSkinComponents.FruitPear;
 
                 case FruitVisualRepresentation.Grape:
-                    return new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Children = new Framework.Graphics.Drawable[]
-                        {
-                            new Pulp
-                            {
-                                AccentColour = AccentColour.Value,
-                                Size = new Vector2(small_pulp),
-                                Y = -0.25f,
-                            },
-                            new Pulp
-                            {
-                                AccentColour = AccentColour.Value,
-                                Size = new Vector2(large_pulp_3),
-                                Position = positionAt(0, distance_from_centre_3),
-                            },
-                            new Pulp
-                            {
-                                AccentColour = AccentColour.Value,
-                                Size = new Vector2(large_pulp_3),
-                                Position = positionAt(120, distance_from_centre_3),
-                            },
-                            new Pulp
-                            {
-                                Size = new Vector2(large_pulp_3),
-                                AccentColour = AccentColour.Value,
-                                Position = positionAt(240, distance_from_centre_3),
-                            },
-                        }
-                    };
+                    return CatchSkinComponents.FruitGrapes;
+
+                case FruitVisualRepresentation.Raspberry:
+                    return CatchSkinComponents.FruitOrange;
+
+                case FruitVisualRepresentation.Pineapple:
+                    return CatchSkinComponents.FruitApple;
 
                 case FruitVisualRepresentation.Banana:
-                    return new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Children = new Framework.Graphics.Drawable[]
-                        {
-                            new Pulp
-                            {
-                                AccentColour = AccentColour.Value,
-                                Size = new Vector2(small_pulp),
-                                Y = -0.3f
-                            },
-                            new Pulp
-                            {
-                                AccentColour = AccentColour.Value,
-                                Size = new Vector2(large_pulp_4 * 0.8f, large_pulp_4 * 2.5f),
-                                Y = 0.05f,
-                            },
-                        }
-                    };
+                    return CatchSkinComponents.FruitBananas;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(hitObjectVisualRepresentation), hitObjectVisualRepresentation, null);
             }
         }
 
-        protected override void Update()
-        {
-            base.Update();
-
-            border.Alpha = (float)Math.Clamp((HitObject.StartTime - Time.Current) / 500, 0, 1);
-        }
-
         private Color4 colourForRepresentation(FruitVisualRepresentation representation)
         {
             switch (representation)
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs
new file mode 100644
index 0000000000..c59cac8de3
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs
@@ -0,0 +1,269 @@
+// 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.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Catch.Objects.Drawable.Pieces;
+using osu.Game.Rulesets.Objects.Drawables;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Catch.Objects.Drawable
+{
+    internal class FruitPiece : CompositeDrawable
+    {
+        private Circle border;
+
+        private CatchHitObject hitObject;
+
+        private readonly IBindable<Color4> accentColour = new Bindable<Color4>();
+
+        public FruitPiece()
+        {
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(DrawableHitObject drawableObject)
+        {
+            DrawableCatchHitObject drawableCatchObject = (DrawableCatchHitObject)drawableObject;
+            hitObject = drawableCatchObject.HitObject;
+
+            accentColour.BindTo(drawableCatchObject.AccentColour);
+
+            AddRangeInternal(new[]
+            {
+                createPulp(drawableCatchObject.HitObject.VisualRepresentation),
+                border = new Circle
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    BorderColour = Color4.White,
+                    BorderThickness = 3f * DrawableFruit.RADIUS_ADJUST,
+                    Children = new Framework.Graphics.Drawable[]
+                    {
+                        new Box
+                        {
+                            AlwaysPresent = true,
+                            Colour = drawableCatchObject.AccentColour.Value,
+                            Alpha = 0,
+                            RelativeSizeAxes = Axes.Both
+                        }
+                    }
+                },
+            });
+
+            if (hitObject.HyperDash)
+            {
+                AddInternal(new Pulp
+                {
+                    RelativePositionAxes = Axes.Both,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    AccentColour = Color4.Red,
+                    Blending = BlendingParameters.Additive,
+                    Alpha = 0.5f,
+                    Scale = new Vector2(1.333f)
+                });
+            }
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            border.Alpha = (float)Math.Clamp((hitObject.StartTime - Time.Current) / 500, 0, 1);
+        }
+
+        private Framework.Graphics.Drawable createPulp(FruitVisualRepresentation representation)
+        {
+            const float large_pulp_3 = 8f * DrawableFruit.RADIUS_ADJUST;
+            const float distance_from_centre_3 = 0.15f;
+
+            const float large_pulp_4 = large_pulp_3 * 0.925f;
+            const float distance_from_centre_4 = distance_from_centre_3 / 0.925f;
+
+            const float small_pulp = large_pulp_3 / 2;
+
+            static Vector2 positionAt(float angle, float distance) => new Vector2(
+                distance * MathF.Sin(angle * MathF.PI / 180),
+                distance * MathF.Cos(angle * MathF.PI / 180));
+
+            switch (representation)
+            {
+                default:
+                    return new Container();
+
+                case FruitVisualRepresentation.Raspberry:
+                    return new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Children = new Framework.Graphics.Drawable[]
+                        {
+                            new Pulp
+                            {
+                                AccentColour = accentColour.Value,
+                                Size = new Vector2(small_pulp),
+                                Y = -0.34f,
+                            },
+                            new Pulp
+                            {
+                                AccentColour = accentColour.Value,
+                                Size = new Vector2(large_pulp_4),
+                                Position = positionAt(0, distance_from_centre_4),
+                            },
+                            new Pulp
+                            {
+                                AccentColour = accentColour.Value,
+                                Size = new Vector2(large_pulp_4),
+                                Position = positionAt(90, distance_from_centre_4),
+                            },
+                            new Pulp
+                            {
+                                AccentColour = accentColour.Value,
+                                Size = new Vector2(large_pulp_4),
+                                Position = positionAt(180, distance_from_centre_4),
+                            },
+                            new Pulp
+                            {
+                                Size = new Vector2(large_pulp_4),
+                                AccentColour = accentColour.Value,
+                                Position = positionAt(270, distance_from_centre_4),
+                            },
+                        }
+                    };
+
+                case FruitVisualRepresentation.Pineapple:
+                    return new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Children = new Framework.Graphics.Drawable[]
+                        {
+                            new Pulp
+                            {
+                                AccentColour = accentColour.Value,
+                                Size = new Vector2(small_pulp),
+                                Y = -0.3f,
+                            },
+                            new Pulp
+                            {
+                                AccentColour = accentColour.Value,
+                                Size = new Vector2(large_pulp_4),
+                                Position = positionAt(45, distance_from_centre_4),
+                            },
+                            new Pulp
+                            {
+                                AccentColour = accentColour.Value,
+                                Size = new Vector2(large_pulp_4),
+                                Position = positionAt(135, distance_from_centre_4),
+                            },
+                            new Pulp
+                            {
+                                AccentColour = accentColour.Value,
+                                Size = new Vector2(large_pulp_4),
+                                Position = positionAt(225, distance_from_centre_4),
+                            },
+                            new Pulp
+                            {
+                                Size = new Vector2(large_pulp_4),
+                                AccentColour = accentColour.Value,
+                                Position = positionAt(315, distance_from_centre_4),
+                            },
+                        }
+                    };
+
+                case FruitVisualRepresentation.Pear:
+                    return new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Children = new Framework.Graphics.Drawable[]
+                        {
+                            new Pulp
+                            {
+                                AccentColour = accentColour.Value,
+                                Size = new Vector2(small_pulp),
+                                Y = -0.33f,
+                            },
+                            new Pulp
+                            {
+                                AccentColour = accentColour.Value,
+                                Size = new Vector2(large_pulp_3),
+                                Position = positionAt(60, distance_from_centre_3),
+                            },
+                            new Pulp
+                            {
+                                AccentColour = accentColour.Value,
+                                Size = new Vector2(large_pulp_3),
+                                Position = positionAt(180, distance_from_centre_3),
+                            },
+                            new Pulp
+                            {
+                                Size = new Vector2(large_pulp_3),
+                                AccentColour = accentColour.Value,
+                                Position = positionAt(300, distance_from_centre_3),
+                            },
+                        }
+                    };
+
+                case FruitVisualRepresentation.Grape:
+                    return new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Children = new Framework.Graphics.Drawable[]
+                        {
+                            new Pulp
+                            {
+                                AccentColour = accentColour.Value,
+                                Size = new Vector2(small_pulp),
+                                Y = -0.25f,
+                            },
+                            new Pulp
+                            {
+                                AccentColour = accentColour.Value,
+                                Size = new Vector2(large_pulp_3),
+                                Position = positionAt(0, distance_from_centre_3),
+                            },
+                            new Pulp
+                            {
+                                AccentColour = accentColour.Value,
+                                Size = new Vector2(large_pulp_3),
+                                Position = positionAt(120, distance_from_centre_3),
+                            },
+                            new Pulp
+                            {
+                                Size = new Vector2(large_pulp_3),
+                                AccentColour = accentColour.Value,
+                                Position = positionAt(240, distance_from_centre_3),
+                            },
+                        }
+                    };
+
+                case FruitVisualRepresentation.Banana:
+                    return new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Children = new Framework.Graphics.Drawable[]
+                        {
+                            new Pulp
+                            {
+                                AccentColour = accentColour.Value,
+                                Size = new Vector2(small_pulp),
+                                Y = -0.3f
+                            },
+                            new Pulp
+                            {
+                                AccentColour = accentColour.Value,
+                                Size = new Vector2(large_pulp_4 * 0.8f, large_pulp_4 * 2.5f),
+                                Y = 0.05f,
+                            },
+                        }
+                    };
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
new file mode 100644
index 0000000000..c1e164ed5b
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
@@ -0,0 +1,47 @@
+// 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 Humanizer;
+using osu.Framework.Audio.Sample;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Audio;
+using osu.Game.Skinning;
+
+namespace osu.Game.Rulesets.Catch.Skinning
+{
+    public class CatchLegacySkinTransformer : ISkin
+    {
+        private readonly ISkin source;
+
+        public CatchLegacySkinTransformer(ISkinSource source)
+        {
+            this.source = source;
+        }
+
+        public Drawable GetDrawableComponent(ISkinComponent component)
+        {
+            if (!(component is CatchSkinComponent catchSkinComponent))
+                return null;
+
+            switch (catchSkinComponent.Component)
+            {
+                case CatchSkinComponents.FruitApple:
+                case CatchSkinComponents.FruitBananas:
+                case CatchSkinComponents.FruitOrange:
+                case CatchSkinComponents.FruitGrapes:
+                case CatchSkinComponents.FruitPear:
+                    return this.GetAnimation(catchSkinComponent.Component.ToString().Underscore().Hyphenate(), true, false, true);
+            }
+
+            return null;
+        }
+
+        public Texture GetTexture(string componentName) => source.GetTexture(componentName);
+
+        public SampleChannel GetSample(ISampleInfo sample) => source.GetSample(sample);
+
+        public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup) => source.GetConfig<TLookup, TValue>(lookup);
+    }
+}

From 2133ba38e5caadf1698fec032caff5ed8c6bea25 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 Feb 2020 19:06:08 +0900
Subject: [PATCH 0568/1142] Add overlay layer

---
 .../Skinning/CatchLegacySkinTransformer.cs    |  6 ++-
 .../Skinning/LegacyFruitPiece.cs              | 53 +++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs

diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
index c1e164ed5b..20bd086199 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
@@ -32,7 +32,11 @@ namespace osu.Game.Rulesets.Catch.Skinning
                 case CatchSkinComponents.FruitOrange:
                 case CatchSkinComponents.FruitGrapes:
                 case CatchSkinComponents.FruitPear:
-                    return this.GetAnimation(catchSkinComponent.Component.ToString().Underscore().Hyphenate(), true, false, true);
+                    var lookupName = catchSkinComponent.Component.ToString().Underscore().Hyphenate();
+                    if (GetTexture(lookupName) != null)
+                        return new LegacyFruitPiece(lookupName);
+
+                    break;
             }
 
             return null;
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
new file mode 100644
index 0000000000..fbe682e512
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
@@ -0,0 +1,53 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Rulesets.Catch.Objects.Drawable;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Skinning;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Catch.Skinning
+{
+    internal class LegacyFruitPiece : CompositeDrawable
+    {
+        private readonly string lookupName;
+
+        private readonly IBindable<Color4> accentColour = new Bindable<Color4>();
+
+        public LegacyFruitPiece(string lookupName)
+        {
+            this.lookupName = lookupName;
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(DrawableHitObject drawableObject, ISkinSource skin)
+        {
+            DrawableCatchHitObject drawableCatchObject = (DrawableCatchHitObject)drawableObject;
+
+            accentColour.BindTo(drawableCatchObject.AccentColour);
+
+            InternalChildren = new Drawable[]
+            {
+                new Sprite
+                {
+                    Texture = skin.GetTexture(lookupName),
+                    Colour = drawableObject.AccentColour.Value,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+                new Sprite
+                {
+                    Texture = skin.GetTexture($"{lookupName}-overlay"),
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                },
+            };
+        }
+    }
+}

From 89bff32274af6bc46a14df879c2baae911ba9458 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 17 Feb 2020 19:16:40 +0900
Subject: [PATCH 0569/1142] Fix metrics not matching between skins and lazer

---
 .../Objects/CatchHitObject.cs                 |  2 +-
 .../Objects/Drawable/DrawableDroplet.cs       |  2 +-
 .../Objects/Drawable/DrawableFruit.cs         | 24 +++++++++++++++----
 .../Objects/Drawable/DrawableTinyDroplet.cs   |  2 +-
 .../Objects/Drawable/FruitPiece.cs            |  4 ++--
 5 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index e4ad49ea50..6cb524ca7a 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Catch.Objects
 {
     public abstract class CatchHitObject : HitObject, IHasXPosition, IHasComboInformation
     {
-        public const double OBJECT_RADIUS = 44;
+        public const float OBJECT_RADIUS = 64;
 
         private float x;
 
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
index 059310d671..6f5bcb70cf 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
             : base(h)
         {
             Origin = Anchor.Centre;
-            Size = new Vector2((float)CatchHitObject.OBJECT_RADIUS) / 4;
+            Size = new Vector2(CatchHitObject.OBJECT_RADIUS) / 4;
             Masking = false;
         }
 
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
index 0953293dcd..5ab0858f75 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
 using osu.Game.Skinning;
 using osuTK;
@@ -13,7 +14,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
 {
     public class DrawableFruit : PalpableCatchHitObject<Fruit>
     {
-        public const float DRAWABLE_RADIUS = (float)CatchHitObject.OBJECT_RADIUS * RADIUS_ADJUST;
+        private Container scaleContainer;
 
         /// <summary>
         /// Because we're adding a border around the fruit, we need to scale down some.
@@ -25,7 +26,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
         {
             Origin = Anchor.Centre;
 
-            Size = new Vector2(DRAWABLE_RADIUS);
+            Size = new Vector2(CatchHitObject.OBJECT_RADIUS * 2);
+
             Masking = false;
 
             Rotation = (float)(RNG.NextDouble() - 0.5f) * 40;
@@ -34,10 +36,24 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddInternal(new SkinnableDrawable(
-                new CatchSkinComponent(getComponent(HitObject.VisualRepresentation)), _ => new FruitPiece()));
+            AddRangeInternal(new Framework.Graphics.Drawable[]
+            {
+                scaleContainer = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre,
+                    Children = new Framework.Graphics.Drawable[]
+                    {
+                        new SkinnableDrawable(
+                            new CatchSkinComponent(getComponent(HitObject.VisualRepresentation)), _ => new FruitPiece())
+                    }
+                }
+            });
 
             AccentColour.Value = colourForRepresentation(HitObject.VisualRepresentation);
+
+            scaleContainer.Scale = new Vector2(HitObject.Scale);
         }
 
         private CatchSkinComponents getComponent(FruitVisualRepresentation hitObjectVisualRepresentation)
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableTinyDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableTinyDroplet.cs
index d41aea1e7b..ab5df5c44c 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableTinyDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableTinyDroplet.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
         public DrawableTinyDroplet(TinyDroplet h)
             : base(h)
         {
-            Size = new Vector2((float)CatchHitObject.OBJECT_RADIUS) / 8;
+            Size = new Vector2(CatchHitObject.OBJECT_RADIUS / 8);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs
index c59cac8de3..2b24f25e8b 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     BorderColour = Color4.White,
-                    BorderThickness = 3f * DrawableFruit.RADIUS_ADJUST,
+                    BorderThickness = 6f * DrawableFruit.RADIUS_ADJUST,
                     Children = new Framework.Graphics.Drawable[]
                     {
                         new Box
@@ -82,7 +82,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
 
         private Framework.Graphics.Drawable createPulp(FruitVisualRepresentation representation)
         {
-            const float large_pulp_3 = 8f * DrawableFruit.RADIUS_ADJUST;
+            const float large_pulp_3 = 16f * DrawableFruit.RADIUS_ADJUST;
             const float distance_from_centre_3 = 0.15f;
 
             const float large_pulp_4 = large_pulp_3 * 0.925f;

From ede85d7be471724397377bf145f015738739609c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 Feb 2020 00:59:08 +0900
Subject: [PATCH 0570/1142] Restructure readme to better define prerequisites
 that are required for development only

---
 README.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index df4cabc24f..6071e3f473 100644
--- a/README.md
+++ b/README.md
@@ -21,19 +21,9 @@ We are accepting bug reports (please report with as much detail as possible). Fe
 - You can learn more about our approach to [project management](https://github.com/ppy/osu/wiki/Project-management).
 - Read peppy's [latest blog post](https://blog.ppy.sh/a-definitive-lazer-faq/) exploring where lazer is currently and the roadmap going forward.
 
-## Requirements
-
-- A desktop platform with the [.NET Core 3.1 SDK](https://dotnet.microsoft.com/download) or higher installed.
-- When running on Linux, please have a system-wide FFmpeg installation available to support video decoding.
-- When running on Windows 7 or 8.1, **[additional prerequisites](https://docs.microsoft.com/en-us/dotnet/core/install/dependencies?tabs=netcore31&pivots=os-windows)** may be required to correctly run .NET Core applications if your operating system is not up-to-date with the latest service packs.
-- When developing with mobile, [Xamarin](https://docs.microsoft.com/en-us/xamarin/) is required, which is shipped together with Visual Studio or [Visual Studio for Mac](https://visualstudio.microsoft.com/vs/mac/).
-- When working with the codebase, we recommend using an IDE with intelligent code completion and syntax highlighting, such as [Visual Studio 2019+](https://visualstudio.microsoft.com/vs/), [JetBrains Rider](https://www.jetbrains.com/rider/) or [Visual Studio Code](https://code.visualstudio.com/).
-
 ## Running osu!
 
-### Releases
-
-If you are not interested in developing the game, you can still consume our [binary releases](https://github.com/ppy/osu/releases).
+If you are looking to install or test osu! without setting up a development environment, you can consume our [binary releases](https://github.com/ppy/osu/releases). Handy links below will download the latest version for your operating system of choice:
 
 **Latest build:**
 
@@ -41,9 +31,19 @@ If you are not interested in developing the game, you can still consume our [bin
 | ------------- | ------------- | ------------- | ------------- |
 
 - **Linux** users are recommended to self-compile until we have official deployment in place.
+- When running on Windows 7 or 8.1, **[additional prerequisites](https://docs.microsoft.com/en-us/dotnet/core/install/dependencies?tabs=netcore31&pivots=os-windows)** may be required to correctly run .NET Core applications if your operating system is not up-to-date with the latest service packs.
 
 If your platform is not listed above, there is still a chance you can manually build it by following the instructions below.
 
+## Developing or debugging
+
+Please make sure you have the following preqreuisites:
+
+- A desktop platform with the [.NET Core 3.1 SDK](https://dotnet.microsoft.com/download) or higher installed.
+- When developing with mobile, [Xamarin](https://docs.microsoft.com/en-us/xamarin/) is required, which is shipped together with Visual Studio or [Visual Studio for Mac](https://visualstudio.microsoft.com/vs/mac/).
+- When working with the codebase, we recommend using an IDE with intelligent code completion and syntax highlighting, such as [Visual Studio 2019+](https://visualstudio.microsoft.com/vs/), [JetBrains Rider](https://www.jetbrains.com/rider/) or [Visual Studio Code](https://code.visualstudio.com/).
+- When running on Linux, please have a system-wide FFmpeg installation available to support video decoding.
+
 ### Downloading the source code
 
 Clone the repository:

From 19872d9e24009e29ae27f547d8ee568268f26b16 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 17 Feb 2020 22:05:10 +0300
Subject: [PATCH 0571/1142] Simplify test scene

---
 .../TestSceneBeatmapListingSort.cs            | 31 +++++++------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSort.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSort.cs
index 4638b2bb54..a5fa085abf 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSort.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSort.cs
@@ -24,39 +24,32 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
-        private readonly FillFlowContainer placeholder;
-        private readonly BeatmapListingSortTabControl control;
-
         public TestSceneBeatmapListingSort()
         {
+            BeatmapListingSortTabControl control;
+            OsuSpriteText current;
+            OsuSpriteText direction;
+
             Add(control = new BeatmapListingSortTabControl
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             });
 
-            Add(placeholder = new FillFlowContainer
+            Add(new FillFlowContainer
             {
                 AutoSizeAxes = Axes.Both,
                 Direction = FillDirection.Vertical,
                 Spacing = new Vector2(0, 5),
+                Children = new Drawable[]
+                {
+                    current = new OsuSpriteText(),
+                    direction = new OsuSpriteText()
+                }
             });
-        }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            control.SortDirection.BindValueChanged(_ => updateBindablesVisual());
-            control.Current.BindValueChanged(_ => updateBindablesVisual(), true);
-        }
-
-        private void updateBindablesVisual()
-        {
-            placeholder.Clear();
-
-            placeholder.Add(new OsuSpriteText { Text = $"Current: {control.Current.Value}" });
-            placeholder.Add(new OsuSpriteText { Text = $"Sort direction: {control.SortDirection.Value}" });
+            control.SortDirection.BindValueChanged(sortDirection => direction.Text = $"Sort direction: {sortDirection.NewValue}", true);
+            control.Current.BindValueChanged(criteria => current.Text = $"Criteria: {criteria.NewValue}", true);
         }
     }
 }

From 519548c99f5c1349bb3c774406897e0f14168e42 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 17 Feb 2020 22:06:46 +0300
Subject: [PATCH 0572/1142] Remove not necessary icon margin changes

---
 osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs
index 3f69c76da7..d6841da408 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs
@@ -84,7 +84,6 @@ namespace osu.Game.Overlays.BeatmapListing
                         SortDirection.BindValueChanged(direction =>
                         {
                             icon.Icon = direction.NewValue == Overlays.SortDirection.Ascending ? FontAwesome.Solid.CaretUp : FontAwesome.Solid.CaretDown;
-                            icon.Margin = direction.NewValue == Overlays.SortDirection.Ascending ? new MarginPadding { Top = 1 } : new MarginPadding { Top = 2 };
                         }, true);
                     }
 

From bce9e7a356912cd7eb7c1d4fd6a35a6cc2ad1163 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 17 Feb 2020 22:32:58 +0300
Subject: [PATCH 0573/1142] Remove too much nesting for OverlaySortTabControl
 class

---
 .../BeatmapListingSortTabControl.cs           | 112 ++++++-------
 osu.Game/Overlays/OverlaySortTabControl.cs    | 150 +++++++++---------
 2 files changed, 131 insertions(+), 131 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs
index d6841da408..cb41b33bc4 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs
@@ -33,74 +33,74 @@ namespace osu.Game.Overlays.BeatmapListing
             {
                 SortDirection = { BindTarget = SortDirection }
             };
+        }
 
-            private class BeatmapSortTabItem : SortTabItem
+        private class BeatmapSortTabItem : SortTabItem
+        {
+            public readonly Bindable<SortDirection> SortDirection = new Bindable<SortDirection>();
+
+            public BeatmapSortTabItem(BeatmapSortCriteria value)
+                : base(value)
             {
-                public readonly Bindable<SortDirection> SortDirection = new Bindable<SortDirection>();
+            }
 
-                public BeatmapSortTabItem(BeatmapSortCriteria value)
-                    : base(value)
+            protected override TabButton CreateTabButton(BeatmapSortCriteria value) => new BeatmapTabButton(value)
+            {
+                Active = { BindTarget = Active },
+                SortDirection = { BindTarget = SortDirection }
+            };
+        }
+
+        private class BeatmapTabButton : TabButton
+        {
+            public readonly Bindable<SortDirection> SortDirection = new Bindable<SortDirection>();
+
+            protected override Color4 ContentColour
+            {
+                set
                 {
+                    base.ContentColour = value;
+                    icon.Colour = value;
                 }
+            }
 
-                protected override TabButton CreateTabButton(BeatmapSortCriteria value) => new BeatmapTabButton(value)
+            private readonly SpriteIcon icon;
+
+            public BeatmapTabButton(BeatmapSortCriteria value)
+                : base(value)
+            {
+                Add(icon = new SpriteIcon
                 {
-                    Active = { BindTarget = Active },
-                    SortDirection = { BindTarget = SortDirection }
-                };
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    AlwaysPresent = true,
+                    Alpha = 0,
+                    Size = new Vector2(6)
+                });
+            }
 
-                private class BeatmapTabButton : TabButton
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                SortDirection.BindValueChanged(direction =>
                 {
-                    public readonly Bindable<SortDirection> SortDirection = new Bindable<SortDirection>();
+                    icon.Icon = direction.NewValue == Overlays.SortDirection.Ascending ? FontAwesome.Solid.CaretUp : FontAwesome.Solid.CaretDown;
+                }, true);
+            }
 
-                    protected override Color4 ContentColour
-                    {
-                        set
-                        {
-                            base.ContentColour = value;
-                            icon.Colour = value;
-                        }
-                    }
+            protected override void UpdateState()
+            {
+                base.UpdateState();
+                icon.FadeTo(Active.Value || IsHovered ? 1 : 0, 200, Easing.OutQuint);
+            }
 
-                    private readonly SpriteIcon icon;
+            protected override bool OnClick(ClickEvent e)
+            {
+                if (Active.Value)
+                    SortDirection.Value = SortDirection.Value == Overlays.SortDirection.Ascending ? Overlays.SortDirection.Descending : Overlays.SortDirection.Ascending;
 
-                    public BeatmapTabButton(BeatmapSortCriteria value)
-                        : base(value)
-                    {
-                        Add(icon = new SpriteIcon
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            AlwaysPresent = true,
-                            Alpha = 0,
-                            Size = new Vector2(6)
-                        });
-                    }
-
-                    protected override void LoadComplete()
-                    {
-                        base.LoadComplete();
-
-                        SortDirection.BindValueChanged(direction =>
-                        {
-                            icon.Icon = direction.NewValue == Overlays.SortDirection.Ascending ? FontAwesome.Solid.CaretUp : FontAwesome.Solid.CaretDown;
-                        }, true);
-                    }
-
-                    protected override void UpdateState()
-                    {
-                        base.UpdateState();
-                        icon.FadeTo(Active.Value || IsHovered ? 1 : 0, 200, Easing.OutQuint);
-                    }
-
-                    protected override bool OnClick(ClickEvent e)
-                    {
-                        if (Active.Value)
-                            SortDirection.Value = SortDirection.Value == Overlays.SortDirection.Ascending ? Overlays.SortDirection.Descending : Overlays.SortDirection.Ascending;
-
-                        return base.OnClick(e);
-                    }
-                }
+                return base.OnClick(e);
             }
         }
     }
diff --git a/osu.Game/Overlays/OverlaySortTabControl.cs b/osu.Game/Overlays/OverlaySortTabControl.cs
index 487dd70db9..5a713ab08e 100644
--- a/osu.Game/Overlays/OverlaySortTabControl.cs
+++ b/osu.Game/Overlays/OverlaySortTabControl.cs
@@ -75,93 +75,93 @@ namespace osu.Game.Overlays
             {
                 AutoSizeAxes = Axes.Both;
             }
+        }
 
-            protected class SortTabItem : TabItem<T>
+        protected class SortTabItem : TabItem<T>
+        {
+            public SortTabItem(T value)
+                : base(value)
             {
-                public SortTabItem(T value)
-                    : base(value)
+                AutoSizeAxes = Axes.Both;
+                Child = CreateTabButton(value);
+            }
+
+            [NotNull]
+            protected virtual TabButton CreateTabButton(T value) => new TabButton(value)
+            {
+                Active = { BindTarget = Active }
+            };
+
+            protected override void OnActivated()
+            {
+            }
+
+            protected override void OnDeactivated()
+            {
+            }
+        }
+
+        protected class TabButton : HeaderButton
+        {
+            public readonly BindableBool Active = new BindableBool();
+
+            protected override Container<Drawable> Content => content;
+
+            protected virtual Color4 ContentColour
+            {
+                set => text.Colour = value;
+            }
+
+            [Resolved]
+            private OverlayColourProvider colourProvider { get; set; }
+
+            private readonly SpriteText text;
+            private readonly FillFlowContainer content;
+
+            public TabButton(T value)
+            {
+                base.Content.Add(content = new FillFlowContainer
                 {
-                    AutoSizeAxes = Axes.Both;
-                    Child = CreateTabButton(value);
-                }
-
-                [NotNull]
-                protected virtual TabButton CreateTabButton(T value) => new TabButton(value)
-                {
-                    Active = { BindTarget = Active }
-                };
-
-                protected override void OnActivated()
-                {
-                }
-
-                protected override void OnDeactivated()
-                {
-                }
-
-                protected class TabButton : HeaderButton
-                {
-                    public readonly BindableBool Active = new BindableBool();
-
-                    protected override Container<Drawable> Content => content;
-
-                    protected virtual Color4 ContentColour
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Horizontal,
+                    Spacing = new Vector2(3, 0),
+                    Children = new Drawable[]
                     {
-                        set => text.Colour = value;
-                    }
-
-                    [Resolved]
-                    private OverlayColourProvider colourProvider { get; set; }
-
-                    private readonly SpriteText text;
-                    private readonly FillFlowContainer content;
-
-                    public TabButton(T value)
-                    {
-                        base.Content.Add(content = new FillFlowContainer
+                        text = new OsuSpriteText
                         {
-                            AutoSizeAxes = Axes.Both,
-                            Direction = FillDirection.Horizontal,
-                            Spacing = new Vector2(3, 0),
-                            Children = new Drawable[]
-                            {
-                                text = new OsuSpriteText
-                                {
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    Font = OsuFont.GetFont(size: 12),
-                                    Text = value.ToString()
-                                }
-                            }
-                        });
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Font = OsuFont.GetFont(size: 12),
+                            Text = value.ToString()
+                        }
                     }
+                });
+            }
 
-                    protected override void LoadComplete()
-                    {
-                        base.LoadComplete();
-                        Active.BindValueChanged(_ => UpdateState(), true);
-                    }
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                Active.BindValueChanged(_ => UpdateState(), true);
+            }
 
-                    protected override bool OnHover(HoverEvent e)
-                    {
-                        UpdateState();
-                        return true;
-                    }
+            protected override bool OnHover(HoverEvent e)
+            {
+                UpdateState();
+                return true;
+            }
 
-                    protected override void OnHoverLost(HoverLostEvent e) => UpdateState();
+            protected override void OnHoverLost(HoverLostEvent e) => UpdateState();
 
-                    protected virtual void UpdateState()
-                    {
-                        if (Active.Value || IsHovered)
-                            ShowBackground();
-                        else
-                            HideBackground();
+            protected virtual void UpdateState()
+            {
+                if (Active.Value || IsHovered)
+                    ShowBackground();
+                else
+                    HideBackground();
 
-                        ContentColour = Active.Value && !IsHovered ? colourProvider.Light1 : Color4.White;
+                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.Medium);
             }
         }
     }

From ea99b613c9c499fc21b038fe808ca57dafa07d5c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 17 Feb 2020 23:41:07 +0300
Subject: [PATCH 0574/1142] Use GridContainer for layout

---
 .../BeatmapListing/BeatmapSearchFilterRow.cs  | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
index 05578a36b5..0c4f63baca 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
@@ -32,33 +32,37 @@ namespace osu.Game.Overlays.BeatmapListing
         {
             AutoSizeAxes = Axes.Y;
             RelativeSizeAxes = Axes.X;
-            AddInternal(new FillFlowContainer
+            AddInternal(new GridContainer
             {
                 AutoSizeAxes = Axes.Y,
                 RelativeSizeAxes = Axes.X,
-                Spacing = new Vector2(0, 7),
-                Children = new Drawable[]
+                ColumnDimensions = new[]
                 {
-                    new Container
+                    new Dimension(GridSizeMode.Absolute, size: 100),
+                    new Dimension()
+                },
+                RowDimensions = new[]
+                {
+                    new Dimension(GridSizeMode.AutoSize)
+                },
+                Content = new[]
+                {
+                    new Drawable[]
                     {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        AutoSizeAxes = Axes.Y,
-                        Width = 100,
-                        Child = new OsuSpriteText
+                        new OsuSpriteText
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
                             Font = OsuFont.GetFont(size: 10),
                             Text = headerName.ToUpper()
-                        }
-                    },
-                    CreateFilter().With(f =>
-                    {
-                        f.Anchor = Anchor.CentreLeft;
-                        f.Origin = Anchor.CentreLeft;
-                        f.Current = current;
-                    })
+                        },
+                        CreateFilter().With(f =>
+                        {
+                            f.Anchor = Anchor.CentreLeft;
+                            f.Origin = Anchor.CentreLeft;
+                            f.Current = current;
+                        })
+                    }
                 }
             });
         }

From ae942388a2aeb83bf382701e83cc06f7f6c9f65e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 17 Feb 2020 23:56:35 +0300
Subject: [PATCH 0575/1142] Move OsuTabDropdown to it's own file

---
 .../Graphics/UserInterface/OsuTabControl.cs   |  97 +---------------
 .../Graphics/UserInterface/OsuTabDropdown.cs  | 107 ++++++++++++++++++
 2 files changed, 108 insertions(+), 96 deletions(-)
 create mode 100644 osu.Game/Graphics/UserInterface/OsuTabDropdown.cs

diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index 9fa6085035..6c883d9893 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Graphics.UserInterface
 
         private readonly Box strip;
 
-        protected override Dropdown<T> CreateDropdown() => new OsuTabDropdown();
+        protected override Dropdown<T> CreateDropdown() => new OsuTabDropdown<T>();
 
         protected override TabItem<T> CreateTabItem(T value) => new OsuTabItem(value);
 
@@ -180,100 +180,5 @@ namespace osu.Game.Graphics.UserInterface
 
             protected override void OnDeactivated() => fadeInactive();
         }
-
-        // todo: this needs to go
-        private class OsuTabDropdown : OsuDropdown<T>
-        {
-            public OsuTabDropdown()
-            {
-                RelativeSizeAxes = Axes.X;
-            }
-
-            protected override DropdownMenu CreateMenu() => new OsuTabDropdownMenu();
-
-            protected override DropdownHeader CreateHeader() => new OsuTabDropdownHeader
-            {
-                Anchor = Anchor.TopRight,
-                Origin = Anchor.TopRight
-            };
-
-            private class OsuTabDropdownMenu : OsuDropdownMenu
-            {
-                public OsuTabDropdownMenu()
-                {
-                    Anchor = Anchor.TopRight;
-                    Origin = Anchor.TopRight;
-
-                    BackgroundColour = Color4.Black.Opacity(0.7f);
-                    MaxHeight = 400;
-                }
-
-                protected override DrawableDropdownMenuItem CreateDrawableDropdownMenuItem(MenuItem item) => new DrawableOsuTabDropdownMenuItem(item) { AccentColour = AccentColour };
-
-                private class DrawableOsuTabDropdownMenuItem : DrawableOsuDropdownMenuItem
-                {
-                    public DrawableOsuTabDropdownMenuItem(MenuItem item)
-                        : base(item)
-                    {
-                        ForegroundColourHover = Color4.Black;
-                    }
-                }
-            }
-
-            protected class OsuTabDropdownHeader : OsuDropdownHeader
-            {
-                public override Color4 AccentColour
-                {
-                    get => base.AccentColour;
-                    set
-                    {
-                        base.AccentColour = value;
-                        Foreground.Colour = value;
-                    }
-                }
-
-                public OsuTabDropdownHeader()
-                {
-                    RelativeSizeAxes = Axes.None;
-                    AutoSizeAxes = Axes.X;
-
-                    BackgroundColour = Color4.Black.Opacity(0.5f);
-
-                    Background.Height = 0.5f;
-                    Background.CornerRadius = 5;
-                    Background.Masking = true;
-
-                    Foreground.RelativeSizeAxes = Axes.None;
-                    Foreground.AutoSizeAxes = Axes.X;
-                    Foreground.RelativeSizeAxes = Axes.Y;
-                    Foreground.Margin = new MarginPadding(5);
-
-                    Foreground.Children = new Drawable[]
-                    {
-                        new SpriteIcon
-                        {
-                            Icon = FontAwesome.Solid.EllipsisH,
-                            Size = new Vector2(14),
-                            Origin = Anchor.Centre,
-                            Anchor = Anchor.Centre,
-                        }
-                    };
-
-                    Padding = new MarginPadding { Left = 5, Right = 5 };
-                }
-
-                protected override bool OnHover(HoverEvent e)
-                {
-                    Foreground.Colour = BackgroundColour;
-                    return base.OnHover(e);
-                }
-
-                protected override void OnHoverLost(HoverLostEvent e)
-                {
-                    Foreground.Colour = BackgroundColourHover;
-                    base.OnHoverLost(e);
-                }
-            }
-        }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/OsuTabDropdown.cs b/osu.Game/Graphics/UserInterface/OsuTabDropdown.cs
new file mode 100644
index 0000000000..24b9ca8d90
--- /dev/null
+++ b/osu.Game/Graphics/UserInterface/OsuTabDropdown.cs
@@ -0,0 +1,107 @@
+// 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 osuTK.Graphics;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Events;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    public class OsuTabDropdown<T> : OsuDropdown<T>
+    {
+        public OsuTabDropdown()
+        {
+            RelativeSizeAxes = Axes.X;
+        }
+
+        protected override DropdownMenu CreateMenu() => new OsuTabDropdownMenu();
+
+        protected override DropdownHeader CreateHeader() => new OsuTabDropdownHeader
+        {
+            Anchor = Anchor.TopRight,
+            Origin = Anchor.TopRight
+        };
+
+        private class OsuTabDropdownMenu : OsuDropdownMenu
+        {
+            public OsuTabDropdownMenu()
+            {
+                Anchor = Anchor.TopRight;
+                Origin = Anchor.TopRight;
+
+                BackgroundColour = Color4.Black.Opacity(0.7f);
+                MaxHeight = 400;
+            }
+
+            protected override DrawableDropdownMenuItem CreateDrawableDropdownMenuItem(MenuItem item) => new DrawableOsuTabDropdownMenuItem(item) { AccentColour = AccentColour };
+
+            private class DrawableOsuTabDropdownMenuItem : DrawableOsuDropdownMenuItem
+            {
+                public DrawableOsuTabDropdownMenuItem(MenuItem item)
+                    : base(item)
+                {
+                    ForegroundColourHover = Color4.Black;
+                }
+            }
+        }
+
+        protected class OsuTabDropdownHeader : OsuDropdownHeader
+        {
+            public override Color4 AccentColour
+            {
+                get => base.AccentColour;
+                set
+                {
+                    base.AccentColour = value;
+                    Foreground.Colour = value;
+                }
+            }
+
+            public OsuTabDropdownHeader()
+            {
+                RelativeSizeAxes = Axes.None;
+                AutoSizeAxes = Axes.X;
+
+                BackgroundColour = Color4.Black.Opacity(0.5f);
+
+                Background.Height = 0.5f;
+                Background.CornerRadius = 5;
+                Background.Masking = true;
+
+                Foreground.RelativeSizeAxes = Axes.None;
+                Foreground.AutoSizeAxes = Axes.X;
+                Foreground.RelativeSizeAxes = Axes.Y;
+                Foreground.Margin = new MarginPadding(5);
+
+                Foreground.Children = new Drawable[]
+                {
+                    new SpriteIcon
+                    {
+                        Icon = FontAwesome.Solid.EllipsisH,
+                        Size = new Vector2(14),
+                        Origin = Anchor.Centre,
+                        Anchor = Anchor.Centre,
+                    }
+                };
+
+                Padding = new MarginPadding { Left = 5, Right = 5 };
+            }
+
+            protected override bool OnHover(HoverEvent e)
+            {
+                Foreground.Colour = BackgroundColour;
+                return base.OnHover(e);
+            }
+
+            protected override void OnHoverLost(HoverLostEvent e)
+            {
+                Foreground.Colour = BackgroundColourHover;
+                base.OnHoverLost(e);
+            }
+        }
+    }
+}

From 410686c8b9dfbe393f23b3bbc1cefb21c499da40 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 18 Feb 2020 01:04:25 +0300
Subject: [PATCH 0576/1142] Use dropdown in BeatmapSearchFilterRow

---
 .../TestSceneBeatmapSearchFilter.cs           |  5 +-
 .../BeatmapListing/BeatmapSearchFilterRow.cs  | 46 ++++++++++++++-----
 2 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs
index 30cd34be50..7b4424e568 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapSearchFilter.cs
@@ -7,6 +7,7 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.Containers;
 using osu.Game.Online.API.Requests;
 using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapListing;
@@ -26,11 +27,11 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
-        private readonly FillFlowContainer resizableContainer;
+        private readonly ReverseChildIDFillFlowContainer<Drawable> resizableContainer;
 
         public TestSceneBeatmapSearchFilter()
         {
-            Add(resizableContainer = new FillFlowContainer
+            Add(resizableContainer = new ReverseChildIDFillFlowContainer<Drawable>
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
index 0c4f63baca..8be0fca629 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
@@ -51,15 +51,13 @@ namespace osu.Game.Overlays.BeatmapListing
                     {
                         new OsuSpriteText
                         {
-                            Anchor = Anchor.CentreLeft,
-                            Origin = Anchor.CentreLeft,
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft,
                             Font = OsuFont.GetFont(size: 10),
                             Text = headerName.ToUpper()
                         },
                         CreateFilter().With(f =>
                         {
-                            f.Anchor = Anchor.CentreLeft;
-                            f.Origin = Anchor.CentreLeft;
                             f.Current = current;
                         })
                     }
@@ -74,7 +72,12 @@ namespace osu.Game.Overlays.BeatmapListing
         {
             public BeatmapSearchFilter()
             {
-                AutoSizeAxes = Axes.Both;
+                Anchor = Anchor.BottomLeft;
+                Origin = Anchor.BottomLeft;
+                RelativeSizeAxes = Axes.X;
+                Height = 15;
+
+                TabContainer.Spacing = new Vector2(10, 0);
 
                 if (typeof(T).IsEnum)
                 {
@@ -83,16 +86,16 @@ namespace osu.Game.Overlays.BeatmapListing
                 }
             }
 
-            protected override Dropdown<T> CreateDropdown() => null;
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                ((FilterDropdown)Dropdown).AccentColour = colourProvider.Light2;
+            }
+
+            protected override Dropdown<T> CreateDropdown() => new FilterDropdown();
 
             protected override TabItem<T> CreateTabItem(T value) => new FilterTabItem(value);
 
-            protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
-            {
-                AutoSizeAxes = Axes.Both,
-                Spacing = new Vector2(10),
-            };
-
             protected class FilterTabItem : TabItem<T>
             {
                 protected virtual float TextSize => 13;
@@ -106,6 +109,8 @@ namespace osu.Game.Overlays.BeatmapListing
                     : base(value)
                 {
                     AutoSizeAxes = Axes.Both;
+                    Anchor = Anchor.BottomLeft;
+                    Origin = Anchor.BottomLeft;
                     AddRangeInternal(new Drawable[]
                     {
                         text = new OsuSpriteText
@@ -148,6 +153,23 @@ namespace osu.Game.Overlays.BeatmapListing
 
                 private Color4 getStateColour() => IsHovered ? colourProvider.Light1 : colourProvider.Light3;
             }
+
+            private class FilterDropdown : OsuTabDropdown<T>
+            {
+                protected override DropdownHeader CreateHeader() => new FilterHeader
+                {
+                    Anchor = Anchor.TopRight,
+                    Origin = Anchor.TopRight
+                };
+
+                private class FilterHeader : OsuTabDropdownHeader
+                {
+                    public FilterHeader()
+                    {
+                        Background.Height = 1;
+                    }
+                }
+            }
         }
     }
 }

From 316c6b2a945ad9c7524d53e23de15eb0b29a87ec Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 18 Feb 2020 01:17:12 +0300
Subject: [PATCH 0577/1142] Simplify RulesetInfo string presentation

---
 .../BeatmapListing/BeatmapSearchFilterRow.cs        |  4 +---
 .../BeatmapListing/BeatmapSearchRulesetFilterRow.cs | 13 -------------
 osu.Game/Rulesets/RulesetInfo.cs                    |  2 +-
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
index 8be0fca629..2c046a2bbf 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchFilterRow.cs
@@ -116,7 +116,7 @@ namespace osu.Game.Overlays.BeatmapListing
                         text = new OsuSpriteText
                         {
                             Font = OsuFont.GetFont(size: TextSize, weight: FontWeight.Regular),
-                            Text = GetText(value)
+                            Text = (value as Enum)?.GetDescription() ?? value.ToString()
                         },
                         new HoverClickSounds()
                     });
@@ -130,8 +130,6 @@ namespace osu.Game.Overlays.BeatmapListing
                     updateState();
                 }
 
-                protected virtual string GetText(T value) => (value as Enum)?.GetDescription() ?? value.ToString();
-
                 protected override bool OnHover(HoverEvent e)
                 {
                     base.OnHover(e);
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapSearchRulesetFilterRow.cs b/osu.Game/Overlays/BeatmapListing/BeatmapSearchRulesetFilterRow.cs
index d30364ab0d..eebd896cf9 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapSearchRulesetFilterRow.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapSearchRulesetFilterRow.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Graphics.UserInterface;
 using osu.Game.Rulesets;
 
 namespace osu.Game.Overlays.BeatmapListing
@@ -29,18 +28,6 @@ namespace osu.Game.Overlays.BeatmapListing
                 foreach (var r in rulesets.AvailableRulesets)
                     AddItem(r);
             }
-
-            protected override TabItem<RulesetInfo> CreateTabItem(RulesetInfo value) => new RulesetTabItem(value);
-
-            private class RulesetTabItem : FilterTabItem
-            {
-                public RulesetTabItem(RulesetInfo value)
-                    : base(value)
-                {
-                }
-
-                protected override string GetText(RulesetInfo value) => value.Name;
-            }
         }
     }
 }
diff --git a/osu.Game/Rulesets/RulesetInfo.cs b/osu.Game/Rulesets/RulesetInfo.cs
index ececc18c96..afd499cb9e 100644
--- a/osu.Game/Rulesets/RulesetInfo.cs
+++ b/osu.Game/Rulesets/RulesetInfo.cs
@@ -50,6 +50,6 @@ namespace osu.Game.Rulesets
             }
         }
 
-        public override string ToString() => $"{Name} ({ShortName}) ID: {ID}";
+        public override string ToString() => Name ?? $"{Name} ({ShortName}) ID: {ID}";
     }
 }

From a4891c13e460d1df77e4d2c26ec55fdb4572bd88 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Tue, 18 Feb 2020 09:17:04 +0900
Subject: [PATCH 0578/1142] Fix typo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6071e3f473..6cc110280c 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ If your platform is not listed above, there is still a chance you can manually b
 
 ## Developing or debugging
 
-Please make sure you have the following preqreuisites:
+Please make sure you have the following prerequisites:
 
 - A desktop platform with the [.NET Core 3.1 SDK](https://dotnet.microsoft.com/download) or higher installed.
 - When developing with mobile, [Xamarin](https://docs.microsoft.com/en-us/xamarin/) is required, which is shipped together with Visual Studio or [Visual Studio for Mac](https://visualstudio.microsoft.com/vs/mac/).

From c51e5a8c1d0499cfb52640c02eb3ae1af0a9b502 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 Feb 2020 12:11:30 +0900
Subject: [PATCH 0579/1142] Fix osu!catch fruit exploding multiple timed is
 skin is changed during explode animation

---
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 1de0b6bfa3..62a7b6f0ab 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -63,6 +63,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
             if (result.IsHit && fruit.CanBePlated)
             {
+                // create a new (cloned) fruit to stay on the plate. the original is faded out immediately.
                 var caughtFruit = (DrawableCatchHitObject)CreateDrawableRepresentation?.Invoke(fruit.HitObject);
 
                 if (caughtFruit == null) return;
@@ -442,14 +443,22 @@ namespace osu.Game.Rulesets.Catch.UI
                     ExplodingFruitTarget.Add(fruit);
                 }
 
-                fruit.ClearTransforms();
-                fruit.MoveToY(fruit.Y - 50, 250, Easing.OutSine).Then().MoveToY(fruit.Y + 50, 500, Easing.InSine);
-                fruit.MoveToX(fruit.X + originalX * 6, 1000);
-                fruit.FadeOut(750);
+                double explodeTime = Clock.CurrentTime;
 
-                // todo: this shouldn't exist once DrawableHitObject's ClearTransformsAfter overrides are repaired.
-                fruit.LifetimeStart = Time.Current;
-                fruit.Expire();
+                fruit.ApplyCustomUpdateState += onFruitOnApplyCustomUpdateState;
+                onFruitOnApplyCustomUpdateState(fruit, fruit.State.Value);
+
+                void onFruitOnApplyCustomUpdateState(DrawableHitObject o, ArmedState state)
+                {
+                    using (fruit.BeginAbsoluteSequence(explodeTime))
+                    {
+                        fruit.MoveToY(fruit.Y - 50, 250, Easing.OutSine).Then().MoveToY(fruit.Y + 50, 500, Easing.InSine);
+                        fruit.MoveToX(fruit.X + originalX * 6, 1000);
+                        fruit.FadeOut(750);
+                    }
+
+                    fruit.Expire();
+                }
             }
 
             public void UpdatePosition(float position)

From b4887f912071713ccbaa70ad4d5b2ff405073e32 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 Feb 2020 12:24:22 +0900
Subject: [PATCH 0580/1142] Fix dropping fruit as well (with tidying along the
 way)

---
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs | 71 ++++++++++-------------
 1 file changed, 32 insertions(+), 39 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 62a7b6f0ab..cfe2a3abd2 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -389,32 +389,24 @@ namespace osu.Game.Rulesets.Catch.UI
                 }
             }
 
+            public void UpdatePosition(float position)
+            {
+                position = Math.Clamp(position, 0, 1);
+
+                if (position == X)
+                    return;
+
+                Scale = new Vector2(Math.Abs(Scale.X) * (position > X ? 1 : -1), Scale.Y);
+                X = position;
+            }
+
             /// <summary>
             /// Drop any fruit off the plate.
             /// </summary>
             public void Drop()
             {
-                var fruit = caughtFruit.ToArray();
-
-                foreach (var f in fruit)
-                {
-                    if (ExplodingFruitTarget != null)
-                    {
-                        f.Anchor = Anchor.TopLeft;
-                        f.Position = caughtFruit.ToSpaceOfOtherDrawable(f.DrawPosition, ExplodingFruitTarget);
-
-                        caughtFruit.Remove(f);
-
-                        ExplodingFruitTarget.Add(f);
-                    }
-
-                    f.MoveToY(f.Y + 75, 750, Easing.InSine);
-                    f.FadeOut(750);
-
-                    // todo: this shouldn't exist once DrawableHitObject's ClearTransformsAfter overrides are repaired.
-                    f.LifetimeStart = Time.Current;
-                    f.Expire();
-                }
+                foreach (var f in caughtFruit.ToArray())
+                    Drop(f);
             }
 
             /// <summary>
@@ -426,10 +418,26 @@ namespace osu.Game.Rulesets.Catch.UI
                     Explode(f);
             }
 
+            public void Drop(DrawableHitObject fruit) => removeFromPlatWithTransform(fruit, f =>
+            {
+                f.MoveToY(f.Y + 75, 750, Easing.InSine);
+                f.FadeOut(750);
+            });
+
             public void Explode(DrawableHitObject fruit)
             {
                 var originalX = fruit.X * Scale.X;
 
+                removeFromPlatWithTransform(fruit, f =>
+                {
+                    f.MoveToY(f.Y - 50, 250, Easing.OutSine).Then().MoveToY(f.Y + 50, 500, Easing.InSine);
+                    f.MoveToX(f.X + originalX * 6, 1000);
+                    f.FadeOut(750);
+                });
+            }
+
+            private void removeFromPlatWithTransform(DrawableHitObject fruit, Action<DrawableHitObject> action)
+            {
                 if (ExplodingFruitTarget != null)
                 {
                     fruit.Anchor = Anchor.TopLeft;
@@ -443,34 +451,19 @@ namespace osu.Game.Rulesets.Catch.UI
                     ExplodingFruitTarget.Add(fruit);
                 }
 
-                double explodeTime = Clock.CurrentTime;
+                double actionTime = Clock.CurrentTime;
 
                 fruit.ApplyCustomUpdateState += onFruitOnApplyCustomUpdateState;
                 onFruitOnApplyCustomUpdateState(fruit, fruit.State.Value);
 
                 void onFruitOnApplyCustomUpdateState(DrawableHitObject o, ArmedState state)
                 {
-                    using (fruit.BeginAbsoluteSequence(explodeTime))
-                    {
-                        fruit.MoveToY(fruit.Y - 50, 250, Easing.OutSine).Then().MoveToY(fruit.Y + 50, 500, Easing.InSine);
-                        fruit.MoveToX(fruit.X + originalX * 6, 1000);
-                        fruit.FadeOut(750);
-                    }
+                    using (fruit.BeginAbsoluteSequence(actionTime))
+                        action(fruit);
 
                     fruit.Expire();
                 }
             }
-
-            public void UpdatePosition(float position)
-            {
-                position = Math.Clamp(position, 0, 1);
-
-                if (position == X)
-                    return;
-
-                Scale = new Vector2(Math.Abs(Scale.X) * (position > X ? 1 : -1), Scale.Y);
-                X = position;
-            }
         }
     }
 }

From ee13632375ea570a6da28e0926f908d8e3bdc4b9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 18 Feb 2020 13:21:55 +0900
Subject: [PATCH 0581/1142] Fix ogg beatmap/skin samples not loading

---
 .../Resources/Archives/ogg-beatmap.osz        | Bin 0 -> 6428 bytes
 .../Resources/Archives/ogg-skin.osk           | Bin 0 -> 3429 bytes
 .../Skins/TestSceneBeatmapSkinResources.cs    |  37 ++++++++++++++++++
 .../Skins/TestSceneSkinResources.cs           |  33 ++++++++++++++++
 osu.Game/Skinning/LegacySkin.cs               |   2 +
 5 files changed, 72 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/Archives/ogg-beatmap.osz
 create mode 100644 osu.Game.Tests/Resources/Archives/ogg-skin.osk
 create mode 100644 osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs
 create mode 100644 osu.Game.Tests/Skins/TestSceneSkinResources.cs

diff --git a/osu.Game.Tests/Resources/Archives/ogg-beatmap.osz b/osu.Game.Tests/Resources/Archives/ogg-beatmap.osz
new file mode 100644
index 0000000000000000000000000000000000000000..f264a8dda23f57f24acdef7b6838b71747f02186
GIT binary patch
literal 6428
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
TKSOu2l$P4use+QZPM-b)-C={F

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Resources/Archives/ogg-skin.osk b/osu.Game.Tests/Resources/Archives/ogg-skin.osk
new file mode 100644
index 0000000000000000000000000000000000000000..d7379446aac247b2310c38b3870dfddd1a2ed07b
GIT binary patch
literal 3429
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
SF}9;xmcw!UuoA_6wEGvU{_X4l

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs b/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs
new file mode 100644
index 0000000000..4d3b73fb32
--- /dev/null
+++ b/osu.Game.Tests/Skins/TestSceneBeatmapSkinResources.cs
@@ -0,0 +1,37 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Audio.Track;
+using osu.Framework.Testing;
+using osu.Game.Audio;
+using osu.Game.Beatmaps;
+using osu.Game.IO.Archives;
+using osu.Game.Tests.Resources;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.Skins
+{
+    [HeadlessTest]
+    public class TestSceneBeatmapSkinResources : OsuTestScene
+    {
+        [Resolved]
+        private BeatmapManager beatmaps { get; set; }
+
+        private WorkingBeatmap beatmap;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            var imported = beatmaps.Import(new ZipArchiveReader(TestResources.OpenResource("Archives/ogg-beatmap.osz"))).Result;
+            beatmap = beatmaps.GetWorkingBeatmap(imported.Beatmaps[0]);
+        }
+
+        [Test]
+        public void TestRetrieveOggSample() => AddAssert("sample is non-null", () => beatmap.Skin.GetSample(new SampleInfo("sample")) != null);
+
+        [Test]
+        public void TestRetrieveOggTrack() => AddAssert("track is non-null", () => !(beatmap.Track is TrackVirtual));
+    }
+}
diff --git a/osu.Game.Tests/Skins/TestSceneSkinResources.cs b/osu.Game.Tests/Skins/TestSceneSkinResources.cs
new file mode 100644
index 0000000000..107a96292f
--- /dev/null
+++ b/osu.Game.Tests/Skins/TestSceneSkinResources.cs
@@ -0,0 +1,33 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Testing;
+using osu.Game.Audio;
+using osu.Game.IO.Archives;
+using osu.Game.Skinning;
+using osu.Game.Tests.Resources;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tests.Skins
+{
+    [HeadlessTest]
+    public class TestSceneSkinResources : OsuTestScene
+    {
+        [Resolved]
+        private SkinManager skins { get; set; }
+
+        private ISkin skin;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            var imported = skins.Import(new ZipArchiveReader(TestResources.OpenResource("Archives/ogg-skin.osk"))).Result;
+            skin = skins.GetSkin(imported);
+        }
+
+        [Test]
+        public void TestRetrieveOggSample() => AddAssert("sample is non-null", () => skin.GetSample(new SampleInfo("sample")) != null);
+    }
+}
diff --git a/osu.Game/Skinning/LegacySkin.cs b/osu.Game/Skinning/LegacySkin.cs
index 94611317d5..29bcd2e210 100644
--- a/osu.Game/Skinning/LegacySkin.cs
+++ b/osu.Game/Skinning/LegacySkin.cs
@@ -54,6 +54,8 @@ namespace osu.Game.Skinning
             {
                 Samples = audioManager?.GetSampleStore(storage);
                 Textures = new TextureStore(new TextureLoaderStore(storage));
+
+                (storage as ResourceStore<byte[]>)?.AddExtension("ogg");
             }
         }
 

From 79f3249d370ab7f1d8d549fc61a31103e6ee2c84 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 Feb 2020 13:40:50 +0900
Subject: [PATCH 0582/1142] Fix typo in method

---
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index cfe2a3abd2..8fdea8a4ef 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -418,7 +418,7 @@ namespace osu.Game.Rulesets.Catch.UI
                     Explode(f);
             }
 
-            public void Drop(DrawableHitObject fruit) => removeFromPlatWithTransform(fruit, f =>
+            public void Drop(DrawableHitObject fruit) => removeFromPlateWithTransform(fruit, f =>
             {
                 f.MoveToY(f.Y + 75, 750, Easing.InSine);
                 f.FadeOut(750);
@@ -428,7 +428,7 @@ namespace osu.Game.Rulesets.Catch.UI
             {
                 var originalX = fruit.X * Scale.X;
 
-                removeFromPlatWithTransform(fruit, f =>
+                removeFromPlateWithTransform(fruit, f =>
                 {
                     f.MoveToY(f.Y - 50, 250, Easing.OutSine).Then().MoveToY(f.Y + 50, 500, Easing.InSine);
                     f.MoveToX(f.X + originalX * 6, 1000);
@@ -436,7 +436,7 @@ namespace osu.Game.Rulesets.Catch.UI
                 });
             }
 
-            private void removeFromPlatWithTransform(DrawableHitObject fruit, Action<DrawableHitObject> action)
+            private void removeFromPlateWithTransform(DrawableHitObject fruit, Action<DrawableHitObject> action)
             {
                 if (ExplodingFruitTarget != null)
                 {

From b7849dd91acf398f7433519f1461702c4d185f65 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 Feb 2020 18:47:21 +0900
Subject: [PATCH 0583/1142] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index cb044afcc6..b9b127309a 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -54,6 +54,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.216.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.218.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 5e78c69f4d..bd5219b872 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.216.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.218.0" />
     <PackageReference Include="Sentry" Version="2.0.3" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 351126e3b9..2c1aff7d3c 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -74,7 +74,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.216.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.218.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
@@ -82,7 +82,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.216.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.218.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From a1bfb18ce04fbd752c5d6f622893d7a21ad87f51 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 Feb 2020 19:00:02 +0900
Subject: [PATCH 0584/1142] Fix accessing incorrect items list in event

---
 osu.Game/Rulesets/Objects/SliderPath.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/SliderPath.cs b/osu.Game/Rulesets/Objects/SliderPath.cs
index ff5f1e3e1e..d577e8fdda 100644
--- a/osu.Game/Rulesets/Objects/SliderPath.cs
+++ b/osu.Game/Rulesets/Objects/SliderPath.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Rulesets.Objects
                         break;
 
                     case NotifyCollectionChangedAction.Remove:
-                        foreach (var c in args.NewItems.Cast<PathControlPoint>())
+                        foreach (var c in args.OldItems.Cast<PathControlPoint>())
                             c.Changed -= invalidate;
                         break;
                 }

From 2f4c252fc09df0325c7c6d9c459222b3b395443b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 18 Feb 2020 19:19:04 +0900
Subject: [PATCH 0585/1142] Fix playlist items potentially not updating to the
 correct selected state

---
 osu.Game/Overlays/Music/PlaylistItem.cs | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Overlays/Music/PlaylistItem.cs b/osu.Game/Overlays/Music/PlaylistItem.cs
index 8cafbc694a..de2f916946 100644
--- a/osu.Game/Overlays/Music/PlaylistItem.cs
+++ b/osu.Game/Overlays/Music/PlaylistItem.cs
@@ -26,8 +26,9 @@ namespace osu.Game.Overlays.Music
 
         private TextFlowContainer text;
         private IEnumerable<Drawable> titleSprites;
-        private ILocalisedBindableString titleBind;
-        private ILocalisedBindableString artistBind;
+
+        private ILocalisedBindableString title;
+        private ILocalisedBindableString artist;
 
         private Color4 selectedColour;
         private Color4 artistColour;
@@ -47,24 +48,24 @@ namespace osu.Game.Overlays.Music
             artistColour = colours.Gray9;
             HandleColour = colours.Gray5;
 
-            titleBind = localisation.GetLocalisedString(new LocalisedString((Model.Metadata.TitleUnicode, Model.Metadata.Title)));
-            artistBind = localisation.GetLocalisedString(new LocalisedString((Model.Metadata.ArtistUnicode, Model.Metadata.Artist)));
+            title = localisation.GetLocalisedString(new LocalisedString((Model.Metadata.TitleUnicode, Model.Metadata.Title)));
+            artist = localisation.GetLocalisedString(new LocalisedString((Model.Metadata.ArtistUnicode, Model.Metadata.Artist)));
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
+            artist.BindValueChanged(_ => recreateText(), true);
+
             SelectedSet.BindValueChanged(set =>
             {
-                if (set.OldValue != Model && set.NewValue != Model)
+                if (set.OldValue?.Equals(Model) != true && set.NewValue?.Equals(Model) != true)
                     return;
 
                 foreach (Drawable s in titleSprites)
-                    s.FadeColour(set.NewValue == Model ? selectedColour : Color4.White, FADE_DURATION);
+                    s.FadeColour(set.NewValue.Equals(Model) ? selectedColour : Color4.White, FADE_DURATION);
             }, true);
-
-            artistBind.BindValueChanged(_ => recreateText(), true);
         }
 
         protected override Drawable CreateContent() => text = new OsuTextFlowContainer
@@ -78,9 +79,9 @@ namespace osu.Game.Overlays.Music
             text.Clear();
 
             //space after the title to put a space between the title and artist
-            titleSprites = text.AddText(titleBind.Value + @"  ", sprite => sprite.Font = OsuFont.GetFont(weight: FontWeight.Regular)).OfType<SpriteText>();
+            titleSprites = text.AddText(title.Value + @"  ", sprite => sprite.Font = OsuFont.GetFont(weight: FontWeight.Regular)).OfType<SpriteText>();
 
-            text.AddText(artistBind.Value, sprite =>
+            text.AddText(artist.Value, sprite =>
             {
                 sprite.Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold);
                 sprite.Colour = artistColour;

From c7d64d00156d6a20415d841855f5c073f421bcde Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 18 Feb 2020 13:37:59 +0300
Subject: [PATCH 0586/1142] Update BindableList usage in DrawableComment

---
 osu.Game/Overlays/Comments/DrawableComment.cs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index 7774921f00..cb9e32f1ad 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -21,6 +21,7 @@ using System.Collections.Generic;
 using System;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Extensions.IEnumerableExtensions;
+using System.Collections.Specialized;
 
 namespace osu.Game.Overlays.Comments
 {
@@ -269,10 +270,21 @@ namespace osu.Game.Overlays.Comments
                 });
             }
 
-            Replies.ItemsAdded += onRepliesAdded;
-
             if (Replies.Any())
                 onRepliesAdded(Replies);
+
+            Replies.CollectionChanged += (_, args) =>
+            {
+                switch (args.Action)
+                {
+                    case NotifyCollectionChangedAction.Add:
+                        onRepliesAdded(args.NewItems.Cast<DrawableComment>());
+                        break;
+
+                    default:
+                        throw new NotSupportedException(@"You can only add replies to this list. Other actions are not supported.");
+                }
+            };
         }
 
         protected override void LoadComplete()

From 7228900361b1f753b3b8e07e0d195eb7675c27e7 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 18 Feb 2020 17:25:12 +0300
Subject: [PATCH 0587/1142] Implement BeatmapListingSearchSection component

---
 .../TestSceneBeatmapListingSearchSection.cs   |  61 ++++++++++
 .../BeatmapListingSearchSection.cs            | 114 ++++++++++++++++++
 2 files changed, 175 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchSection.cs
 create mode 100644 osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchSection.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchSection.cs
new file mode 100644
index 0000000000..24dc013940
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchSection.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 System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
+using osu.Game.Overlays;
+using osu.Game.Overlays.BeatmapListing;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneBeatmapListingSearchSection : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(BeatmapListingSearchSection),
+        };
+
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+
+        public TestSceneBeatmapListingSearchSection()
+        {
+            BeatmapListingSearchSection section;
+
+            Add(section = new BeatmapListingSearchSection
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            });
+
+            var beatmapSet = new BeatmapSetInfo
+            {
+                OnlineInfo = new BeatmapSetOnlineInfo
+                {
+                    Covers = new BeatmapSetOnlineCovers
+                    {
+                        Cover = "https://assets.ppy.sh/beatmaps/1094296/covers/cover@2x.jpg?1581416305"
+                    }
+                }
+            };
+
+            var noCoverBeatmapSet = new BeatmapSetInfo
+            {
+                OnlineInfo = new BeatmapSetOnlineInfo
+                {
+                    Covers = new BeatmapSetOnlineCovers
+                    {
+                        Cover = string.Empty
+                    }
+                }
+            };
+
+            AddStep("Set beatmap", () => section.BeatmapSet = beatmapSet);
+            AddStep("Set beatmap (no cover)", () => section.BeatmapSet = noCoverBeatmapSet);
+            AddStep("Set null beatmap", () => section.BeatmapSet = null);
+        }
+    }
+}
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
new file mode 100644
index 0000000000..16204c3e38
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
@@ -0,0 +1,114 @@
+// 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.Online.API.Requests;
+using osu.Game.Rulesets;
+using osuTK;
+using osu.Framework.Bindables;
+using osu.Game.Beatmaps.Drawables;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+    public class BeatmapListingSearchSection : CompositeDrawable
+    {
+        public Bindable<string> Query => textBox.Current;
+
+        public Bindable<RulesetInfo> Ruleset => modeFilter.Current;
+
+        public Bindable<BeatmapSearchCategory> Category => categoryFilter.Current;
+
+        public BeatmapSetInfo BeatmapSet
+        {
+            set
+            {
+                if (value == null)
+                {
+                    beatmapCover.FadeOut(600, Easing.OutQuint);
+                    return;
+                }
+
+                beatmapCover.BeatmapSet = value;
+                beatmapCover.FadeTo(0.1f, 200, Easing.OutQuint);
+            }
+        }
+
+        private readonly SearchTextBox textBox;
+        private readonly BeatmapSearchRulesetFilterRow modeFilter;
+        private readonly BeatmapSearchFilterRow<BeatmapSearchCategory> categoryFilter;
+
+        private readonly Box background;
+        private readonly UpdateableBeatmapSetCover beatmapCover;
+
+        public BeatmapListingSearchSection()
+        {
+            AutoSizeAxes = Axes.Y;
+            RelativeSizeAxes = Axes.X;
+            AddRangeInternal(new Drawable[]
+            {
+                background = new Box
+                {
+                    RelativeSizeAxes = Axes.Both
+                },
+                new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    Child = beatmapCover = new UpdateableBeatmapSetCover
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Alpha = 0,
+                    }
+                },
+                new Container
+                {
+                    AutoSizeAxes = Axes.Y,
+                    RelativeSizeAxes = Axes.X,
+                    Padding = new MarginPadding
+                    {
+                        Vertical = 20,
+                        Horizontal = 40,
+                    },
+                    Child = new FillFlowContainer
+                    {
+                        AutoSizeAxes = Axes.Y,
+                        RelativeSizeAxes = Axes.X,
+                        Direction = FillDirection.Vertical,
+                        Spacing = new Vector2(0, 20),
+                        Children = new Drawable[]
+                        {
+                            textBox = new SearchTextBox
+                            {
+                                RelativeSizeAxes = Axes.X,
+                            },
+                            new ReverseChildIDFillFlowContainer<Drawable>
+                            {
+                                AutoSizeAxes = Axes.Y,
+                                RelativeSizeAxes = Axes.X,
+                                Direction = FillDirection.Vertical,
+                                Padding = new MarginPadding { Horizontal = 10 },
+                                Children = new Drawable[]
+                                {
+                                    modeFilter = new BeatmapSearchRulesetFilterRow(),
+                                    categoryFilter = new BeatmapSearchFilterRow<BeatmapSearchCategory>(@"Categories"),
+                                }
+                            }
+                        }
+                    }
+                }
+            });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            background.Colour = colourProvider.Dark6;
+        }
+    }
+}

From b6423dd92ed8d30469fd335cc320de9589a5cb6b Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 18 Feb 2020 17:40:12 +0300
Subject: [PATCH 0588/1142] Small textbox adjustments

---
 .../Graphics/UserInterface/SearchTextBox.cs     | 16 +++++++---------
 .../BeatmapListingSearchSection.cs              | 17 ++++++++++++++---
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/SearchTextBox.cs b/osu.Game/Graphics/UserInterface/SearchTextBox.cs
index fe8756a4d2..fe92054d25 100644
--- a/osu.Game/Graphics/UserInterface/SearchTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/SearchTextBox.cs
@@ -17,18 +17,16 @@ namespace osu.Game.Graphics.UserInterface
         public SearchTextBox()
         {
             Height = 35;
-            AddRange(new Drawable[]
+            Add(new SpriteIcon
             {
-                new SpriteIcon
-                {
-                    Icon = FontAwesome.Solid.Search,
-                    Origin = Anchor.CentreRight,
-                    Anchor = Anchor.CentreRight,
-                    Margin = new MarginPadding { Right = 10 },
-                    Size = new Vector2(20),
-                }
+                Icon = FontAwesome.Solid.Search,
+                Origin = Anchor.CentreRight,
+                Anchor = Anchor.CentreRight,
+                Margin = new MarginPadding { Right = 10 },
+                Size = new Vector2(20),
             });
 
+            TextFlow.Padding = new MarginPadding { Right = 35 };
             PlaceholderText = "type to search";
         }
 
diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
index 16204c3e38..f47144e5d8 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
@@ -13,6 +13,7 @@ using osu.Game.Beatmaps.Drawables;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays.BeatmapListing
 {
@@ -28,7 +29,7 @@ namespace osu.Game.Overlays.BeatmapListing
         {
             set
             {
-                if (value == null)
+                if (value == null || string.IsNullOrEmpty(value.OnlineInfo.Covers.Cover))
                 {
                     beatmapCover.FadeOut(600, Easing.OutQuint);
                     return;
@@ -39,7 +40,7 @@ namespace osu.Game.Overlays.BeatmapListing
             }
         }
 
-        private readonly SearchTextBox textBox;
+        private readonly BeatmapSearchTextBox textBox;
         private readonly BeatmapSearchRulesetFilterRow modeFilter;
         private readonly BeatmapSearchFilterRow<BeatmapSearchCategory> categoryFilter;
 
@@ -83,7 +84,7 @@ namespace osu.Game.Overlays.BeatmapListing
                         Spacing = new Vector2(0, 20),
                         Children = new Drawable[]
                         {
-                            textBox = new SearchTextBox
+                            textBox = new BeatmapSearchTextBox
                             {
                                 RelativeSizeAxes = Axes.X,
                             },
@@ -110,5 +111,15 @@ namespace osu.Game.Overlays.BeatmapListing
         {
             background.Colour = colourProvider.Dark6;
         }
+
+        private class BeatmapSearchTextBox : SearchTextBox
+        {
+            protected override Color4 SelectionColour => Color4.Gray;
+
+            public BeatmapSearchTextBox()
+            {
+                PlaceholderText = @"type in keywords...";
+            }
+        }
     }
 }

From bb22243903bdbaeee9efaca0d2a8fbc41f7657ac Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 18 Feb 2020 17:47:44 +0300
Subject: [PATCH 0589/1142] TestScene improvements

---
 .../TestSceneBeatmapListingSearchSection.cs   | 69 +++++++++++++------
 1 file changed, 49 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchSection.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchSection.cs
index 24dc013940..8e9123fe8d 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchSection.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchSection.cs
@@ -3,11 +3,15 @@
 
 using System;
 using System.Collections.Generic;
+using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Overlays;
 using osu.Game.Overlays.BeatmapListing;
+using osuTK;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
@@ -21,9 +25,13 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
+        private readonly BeatmapListingSearchSection section;
+
         public TestSceneBeatmapListingSearchSection()
         {
-            BeatmapListingSearchSection section;
+            OsuSpriteText query;
+            OsuSpriteText ruleset;
+            OsuSpriteText category;
 
             Add(section = new BeatmapListingSearchSection
             {
@@ -31,31 +39,52 @@ namespace osu.Game.Tests.Visual.UserInterface
                 Origin = Anchor.Centre,
             });
 
-            var beatmapSet = new BeatmapSetInfo
+            Add(new FillFlowContainer
             {
-                OnlineInfo = new BeatmapSetOnlineInfo
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 5),
+                Children = new Drawable[]
                 {
-                    Covers = new BeatmapSetOnlineCovers
-                    {
-                        Cover = "https://assets.ppy.sh/beatmaps/1094296/covers/cover@2x.jpg?1581416305"
-                    }
+                    query = new OsuSpriteText(),
+                    ruleset = new OsuSpriteText(),
+                    category = new OsuSpriteText(),
                 }
-            };
+            });
 
-            var noCoverBeatmapSet = new BeatmapSetInfo
-            {
-                OnlineInfo = new BeatmapSetOnlineInfo
-                {
-                    Covers = new BeatmapSetOnlineCovers
-                    {
-                        Cover = string.Empty
-                    }
-                }
-            };
+            section.Query.BindValueChanged(q => query.Text = $"Query: {q.NewValue}", true);
+            section.Ruleset.BindValueChanged(r => ruleset.Text = $"Ruleset: {r.NewValue}", true);
+            section.Category.BindValueChanged(c => category.Text = $"Category: {c.NewValue}", true);
+        }
 
-            AddStep("Set beatmap", () => section.BeatmapSet = beatmapSet);
-            AddStep("Set beatmap (no cover)", () => section.BeatmapSet = noCoverBeatmapSet);
+        [Test]
+        public void TestCovers()
+        {
+            AddStep("Set beatmap", () => section.BeatmapSet = beatmap_set);
+            AddStep("Set beatmap (no cover)", () => section.BeatmapSet = no_cover_beatmap_set);
             AddStep("Set null beatmap", () => section.BeatmapSet = null);
         }
+
+        private static BeatmapSetInfo beatmap_set = new BeatmapSetInfo
+        {
+            OnlineInfo = new BeatmapSetOnlineInfo
+            {
+                Covers = new BeatmapSetOnlineCovers
+                {
+                    Cover = "https://assets.ppy.sh/beatmaps/1094296/covers/cover@2x.jpg?1581416305"
+                }
+            }
+        };
+
+        private static BeatmapSetInfo no_cover_beatmap_set = new BeatmapSetInfo
+        {
+            OnlineInfo = new BeatmapSetOnlineInfo
+            {
+                Covers = new BeatmapSetOnlineCovers
+                {
+                    Cover = string.Empty
+                }
+            }
+        };
     }
 }

From 37003e11b98ca1f70215c9e7706b0d6d1d0478c8 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 18 Feb 2020 18:04:39 +0300
Subject: [PATCH 0590/1142] Make fields readonly

---
 .../UserInterface/TestSceneBeatmapListingSearchSection.cs     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchSection.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchSection.cs
index 8e9123fe8d..1d8db71527 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchSection.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSearchSection.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             AddStep("Set null beatmap", () => section.BeatmapSet = null);
         }
 
-        private static BeatmapSetInfo beatmap_set = new BeatmapSetInfo
+        private static readonly BeatmapSetInfo beatmap_set = new BeatmapSetInfo
         {
             OnlineInfo = new BeatmapSetOnlineInfo
             {
@@ -76,7 +76,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             }
         };
 
-        private static BeatmapSetInfo no_cover_beatmap_set = new BeatmapSetInfo
+        private static readonly BeatmapSetInfo no_cover_beatmap_set = new BeatmapSetInfo
         {
             OnlineInfo = new BeatmapSetOnlineInfo
             {

From 5347119a857fa86545dc2231039bd2dc3be6fab7 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 18 Feb 2020 21:26:25 +0300
Subject: [PATCH 0591/1142] Various RankingsOverlay fixes

---
 .../Rankings/RankingsOverlayHeader.cs         | 17 ++++-----
 osu.Game/Overlays/RankingsOverlay.cs          | 38 +++++++++++--------
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
index 2674b3a81e..164585de38 100644
--- a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
+++ b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
@@ -11,23 +11,20 @@ namespace osu.Game.Overlays.Rankings
 {
     public class RankingsOverlayHeader : TabControlOverlayHeader<RankingsScope>
     {
-        public readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
-        public readonly Bindable<Country> Country = new Bindable<Country>();
+        public Bindable<RulesetInfo> Ruleset => rulesetSelector.Current;
+        public Bindable<Country> Country => countryFilter.Current;
+
+        private OverlayRulesetSelector rulesetSelector;
+        private CountryFilter countryFilter;
 
         protected override ScreenTitle CreateTitle() => new RankingsTitle
         {
             Scope = { BindTarget = Current }
         };
 
-        protected override Drawable CreateTitleContent() => new OverlayRulesetSelector
-        {
-            Current = Ruleset
-        };
+        protected override Drawable CreateTitleContent() => rulesetSelector = new OverlayRulesetSelector();
 
-        protected override Drawable CreateContent() => new CountryFilter
-        {
-            Current = Country
-        };
+        protected override Drawable CreateContent() => countryFilter = new CountryFilter();
 
         private class RankingsTitle : ScreenTitle
         {
diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index f3215d07fa..2c5ea61315 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -19,14 +19,17 @@ namespace osu.Game.Overlays
 {
     public class RankingsOverlay : FullscreenOverlay
     {
-        protected readonly Bindable<Country> Country = new Bindable<Country>();
-        protected readonly Bindable<RankingsScope> Scope = new Bindable<RankingsScope>();
-        private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
+        protected Bindable<Country> Country => header.Country;
+
+        protected Bindable<RankingsScope> Scope => header.Current;
+
+        private Bindable<RulesetInfo> ruleset => header.Ruleset;
 
         private readonly BasicScrollContainer scrollFlow;
         private readonly Container contentContainer;
         private readonly DimmedLoadingLayer loading;
         private readonly Box background;
+        private readonly RankingsOverlayHeader header;
 
         private APIRequest lastRequest;
         private CancellationTokenSource cancellationToken;
@@ -54,14 +57,11 @@ namespace osu.Game.Overlays
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            new RankingsOverlayHeader
+                            header = new RankingsOverlayHeader
                             {
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
-                                Depth = -float.MaxValue,
-                                Country = { BindTarget = Country },
-                                Current = { BindTarget = Scope },
-                                Ruleset = { BindTarget = ruleset }
+                                Depth = -float.MaxValue
                             },
                             new Container
                             {
@@ -94,6 +94,8 @@ namespace osu.Game.Overlays
 
         protected override void LoadComplete()
         {
+            base.LoadComplete();
+
             Country.BindValueChanged(_ =>
             {
                 // if a country is requested, force performance scope.
@@ -101,7 +103,7 @@ namespace osu.Game.Overlays
                     Scope.Value = RankingsScope.Performance;
 
                 Scheduler.AddOnce(loadNewContent);
-            }, true);
+            });
 
             Scope.BindValueChanged(_ =>
             {
@@ -110,7 +112,7 @@ namespace osu.Game.Overlays
                     Country.Value = null;
 
                 Scheduler.AddOnce(loadNewContent);
-            }, true);
+            });
 
             ruleset.BindValueChanged(_ =>
             {
@@ -118,9 +120,7 @@ namespace osu.Game.Overlays
                     return;
 
                 Scheduler.AddOnce(loadNewContent);
-            }, true);
-
-            base.LoadComplete();
+            });
         }
 
         public void ShowCountry(Country requested)
@@ -158,8 +158,8 @@ namespace osu.Game.Overlays
                 return;
             }
 
-            request.Success += () => loadContent(createTableFromResponse(request));
-            request.Failure += _ => loadContent(null);
+            request.Success += () => Schedule(() => loadContent(createTableFromResponse(request)));
+            request.Failure += _ => Schedule(() => loadContent(null));
 
             api.Queue(request);
         }
@@ -221,5 +221,13 @@ namespace osu.Game.Overlays
                 contentContainer.Child = loaded;
             }, (cancellationToken = new CancellationTokenSource()).Token);
         }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            lastRequest?.Cancel();
+            cancellationToken?.Cancel();
+
+            base.Dispose(isDisposing);
+        }
     }
 }

From e9003346d4f538377a613acd2e2dc6fc42ce6bdd Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 18 Feb 2020 21:28:38 +0300
Subject: [PATCH 0592/1142] Add missing blank line

---
 osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
index 164585de38..a89360bd3c 100644
--- a/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
+++ b/osu.Game/Overlays/Rankings/RankingsOverlayHeader.cs
@@ -12,6 +12,7 @@ namespace osu.Game.Overlays.Rankings
     public class RankingsOverlayHeader : TabControlOverlayHeader<RankingsScope>
     {
         public Bindable<RulesetInfo> Ruleset => rulesetSelector.Current;
+
         public Bindable<Country> Country => countryFilter.Current;
 
         private OverlayRulesetSelector rulesetSelector;

From 73e5018696332580c0c4208a4da80610b19b1b35 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Feb 2020 09:39:56 +0900
Subject: [PATCH 0593/1142] Move radius adjust local to fruit piece

---
 .../Objects/Drawable/DrawableFruit.cs                    | 5 -----
 osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs   | 9 +++++++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
index 5ab0858f75..0790e0234c 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
@@ -16,11 +16,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
     {
         private Container scaleContainer;
 
-        /// <summary>
-        /// Because we're adding a border around the fruit, we need to scale down some.
-        /// </summary>
-        public const float RADIUS_ADJUST = 1.1f;
-
         public DrawableFruit(Fruit h)
             : base(h)
         {
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs
index 2b24f25e8b..e4c110802b 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs
@@ -16,6 +16,11 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
 {
     internal class FruitPiece : CompositeDrawable
     {
+        /// <summary>
+        /// Because we're adding a border around the fruit, we need to scale down some.
+        /// </summary>
+        private const float radius_adjust = 1.1f;
+
         private Circle border;
 
         private CatchHitObject hitObject;
@@ -44,7 +49,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     BorderColour = Color4.White,
-                    BorderThickness = 6f * DrawableFruit.RADIUS_ADJUST,
+                    BorderThickness = 6f * radius_adjust,
                     Children = new Framework.Graphics.Drawable[]
                     {
                         new Box
@@ -82,7 +87,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
 
         private Framework.Graphics.Drawable createPulp(FruitVisualRepresentation representation)
         {
-            const float large_pulp_3 = 16f * DrawableFruit.RADIUS_ADJUST;
+            const float large_pulp_3 = 16f * radius_adjust;
             const float distance_from_centre_3 = 0.15f;
 
             const float large_pulp_4 = large_pulp_3 * 0.925f;

From ab863cdfd98c681c1fb0a6c7fdb1b5e2205735a3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Feb 2020 09:52:29 +0900
Subject: [PATCH 0594/1142] Fix incorrect scaling factor being applied

---
 osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index 6cb524ca7a..4abb9e61aa 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Rulesets.Catch.Objects
 
             TimePreempt = (float)BeatmapDifficulty.DifficultyRange(difficulty.ApproachRate, 1800, 1200, 450);
 
-            Scale = 1.0f - 0.7f * (difficulty.CircleSize - 5) / 5;
+            Scale = (1.0f - 0.7f * (difficulty.CircleSize - 5) / 5) / 2;
         }
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;

From f245fe59345e5b0b35aad2aadd9351774921dfac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Feb 2020 10:28:20 +0900
Subject: [PATCH 0595/1142] Fix catch combo colouring

---
 .../Objects/Drawable/DrawableFruit.cs         | 35 -------------------
 .../Objects/Drawable/FruitPiece.cs            | 23 ++++++++++--
 2 files changed, 21 insertions(+), 37 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
index 0790e0234c..73ca58fd0a 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
 using osu.Game.Skinning;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawable
 {
@@ -46,8 +45,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                 }
             });
 
-            AccentColour.Value = colourForRepresentation(HitObject.VisualRepresentation);
-
             scaleContainer.Scale = new Vector2(HitObject.Scale);
         }
 
@@ -74,37 +71,5 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                     throw new ArgumentOutOfRangeException(nameof(hitObjectVisualRepresentation), hitObjectVisualRepresentation, null);
             }
         }
-
-        private Color4 colourForRepresentation(FruitVisualRepresentation representation)
-        {
-            switch (representation)
-            {
-                default:
-                case FruitVisualRepresentation.Pear:
-                    return new Color4(17, 136, 170, 255);
-
-                case FruitVisualRepresentation.Grape:
-                    return new Color4(204, 102, 0, 255);
-
-                case FruitVisualRepresentation.Raspberry:
-                    return new Color4(121, 9, 13, 255);
-
-                case FruitVisualRepresentation.Pineapple:
-                    return new Color4(102, 136, 0, 255);
-
-                case FruitVisualRepresentation.Banana:
-                    switch (RNG.Next(0, 3))
-                    {
-                        default:
-                            return new Color4(255, 240, 0, 255);
-
-                        case 1:
-                            return new Color4(255, 192, 0, 255);
-
-                        case 2:
-                            return new Color4(214, 221, 28, 255);
-                    }
-            }
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs
index e4c110802b..4098103569 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs
@@ -7,6 +7,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Catch.Objects.Drawable.Pieces;
 using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
@@ -249,6 +250,9 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                     };
 
                 case FruitVisualRepresentation.Banana:
+
+                    Color4 bananaColour = getBananaColour();
+
                     return new Container
                     {
                         RelativeSizeAxes = Axes.Both,
@@ -256,13 +260,13 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                         {
                             new Pulp
                             {
-                                AccentColour = accentColour.Value,
+                                AccentColour = bananaColour,
                                 Size = new Vector2(small_pulp),
                                 Y = -0.3f
                             },
                             new Pulp
                             {
-                                AccentColour = accentColour.Value,
+                                AccentColour = bananaColour,
                                 Size = new Vector2(large_pulp_4 * 0.8f, large_pulp_4 * 2.5f),
                                 Y = 0.05f,
                             },
@@ -270,5 +274,20 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                     };
             }
         }
+
+        private Color4 getBananaColour()
+        {
+            switch (RNG.Next(0, 3))
+            {
+                default:
+                    return new Color4(255, 240, 0, 255);
+
+                case 1:
+                    return new Color4(255, 192, 0, 255);
+
+                case 2:
+                    return new Color4(214, 221, 28, 255);
+            }
+        }
     }
 }

From 0f85e812408884c7d90e325ddb97441febccbccb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Feb 2020 11:23:45 +0900
Subject: [PATCH 0596/1142] Fix handling of bindable changes in accent colour

---
 .../Objects/Drawable/DrawableDroplet.cs       | 10 ++---
 .../Objects/Drawable/DrawableJuiceStream.cs   |  5 ++-
 .../Objects/Drawable/FruitPiece.cs            | 43 +++++++++----------
 .../Objects/Drawable/Pieces/Pulp.cs           | 27 ++++--------
 .../Skinning/LegacyFruitPiece.cs              | 10 ++++-
 5 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
index 6f5bcb70cf..94d417961f 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
@@ -10,8 +10,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
 {
     public class DrawableDroplet : PalpableCatchHitObject<Droplet>
     {
-        private Pulp pulp;
-
         public override bool StaysOnPlate => false;
 
         public DrawableDroplet(Droplet h)
@@ -25,9 +23,11 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddInternal(pulp = new Pulp { Size = Size });
-
-            AccentColour.BindValueChanged(colour => { pulp.AccentColour = colour.NewValue; }, true);
+            AddInternal(new Pulp
+            {
+                Size = Size,
+                AccentColour = { BindTarget = AccentColour }
+            });
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableJuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableJuiceStream.cs
index a24821b3ce..f76055e1ea 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableJuiceStream.cs
@@ -42,10 +42,11 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
             switch (hitObject)
             {
                 case CatchHitObject catchObject:
-                    return createDrawableRepresentation?.Invoke(catchObject)?.With(o => ((DrawableCatchHitObject)o).CheckPosition = p => CheckPosition?.Invoke(p) ?? false);
+                    return createDrawableRepresentation?.Invoke(catchObject)?.With(o =>
+                        ((DrawableCatchHitObject)o).CheckPosition = p => CheckPosition?.Invoke(p) ?? false);
             }
 
-            return base.CreateNestedHitObject(hitObject);
+            return null;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs
index 4098103569..0898c90bc8 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs
@@ -56,7 +56,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                         new Box
                         {
                             AlwaysPresent = true,
-                            Colour = drawableCatchObject.AccentColour.Value,
                             Alpha = 0,
                             RelativeSizeAxes = Axes.Both
                         }
@@ -71,7 +70,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                     RelativePositionAxes = Axes.Both,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    AccentColour = Color4.Red,
+                    AccentColour = { Value = Color4.Red },
                     Blending = BlendingParameters.Additive,
                     Alpha = 0.5f,
                     Scale = new Vector2(1.333f)
@@ -113,32 +112,32 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                         {
                             new Pulp
                             {
-                                AccentColour = accentColour.Value,
+                                AccentColour = { BindTarget = accentColour },
                                 Size = new Vector2(small_pulp),
                                 Y = -0.34f,
                             },
                             new Pulp
                             {
-                                AccentColour = accentColour.Value,
+                                AccentColour = { BindTarget = accentColour },
                                 Size = new Vector2(large_pulp_4),
                                 Position = positionAt(0, distance_from_centre_4),
                             },
                             new Pulp
                             {
-                                AccentColour = accentColour.Value,
+                                AccentColour = { BindTarget = accentColour },
                                 Size = new Vector2(large_pulp_4),
                                 Position = positionAt(90, distance_from_centre_4),
                             },
                             new Pulp
                             {
-                                AccentColour = accentColour.Value,
+                                AccentColour = { BindTarget = accentColour },
                                 Size = new Vector2(large_pulp_4),
                                 Position = positionAt(180, distance_from_centre_4),
                             },
                             new Pulp
                             {
                                 Size = new Vector2(large_pulp_4),
-                                AccentColour = accentColour.Value,
+                                AccentColour = { BindTarget = accentColour },
                                 Position = positionAt(270, distance_from_centre_4),
                             },
                         }
@@ -152,32 +151,32 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                         {
                             new Pulp
                             {
-                                AccentColour = accentColour.Value,
+                                AccentColour = { BindTarget = accentColour },
                                 Size = new Vector2(small_pulp),
                                 Y = -0.3f,
                             },
                             new Pulp
                             {
-                                AccentColour = accentColour.Value,
+                                AccentColour = { BindTarget = accentColour },
                                 Size = new Vector2(large_pulp_4),
                                 Position = positionAt(45, distance_from_centre_4),
                             },
                             new Pulp
                             {
-                                AccentColour = accentColour.Value,
+                                AccentColour = { BindTarget = accentColour },
                                 Size = new Vector2(large_pulp_4),
                                 Position = positionAt(135, distance_from_centre_4),
                             },
                             new Pulp
                             {
-                                AccentColour = accentColour.Value,
+                                AccentColour = { BindTarget = accentColour },
                                 Size = new Vector2(large_pulp_4),
                                 Position = positionAt(225, distance_from_centre_4),
                             },
                             new Pulp
                             {
                                 Size = new Vector2(large_pulp_4),
-                                AccentColour = accentColour.Value,
+                                AccentColour = { BindTarget = accentColour },
                                 Position = positionAt(315, distance_from_centre_4),
                             },
                         }
@@ -191,26 +190,26 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                         {
                             new Pulp
                             {
-                                AccentColour = accentColour.Value,
+                                AccentColour = { BindTarget = accentColour },
                                 Size = new Vector2(small_pulp),
                                 Y = -0.33f,
                             },
                             new Pulp
                             {
-                                AccentColour = accentColour.Value,
+                                AccentColour = { BindTarget = accentColour },
                                 Size = new Vector2(large_pulp_3),
                                 Position = positionAt(60, distance_from_centre_3),
                             },
                             new Pulp
                             {
-                                AccentColour = accentColour.Value,
+                                AccentColour = { BindTarget = accentColour },
                                 Size = new Vector2(large_pulp_3),
                                 Position = positionAt(180, distance_from_centre_3),
                             },
                             new Pulp
                             {
                                 Size = new Vector2(large_pulp_3),
-                                AccentColour = accentColour.Value,
+                                AccentColour = { BindTarget = accentColour },
                                 Position = positionAt(300, distance_from_centre_3),
                             },
                         }
@@ -224,26 +223,26 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                         {
                             new Pulp
                             {
-                                AccentColour = accentColour.Value,
+                                AccentColour = { BindTarget = accentColour },
                                 Size = new Vector2(small_pulp),
                                 Y = -0.25f,
                             },
                             new Pulp
                             {
-                                AccentColour = accentColour.Value,
+                                AccentColour = { BindTarget = accentColour },
                                 Size = new Vector2(large_pulp_3),
                                 Position = positionAt(0, distance_from_centre_3),
                             },
                             new Pulp
                             {
-                                AccentColour = accentColour.Value,
+                                AccentColour = { BindTarget = accentColour },
                                 Size = new Vector2(large_pulp_3),
                                 Position = positionAt(120, distance_from_centre_3),
                             },
                             new Pulp
                             {
                                 Size = new Vector2(large_pulp_3),
-                                AccentColour = accentColour.Value,
+                                AccentColour = { BindTarget = accentColour },
                                 Position = positionAt(240, distance_from_centre_3),
                             },
                         }
@@ -260,13 +259,13 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                         {
                             new Pulp
                             {
-                                AccentColour = bananaColour,
+                                AccentColour = { Value = bananaColour },
                                 Size = new Vector2(small_pulp),
                                 Y = -0.3f
                             },
                             new Pulp
                             {
-                                AccentColour = bananaColour,
+                                AccentColour = { Value = bananaColour },
                                 Size = new Vector2(large_pulp_4 * 0.8f, large_pulp_4 * 2.5f),
                                 Y = 0.05f,
                             },
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/Pieces/Pulp.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/Pieces/Pulp.cs
index 1e9daf18db..517978eb07 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/Pieces/Pulp.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/Pieces/Pulp.cs
@@ -1,16 +1,16 @@
 // 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.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawable.Pieces
 {
-    public class Pulp : Circle, IHasAccentColour
+    public class Pulp : Circle
     {
         public Pulp()
         {
@@ -22,32 +22,23 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable.Pieces
             Colour = Color4.White.Opacity(0.9f);
         }
 
-        private Color4 accentColour;
+        public readonly Bindable<Color4> AccentColour = new Bindable<Color4>();
 
-        public Color4 AccentColour
+        protected override void LoadComplete()
         {
-            get => accentColour;
-            set
-            {
-                accentColour = value;
-                if (IsLoaded) updateAccentColour();
-            }
+            base.LoadComplete();
+
+            AccentColour.BindValueChanged(updateAccentColour, true);
         }
 
-        private void updateAccentColour()
+        private void updateAccentColour(ValueChangedEvent<Color4> colour)
         {
             EdgeEffect = new EdgeEffectParameters
             {
                 Type = EdgeEffectType.Glow,
                 Radius = Size.X / 2,
-                Colour = accentColour.Darken(0.2f).Opacity(0.75f)
+                Colour = colour.NewValue.Darken(0.2f).Opacity(0.75f)
             };
         }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            updateAccentColour();
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
index fbe682e512..909db41736 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
@@ -18,6 +18,7 @@ namespace osu.Game.Rulesets.Catch.Skinning
         private readonly string lookupName;
 
         private readonly IBindable<Color4> accentColour = new Bindable<Color4>();
+        private Sprite colouredSprite;
 
         public LegacyFruitPiece(string lookupName)
         {
@@ -34,7 +35,7 @@ namespace osu.Game.Rulesets.Catch.Skinning
 
             InternalChildren = new Drawable[]
             {
-                new Sprite
+                colouredSprite = new Sprite
                 {
                     Texture = skin.GetTexture(lookupName),
                     Colour = drawableObject.AccentColour.Value,
@@ -49,5 +50,12 @@ namespace osu.Game.Rulesets.Catch.Skinning
                 },
             };
         }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            accentColour.BindValueChanged(colour => colouredSprite.Colour = colour.NewValue, true);
+        }
     }
 }

From ce1a57550fcaef0572530990b29a97537fd5e2b0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Feb 2020 13:27:15 +0900
Subject: [PATCH 0597/1142] Add droplet skinning support

---
 .../CatchSkinComponents.cs                    |  1 +
 .../Objects/Drawable/DrawableDroplet.cs       | 28 ++++++++++++++++---
 .../Objects/Drawable/DrawableTinyDroplet.cs   |  2 +-
 .../Skinning/CatchLegacySkinTransformer.cs    |  6 ++++
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchSkinComponents.cs b/osu.Game.Rulesets.Catch/CatchSkinComponents.cs
index f64902b8e5..02c045f363 100644
--- a/osu.Game.Rulesets.Catch/CatchSkinComponents.cs
+++ b/osu.Game.Rulesets.Catch/CatchSkinComponents.cs
@@ -10,5 +10,6 @@ namespace osu.Game.Rulesets.Catch
         FruitGrapes,
         FruitOrange,
         FruitPear,
+        Droplet
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
index 94d417961f..99f0277482 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
@@ -3,8 +3,11 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Catch.Objects.Drawable.Pieces;
+using osu.Game.Skinning;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawable
 {
@@ -16,18 +19,35 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
             : base(h)
         {
             Origin = Anchor.Centre;
-            Size = new Vector2(CatchHitObject.OBJECT_RADIUS) / 4;
+            Size = new Vector2(CatchHitObject.OBJECT_RADIUS * 2) / 4;
             Masking = false;
         }
 
+        private Container scaleContainer;
+
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddInternal(new Pulp
+            AddRangeInternal(new Framework.Graphics.Drawable[]
             {
-                Size = Size,
-                AccentColour = { BindTarget = AccentColour }
+                scaleContainer = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre,
+                    Children = new Framework.Graphics.Drawable[]
+                    {
+                        new SkinnableDrawable(
+                            new CatchSkinComponent(CatchSkinComponents.Droplet), _ => new Pulp
+                            {
+                                Size = Size,
+                                AccentColour = { Value = Color4.White }
+                            })
+                    }
+                }
             });
+
+            scaleContainer.Scale = new Vector2(HitObject.Scale);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableTinyDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableTinyDroplet.cs
index ab5df5c44c..3f90334727 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableTinyDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableTinyDroplet.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
         public DrawableTinyDroplet(TinyDroplet h)
             : base(h)
         {
-            Size = new Vector2(CatchHitObject.OBJECT_RADIUS / 8);
+            Size = new Vector2(CatchHitObject.OBJECT_RADIUS * 2) / 8;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
index 20bd086199..5db5ca2e03 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
@@ -37,6 +37,12 @@ namespace osu.Game.Rulesets.Catch.Skinning
                         return new LegacyFruitPiece(lookupName);
 
                     break;
+
+                case CatchSkinComponents.Droplet:
+                    if (GetTexture("fruit-drop") != null)
+                        return new LegacyFruitPiece("fruit-drop");
+
+                    break;
             }
 
             return null;

From 3eeb60f60f8a4ba228f960bda5af1ca8883d7f3d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Feb 2020 14:31:14 +0900
Subject: [PATCH 0598/1142] Centralise and fix scaling

---
 .../Objects/Drawable/DrawableCatchHitObject.cs           | 6 ++++--
 .../Objects/Drawable/DrawableDroplet.cs                  | 9 +++------
 .../Objects/Drawable/DrawableFruit.cs                    | 6 ------
 .../Objects/Drawable/DrawableTinyDroplet.cs              | 9 +++++++--
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs
index b7c05392f3..bfef1ba605 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs
@@ -2,11 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osuTK;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
+using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawable
 {
@@ -18,7 +18,9 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
         protected PalpableCatchHitObject(TObject hitObject)
             : base(hitObject)
         {
-            Scale = new Vector2(HitObject.Scale);
+            Origin = Anchor.Centre;
+            Size = new Vector2(CatchHitObject.OBJECT_RADIUS * 2);
+            Masking = false;
         }
     }
 
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
index 99f0277482..e645b17c05 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
@@ -18,19 +18,16 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
         public DrawableDroplet(Droplet h)
             : base(h)
         {
-            Origin = Anchor.Centre;
-            Size = new Vector2(CatchHitObject.OBJECT_RADIUS * 2) / 4;
-            Masking = false;
         }
 
-        private Container scaleContainer;
+        protected Container ScaleContainer;
 
         [BackgroundDependencyLoader]
         private void load()
         {
             AddRangeInternal(new Framework.Graphics.Drawable[]
             {
-                scaleContainer = new Container
+                ScaleContainer = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
                     Origin = Anchor.Centre,
@@ -47,7 +44,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                 }
             });
 
-            scaleContainer.Scale = new Vector2(HitObject.Scale);
+            ScaleContainer.Scale = new Vector2(HitObject.Scale);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
index 73ca58fd0a..2befb5dfd0 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
@@ -18,12 +18,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
         public DrawableFruit(Fruit h)
             : base(h)
         {
-            Origin = Anchor.Centre;
-
-            Size = new Vector2(CatchHitObject.OBJECT_RADIUS * 2);
-
-            Masking = false;
-
             Rotation = (float)(RNG.NextDouble() - 0.5f) * 40;
         }
 
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableTinyDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableTinyDroplet.cs
index 3f90334727..4fe1f86f2b 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableTinyDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableTinyDroplet.cs
@@ -1,7 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osuTK;
+using osu.Framework.Allocation;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawable
 {
@@ -10,7 +10,12 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
         public DrawableTinyDroplet(TinyDroplet h)
             : base(h)
         {
-            Size = new Vector2(CatchHitObject.OBJECT_RADIUS * 2) / 8;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Scale /= 2;
         }
     }
 }

From 24e33abcbf281135415f2e7122c0529fb9c3c8e5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Feb 2020 14:31:32 +0900
Subject: [PATCH 0599/1142] Fix banana colouring for skins

---
 .../Objects/Drawable/DrawableBanana.cs        | 34 +++++++++++++++++++
 .../Objects/Drawable/FruitPiece.cs            | 22 ++----------
 2 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBanana.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBanana.cs
index 5afdb14888..4b4e381efd 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBanana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBanana.cs
@@ -1,6 +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 osu.Framework.Bindables;
+using osu.Framework.Utils;
+using osuTK.Graphics;
+
 namespace osu.Game.Rulesets.Catch.Objects.Drawable
 {
     public class DrawableBanana : DrawableFruit
@@ -9,5 +13,35 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
             : base(h)
         {
         }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            AccentColour.BindValueChanged(accentChanged, true);
+        }
+
+        private Color4? colour;
+
+        private void accentChanged(ValueChangedEvent<Color4> obj)
+        {
+            // override any external colour changes with banananana
+            AccentColour.Value = (colour ??= getBananaColour());
+        }
+
+        private Color4 getBananaColour()
+        {
+            switch (RNG.Next(0, 3))
+            {
+                default:
+                    return new Color4(255, 240, 0, 255);
+
+                case 1:
+                    return new Color4(255, 192, 0, 255);
+
+                case 2:
+                    return new Color4(214, 221, 28, 255);
+            }
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs
index 0898c90bc8..24f558db78 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs
@@ -7,7 +7,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Utils;
 using osu.Game.Rulesets.Catch.Objects.Drawable.Pieces;
 using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
@@ -250,8 +249,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
 
                 case FruitVisualRepresentation.Banana:
 
-                    Color4 bananaColour = getBananaColour();
-
                     return new Container
                     {
                         RelativeSizeAxes = Axes.Both,
@@ -259,13 +256,13 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                         {
                             new Pulp
                             {
-                                AccentColour = { Value = bananaColour },
+                                AccentColour = { BindTarget = accentColour },
                                 Size = new Vector2(small_pulp),
                                 Y = -0.3f
                             },
                             new Pulp
                             {
-                                AccentColour = { Value = bananaColour },
+                                AccentColour = { BindTarget = accentColour },
                                 Size = new Vector2(large_pulp_4 * 0.8f, large_pulp_4 * 2.5f),
                                 Y = 0.05f,
                             },
@@ -273,20 +270,5 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                     };
             }
         }
-
-        private Color4 getBananaColour()
-        {
-            switch (RNG.Next(0, 3))
-            {
-                default:
-                    return new Color4(255, 240, 0, 255);
-
-                case 1:
-                    return new Color4(255, 192, 0, 255);
-
-                case 2:
-                    return new Color4(214, 221, 28, 255);
-            }
-        }
     }
 }

From aeb45c8442b34e8ef485ee3d2b5d91befd9d7095 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Feb 2020 14:31:43 +0900
Subject: [PATCH 0600/1142] Fix ordering of fruits to match stable

---
 osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs         | 2 +-
 osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index 4abb9e61aa..02979f8aa0 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -100,8 +100,8 @@ namespace osu.Game.Rulesets.Catch.Objects
     {
         Pear,
         Grape,
-        Raspberry,
         Pineapple,
+        Raspberry,
         Banana // banananananannaanana
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
index 2befb5dfd0..edcb5eb13d 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
@@ -52,12 +52,12 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                 case FruitVisualRepresentation.Grape:
                     return CatchSkinComponents.FruitGrapes;
 
-                case FruitVisualRepresentation.Raspberry:
-                    return CatchSkinComponents.FruitOrange;
-
                 case FruitVisualRepresentation.Pineapple:
                     return CatchSkinComponents.FruitApple;
 
+                case FruitVisualRepresentation.Raspberry:
+                    return CatchSkinComponents.FruitOrange;
+
                 case FruitVisualRepresentation.Banana:
                     return CatchSkinComponents.FruitBananas;
 

From 26fe15b0385ca4403b9a5d08e254c7ec201f0454 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Feb 2020 14:41:25 +0900
Subject: [PATCH 0601/1142] Fix fruit representation not cycling as often as it
 should

---
 osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index 02979f8aa0..f3b566f340 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         public int IndexInBeatmap { get; set; }
 
-        public virtual FruitVisualRepresentation VisualRepresentation => (FruitVisualRepresentation)(ComboIndex % 4);
+        public virtual FruitVisualRepresentation VisualRepresentation => (FruitVisualRepresentation)(IndexInBeatmap % 4);
 
         public virtual bool NewCombo { get; set; }
 

From 618fb4ccfbaa9de0946813efc852fb9554469f5d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Feb 2020 15:05:04 +0900
Subject: [PATCH 0602/1142] Move combo colour update logic to osu! ruleset

---
 .../Objects/Drawables/DrawableOsuHitObject.cs        |  3 +++
 .../Rulesets/Objects/Drawables/DrawableHitObject.cs  | 12 ++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index a677cb6a72..fcc4c58619 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Graphics.Containers;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
@@ -54,6 +55,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
+        protected override void UpdateComboColour(Color4 comboColour) => AccentColour.Value = comboColour;
+
         protected override JudgementResult CreateResult(Judgement judgement) => new OsuJudgementResult(HitObject, judgement);
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 6f20bcf595..306c59e880 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -121,7 +121,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (HitObject is IHasComboInformation combo)
             {
                 comboIndexBindable = combo.ComboIndexBindable.GetBoundCopy();
-                comboIndexBindable.BindValueChanged(_ => updateAccentColour(), true);
+                comboIndexBindable.BindValueChanged(_ => updateComboColour(), true);
             }
 
             samplesBindable = HitObject.SamplesBindable.GetBoundCopy();
@@ -336,7 +336,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
             base.SkinChanged(skin, allowFallback);
 
-            updateAccentColour();
+            updateComboColour();
 
             ApplySkin(skin, allowFallback);
 
@@ -344,15 +344,19 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 updateState(State.Value, true);
         }
 
-        private void updateAccentColour()
+        private void updateComboColour()
         {
             if (HitObject is IHasComboInformation combo)
             {
                 var comboColours = CurrentSkin.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
-                AccentColour.Value = comboColours?.Count > 0 ? comboColours[combo.ComboIndex % comboColours.Count] : Color4.White;
+                UpdateComboColour(comboColours?.Count > 0 ? comboColours[combo.ComboIndex % comboColours.Count] : Color4.White);
             }
         }
 
+        protected virtual void UpdateComboColour(Color4 comboColour)
+        {
+        }
+
         /// <summary>
         /// Called when a change is made to the skin.
         /// </summary>

From fec5c4a73aea7e493afbfc708f656ca214cb0c3c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Feb 2020 15:16:07 +0900
Subject: [PATCH 0603/1142] Move combo colour to accent propagation logic to
 osu! ruleset

---
 .../Objects/Drawables/DrawableOsuHitObject.cs            | 3 ++-
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index fcc4c58619..1bb72a3176 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Judgements;
@@ -55,7 +56,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
-        protected override void UpdateComboColour(Color4 comboColour) => AccentColour.Value = comboColour;
+        protected override void UpdateComboColour(Color4 proposedColour, IReadOnlyList<Color4> comboColours) => AccentColour.Value = proposedColour;
 
         protected override JudgementResult CreateResult(Judgement judgement) => new OsuJudgementResult(HitObject, judgement);
     }
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 306c59e880..c5ce490845 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -349,11 +349,16 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (HitObject is IHasComboInformation combo)
             {
                 var comboColours = CurrentSkin.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
-                UpdateComboColour(comboColours?.Count > 0 ? comboColours[combo.ComboIndex % comboColours.Count] : Color4.White);
+                UpdateComboColour(comboColours?.Count > 0 ? comboColours[combo.ComboIndex % comboColours.Count] : Color4.White, comboColours);
             }
         }
 
-        protected virtual void UpdateComboColour(Color4 comboColour)
+        /// <summary>
+        /// Called when a combo colour change is proposed.
+        /// </summary>
+        /// <param name="proposedColour">The proposed combo colour, based off the combo index.</param>
+        /// <param name="comboColours">A list of combo colours provided by the beatmap or skin. Can be null if not available.</param>
+        protected virtual void UpdateComboColour(Color4 proposedColour, IReadOnlyList<Color4> comboColours)
         {
         }
 

From 3f99d25e37f2eefebda45ff5ac9e43ffdb2866c9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Feb 2020 15:16:19 +0900
Subject: [PATCH 0604/1142] Use new UpdateComboColour method to simplify
 colouring

---
 .../Objects/Drawable/DrawableBanana.cs                | 11 ++---------
 .../Objects/Drawable/DrawableDroplet.cs               | 11 +++++++++--
 .../Objects/Drawable/DrawableFruit.cs                 |  8 ++++++++
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBanana.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBanana.cs
index 4b4e381efd..8625b93786 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBanana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBanana.cs
@@ -1,7 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Bindables;
+using System.Collections.Generic;
 using osu.Framework.Utils;
 using osuTK.Graphics;
 
@@ -14,16 +14,9 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
         {
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            AccentColour.BindValueChanged(accentChanged, true);
-        }
-
         private Color4? colour;
 
-        private void accentChanged(ValueChangedEvent<Color4> obj)
+        protected override void UpdateComboColour(Color4 proposedColour, IReadOnlyList<Color4> comboColours)
         {
             // override any external colour changes with banananana
             AccentColour.Value = (colour ??= getBananaColour());
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
index e645b17c05..fc5a8b2938 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -15,13 +16,13 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
     {
         public override bool StaysOnPlate => false;
 
+        protected Container ScaleContainer;
+
         public DrawableDroplet(Droplet h)
             : base(h)
         {
         }
 
-        protected Container ScaleContainer;
-
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -46,5 +47,11 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
 
             ScaleContainer.Scale = new Vector2(HitObject.Scale);
         }
+
+        protected override void UpdateComboColour(Color4 proposedColour, IReadOnlyList<Color4> comboColours)
+        {
+            // ignore the incoming combo colour as we use a custom lookup
+            AccentColour.Value = comboColours[HitObject.IndexInBeatmap % comboColours.Count];
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
index edcb5eb13d..99f7e9386e 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
@@ -2,12 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
 using osu.Game.Skinning;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawable
 {
@@ -42,6 +44,12 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
             scaleContainer.Scale = new Vector2(HitObject.Scale);
         }
 
+        protected override void UpdateComboColour(Color4 proposedColour, IReadOnlyList<Color4> comboColours)
+        {
+            // ignore the incoming combo colour as we use a custom lookup
+            AccentColour.Value = comboColours[(HitObject.IndexInBeatmap + 1) % comboColours.Count];
+        }
+
         private CatchSkinComponents getComponent(FruitVisualRepresentation hitObjectVisualRepresentation)
         {
             switch (hitObjectVisualRepresentation)

From 69b5d5606a4d96913817073b9e06541ab10b4125 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Feb 2020 15:32:24 +0900
Subject: [PATCH 0605/1142] Fix nested catch objects not having a correct
 IndexInBeatmap

---
 osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
index db52fbac1b..1872d71532 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
@@ -35,6 +35,9 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
             foreach (var obj in Beatmap.HitObjects.OfType<CatchHitObject>())
             {
                 obj.IndexInBeatmap = index++;
+                foreach (var nested in obj.NestedHitObjects.OfType<CatchHitObject>())
+                    nested.IndexInBeatmap = obj.IndexInBeatmap;
+
                 if (obj.LastInCombo && obj.NestedHitObjects.LastOrDefault() is IHasComboInformation lastNested)
                     lastNested.LastInCombo = true;
             }

From 52615795313a3b90bbb9f82c5c74f0c76a7a25e5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Feb 2020 15:37:12 +0900
Subject: [PATCH 0606/1142] Fix indices in beatmap not being transferred to
 children (and being off by one)

---
 osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs   | 6 ++++--
 osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
index 1872d71532..1a5d0f983b 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
@@ -34,12 +34,14 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
 
             foreach (var obj in Beatmap.HitObjects.OfType<CatchHitObject>())
             {
-                obj.IndexInBeatmap = index++;
+                obj.IndexInBeatmap = index;
                 foreach (var nested in obj.NestedHitObjects.OfType<CatchHitObject>())
-                    nested.IndexInBeatmap = obj.IndexInBeatmap;
+                    nested.IndexInBeatmap = index;
 
                 if (obj.LastInCombo && obj.NestedHitObjects.LastOrDefault() is IHasComboInformation lastNested)
                     lastNested.LastInCombo = true;
+
+                index++;
             }
         }
 
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
index fc5a8b2938..90ec250e29 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
         protected override void UpdateComboColour(Color4 proposedColour, IReadOnlyList<Color4> comboColours)
         {
             // ignore the incoming combo colour as we use a custom lookup
-            AccentColour.Value = comboColours[HitObject.IndexInBeatmap % comboColours.Count];
+            AccentColour.Value = comboColours[(HitObject.IndexInBeatmap + 1) % comboColours.Count];
         }
     }
 }

From 4c4140ae54752652a40264d5157c93ac011ff8a7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Feb 2020 15:55:22 +0900
Subject: [PATCH 0607/1142] Adjust droplets to match stable

---
 osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs    | 2 +-
 osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
index 90ec250e29..d0160f8cce 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
@@ -38,7 +38,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                         new SkinnableDrawable(
                             new CatchSkinComponent(CatchSkinComponents.Droplet), _ => new Pulp
                             {
-                                Size = Size,
+                                Size = Size / 4,
                                 AccentColour = { Value = Color4.White }
                             })
                     }
diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
index 5db5ca2e03..f8d0880c72 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
@@ -8,6 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
 using osu.Game.Skinning;
+using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Skinning
 {
@@ -40,7 +41,7 @@ namespace osu.Game.Rulesets.Catch.Skinning
 
                 case CatchSkinComponents.Droplet:
                     if (GetTexture("fruit-drop") != null)
-                        return new LegacyFruitPiece("fruit-drop");
+                        return new LegacyFruitPiece("fruit-drop") { Scale = new Vector2(0.8f) };
 
                     break;
             }

From afbf3a3a798b22502402f30b385b43ed1d6d72ba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Feb 2020 15:57:15 +0900
Subject: [PATCH 0608/1142] Fix regressing tests

---
 osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
index 17dc27543d..7469771e0b 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
@@ -76,6 +76,8 @@ namespace osu.Game.Tests.Gameplay
                 : base(new TestHitObjectWithCombo())
             {
             }
+
+            protected override void UpdateComboColour(Color4 proposedColour, IReadOnlyList<Color4> comboColours) => AccentColour.Value = proposedColour;
         }
 
         private class TestHitObjectWithCombo : HitObject, IHasComboInformation

From 5340d1de59d5d332b55ce1790fceda94c515f79f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Feb 2020 15:05:04 +0900
Subject: [PATCH 0609/1142] Move combo colour update logic to osu! ruleset

---
 .../Objects/Drawables/DrawableOsuHitObject.cs   |  4 ++++
 .../Objects/Drawables/DrawableHitObject.cs      | 17 +++++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index a677cb6a72..1bb72a3176 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -1,11 +1,13 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Graphics.Containers;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
@@ -54,6 +56,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
+        protected override void UpdateComboColour(Color4 proposedColour, IReadOnlyList<Color4> comboColours) => AccentColour.Value = proposedColour;
+
         protected override JudgementResult CreateResult(Judgement judgement) => new OsuJudgementResult(HitObject, judgement);
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 6f20bcf595..c5ce490845 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -121,7 +121,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (HitObject is IHasComboInformation combo)
             {
                 comboIndexBindable = combo.ComboIndexBindable.GetBoundCopy();
-                comboIndexBindable.BindValueChanged(_ => updateAccentColour(), true);
+                comboIndexBindable.BindValueChanged(_ => updateComboColour(), true);
             }
 
             samplesBindable = HitObject.SamplesBindable.GetBoundCopy();
@@ -336,7 +336,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
             base.SkinChanged(skin, allowFallback);
 
-            updateAccentColour();
+            updateComboColour();
 
             ApplySkin(skin, allowFallback);
 
@@ -344,15 +344,24 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 updateState(State.Value, true);
         }
 
-        private void updateAccentColour()
+        private void updateComboColour()
         {
             if (HitObject is IHasComboInformation combo)
             {
                 var comboColours = CurrentSkin.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
-                AccentColour.Value = comboColours?.Count > 0 ? comboColours[combo.ComboIndex % comboColours.Count] : Color4.White;
+                UpdateComboColour(comboColours?.Count > 0 ? comboColours[combo.ComboIndex % comboColours.Count] : Color4.White, comboColours);
             }
         }
 
+        /// <summary>
+        /// Called when a combo colour change is proposed.
+        /// </summary>
+        /// <param name="proposedColour">The proposed combo colour, based off the combo index.</param>
+        /// <param name="comboColours">A list of combo colours provided by the beatmap or skin. Can be null if not available.</param>
+        protected virtual void UpdateComboColour(Color4 proposedColour, IReadOnlyList<Color4> comboColours)
+        {
+        }
+
         /// <summary>
         /// Called when a change is made to the skin.
         /// </summary>

From 345eaff76ddadab913eba031eba6c744ac06f694 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Feb 2020 15:57:15 +0900
Subject: [PATCH 0610/1142] Fix regressing tests

---
 osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
index 17dc27543d..7469771e0b 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
@@ -76,6 +76,8 @@ namespace osu.Game.Tests.Gameplay
                 : base(new TestHitObjectWithCombo())
             {
             }
+
+            protected override void UpdateComboColour(Color4 proposedColour, IReadOnlyList<Color4> comboColours) => AccentColour.Value = proposedColour;
         }
 
         private class TestHitObjectWithCombo : HitObject, IHasComboInformation

From 14ebcc95fbf0f34383f8c3b39b0f59aa087e64d2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Feb 2020 16:33:49 +0900
Subject: [PATCH 0611/1142] Fix test scene dynamic compilation

---
 osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
index 51c821a1e8..b106ee2f77 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
@@ -20,6 +20,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
             typeof(CatchHitObject),
             typeof(Fruit),
+            typeof(FruitPiece),
             typeof(Droplet),
             typeof(Banana),
             typeof(BananaShower),

From 1938dd04cf320b556663c1c1f904eaa30fa759cf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Feb 2020 15:37:12 +0900
Subject: [PATCH 0612/1142] Fix indices in beatmap not being transferred to
 children (and being off by one)

---
 osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
index db52fbac1b..1a5d0f983b 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
@@ -34,9 +34,14 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
 
             foreach (var obj in Beatmap.HitObjects.OfType<CatchHitObject>())
             {
-                obj.IndexInBeatmap = index++;
+                obj.IndexInBeatmap = index;
+                foreach (var nested in obj.NestedHitObjects.OfType<CatchHitObject>())
+                    nested.IndexInBeatmap = index;
+
                 if (obj.LastInCombo && obj.NestedHitObjects.LastOrDefault() is IHasComboInformation lastNested)
                     lastNested.LastInCombo = true;
+
+                index++;
             }
         }
 

From dff218afd1f9c5b28ae9375fec288b529a5d4759 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Feb 2020 14:31:43 +0900
Subject: [PATCH 0613/1142] Fix ordering of fruits to match stable

---
 osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index e4ad49ea50..e287797137 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -100,8 +100,8 @@ namespace osu.Game.Rulesets.Catch.Objects
     {
         Pear,
         Grape,
-        Raspberry,
         Pineapple,
+        Raspberry,
         Banana // banananananannaanana
     }
 }

From d3844f912abd7b88b3391c1190422851b04dbb5c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Feb 2020 14:41:25 +0900
Subject: [PATCH 0614/1142] Fix fruit representation not cycling as often as it
 should

---
 osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
index e287797137..5243091625 100644
--- a/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         public int IndexInBeatmap { get; set; }
 
-        public virtual FruitVisualRepresentation VisualRepresentation => (FruitVisualRepresentation)(ComboIndex % 4);
+        public virtual FruitVisualRepresentation VisualRepresentation => (FruitVisualRepresentation)(IndexInBeatmap % 4);
 
         public virtual bool NewCombo { get; set; }
 

From e1140d7c91a26ba1e462b119fe9d1c1441d54337 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Feb 2020 17:28:40 +0900
Subject: [PATCH 0615/1142] Fix caught fruit radius being incorrect due to
 moved scale

---
 .../Drawable/DrawableCatchHitObject.cs        | 30 ++++++++++++++++
 .../Objects/Drawable/DrawableDroplet.cs       | 36 +++----------------
 .../Objects/Drawable/DrawableFruit.cs         | 31 ++--------------
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs     |  8 ++---
 4 files changed, 41 insertions(+), 64 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs
index bfef1ba605..188de6a6ae 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs
@@ -2,11 +2,15 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawable
 {
@@ -15,6 +19,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
     {
         public override bool CanBePlated => true;
 
+        protected Container ScaleContainer;
+
         protected PalpableCatchHitObject(TObject hitObject)
             : base(hitObject)
         {
@@ -22,6 +28,28 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
             Size = new Vector2(CatchHitObject.OBJECT_RADIUS * 2);
             Masking = false;
         }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            AddRangeInternal(new Framework.Graphics.Drawable[]
+            {
+                ScaleContainer = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre,
+                }
+            });
+
+            ScaleContainer.Scale = new Vector2(HitObject.Scale);
+        }
+
+        protected override void UpdateComboColour(Color4 proposedColour, IReadOnlyList<Color4> comboColours)
+        {
+            // ignore the incoming combo colour as we use a custom lookup
+            AccentColour.Value = comboColours[(HitObject.IndexInBeatmap + 1) % comboColours.Count];
+        }
     }
 
     public abstract class DrawableCatchHitObject<TObject> : DrawableCatchHitObject
@@ -43,6 +71,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
 
         public virtual bool StaysOnPlate => CanBePlated;
 
+        public float DisplayRadius => DrawSize.X / 2 * Scale.X * HitObject.Scale;
+
         protected DrawableCatchHitObject(CatchHitObject hitObject)
             : base(hitObject)
         {
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
index d0160f8cce..4e8faed091 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
@@ -1,13 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Collections.Generic;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Catch.Objects.Drawable.Pieces;
 using osu.Game.Skinning;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawable
@@ -16,8 +12,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
     {
         public override bool StaysOnPlate => false;
 
-        protected Container ScaleContainer;
-
         public DrawableDroplet(Droplet h)
             : base(h)
         {
@@ -26,32 +20,12 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddRangeInternal(new Framework.Graphics.Drawable[]
-            {
-                ScaleContainer = new Container
+            ScaleContainer.Child = new SkinnableDrawable(
+                new CatchSkinComponent(CatchSkinComponents.Droplet), _ => new Pulp
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    Origin = Anchor.Centre,
-                    Anchor = Anchor.Centre,
-                    Children = new Framework.Graphics.Drawable[]
-                    {
-                        new SkinnableDrawable(
-                            new CatchSkinComponent(CatchSkinComponents.Droplet), _ => new Pulp
-                            {
-                                Size = Size / 4,
-                                AccentColour = { Value = Color4.White }
-                            })
-                    }
-                }
-            });
-
-            ScaleContainer.Scale = new Vector2(HitObject.Scale);
-        }
-
-        protected override void UpdateComboColour(Color4 proposedColour, IReadOnlyList<Color4> comboColours)
-        {
-            // ignore the incoming combo colour as we use a custom lookup
-            AccentColour.Value = comboColours[(HitObject.IndexInBeatmap + 1) % comboColours.Count];
+                    Size = Size / 4,
+                    AccentColour = { Value = Color4.White }
+                });
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
index 99f7e9386e..daa84f1057 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
@@ -2,21 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
 using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
 using osu.Game.Skinning;
-using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawable
 {
     public class DrawableFruit : PalpableCatchHitObject<Fruit>
     {
-        private Container scaleContainer;
-
         public DrawableFruit(Fruit h)
             : base(h)
         {
@@ -26,28 +19,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddRangeInternal(new Framework.Graphics.Drawable[]
-            {
-                scaleContainer = new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Origin = Anchor.Centre,
-                    Anchor = Anchor.Centre,
-                    Children = new Framework.Graphics.Drawable[]
-                    {
-                        new SkinnableDrawable(
-                            new CatchSkinComponent(getComponent(HitObject.VisualRepresentation)), _ => new FruitPiece())
-                    }
-                }
-            });
-
-            scaleContainer.Scale = new Vector2(HitObject.Scale);
-        }
-
-        protected override void UpdateComboColour(Color4 proposedColour, IReadOnlyList<Color4> comboColours)
-        {
-            // ignore the incoming combo colour as we use a custom lookup
-            AccentColour.Value = comboColours[(HitObject.IndexInBeatmap + 1) % comboColours.Count];
+            ScaleContainer.Child = new SkinnableDrawable(
+                new CatchSkinComponent(getComponent(HitObject.VisualRepresentation)), _ => new FruitPiece());
         }
 
         private CatchSkinComponents getComponent(FruitVisualRepresentation hitObjectVisualRepresentation)
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 1ad12dc4ad..9ded0ff891 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -74,11 +74,11 @@ namespace osu.Game.Rulesets.Catch.UI
 
                 caughtFruit.Anchor = Anchor.TopCentre;
                 caughtFruit.Origin = Anchor.Centre;
-                caughtFruit.Scale *= 0.7f;
+                caughtFruit.Scale *= 0.5f;
                 caughtFruit.LifetimeStart = caughtFruit.HitObject.StartTime;
                 caughtFruit.LifetimeEnd = double.MaxValue;
 
-                MovableCatcher.Add(caughtFruit);
+                MovableCatcher.PlaceOnPlate(caughtFruit);
                 lastPlateableFruit = caughtFruit;
 
                 if (!fruit.StaysOnPlate)
@@ -221,9 +221,9 @@ namespace osu.Game.Rulesets.Catch.UI
             /// Add a caught fruit to the catcher's stack.
             /// </summary>
             /// <param name="fruit">The fruit that was caught.</param>
-            public void Add(DrawableHitObject fruit)
+            public void PlaceOnPlate(DrawableHitObject fruit)
             {
-                float ourRadius = fruit.DrawSize.X / 2 * fruit.Scale.X;
+                float ourRadius = ((DrawableCatchHitObject)fruit).DisplayRadius;
                 float theirRadius = 0;
 
                 const float allowance = 6;

From e3d37b808d6dad9f2a6916a3632d56970e11e320 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 19 Feb 2020 17:33:09 +0900
Subject: [PATCH 0616/1142] Move overlined displays to a higher namespace

---
 .../Visual/Multiplayer/TestSceneOverlinedParticipants.cs       | 2 +-
 .../Visual/Multiplayer/TestSceneOverlinedPlaylist.cs           | 2 +-
 .../Screens/Multi/{Match => }/Components/OverlinedDisplay.cs   | 2 +-
 .../Multi/{Match => }/Components/OverlinedParticipants.cs      | 3 +--
 .../Screens/Multi/{Match => }/Components/OverlinedPlaylist.cs  | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)
 rename osu.Game/Screens/Multi/{Match => }/Components/OverlinedDisplay.cs (98%)
 rename osu.Game/Screens/Multi/{Match => }/Components/OverlinedParticipants.cs (90%)
 rename osu.Game/Screens/Multi/{Match => }/Components/OverlinedPlaylist.cs (95%)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
index e07ebc1454..575602d787 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
@@ -3,7 +3,7 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.Multi.Components;
 using osuTK;
 
 namespace osu.Game.Tests.Visual.Multiplayer
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
index cf4897be50..4e38f6d2c2 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
@@ -5,7 +5,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Screens.Multi.Match.Components;
+using osu.Game.Screens.Multi.Components;
 using osu.Game.Tests.Beatmaps;
 using osuTK;
 
diff --git a/osu.Game/Screens/Multi/Match/Components/OverlinedDisplay.cs b/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs
similarity index 98%
rename from osu.Game/Screens/Multi/Match/Components/OverlinedDisplay.cs
rename to osu.Game/Screens/Multi/Components/OverlinedDisplay.cs
index 854877bd1c..844337aed4 100644
--- a/osu.Game/Screens/Multi/Match/Components/OverlinedDisplay.cs
+++ b/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs
@@ -9,7 +9,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osuTK;
 
-namespace osu.Game.Screens.Multi.Match.Components
+namespace osu.Game.Screens.Multi.Components
 {
     public abstract class OverlinedDisplay : MultiplayerComposite
     {
diff --git a/osu.Game/Screens/Multi/Match/Components/OverlinedParticipants.cs b/osu.Game/Screens/Multi/Components/OverlinedParticipants.cs
similarity index 90%
rename from osu.Game/Screens/Multi/Match/Components/OverlinedParticipants.cs
rename to osu.Game/Screens/Multi/Components/OverlinedParticipants.cs
index 7a4290a9a1..fbf2bb91c5 100644
--- a/osu.Game/Screens/Multi/Match/Components/OverlinedParticipants.cs
+++ b/osu.Game/Screens/Multi/Components/OverlinedParticipants.cs
@@ -3,9 +3,8 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Game.Screens.Multi.Components;
 
-namespace osu.Game.Screens.Multi.Match.Components
+namespace osu.Game.Screens.Multi.Components
 {
     public class OverlinedParticipants : OverlinedDisplay
     {
diff --git a/osu.Game/Screens/Multi/Match/Components/OverlinedPlaylist.cs b/osu.Game/Screens/Multi/Components/OverlinedPlaylist.cs
similarity index 95%
rename from osu.Game/Screens/Multi/Match/Components/OverlinedPlaylist.cs
rename to osu.Game/Screens/Multi/Components/OverlinedPlaylist.cs
index eea85d9d64..4fe79b40a0 100644
--- a/osu.Game/Screens/Multi/Match/Components/OverlinedPlaylist.cs
+++ b/osu.Game/Screens/Multi/Components/OverlinedPlaylist.cs
@@ -6,7 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Online.Multiplayer;
 
-namespace osu.Game.Screens.Multi.Match.Components
+namespace osu.Game.Screens.Multi.Components
 {
     public class OverlinedPlaylist : OverlinedDisplay
     {

From 380d200b46e417db260bb5ca3613dfb107c9615b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 19 Feb 2020 17:34:47 +0900
Subject: [PATCH 0617/1142] Allow different sizing modes for OverlinedDisplay

---
 .../Multi/Components/OverlinedDisplay.cs      | 59 ++++++++++++++-----
 .../Screens/Multi/Match/MatchSubScreen.cs     |  3 +-
 2 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs b/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs
index 844337aed4..600fa99a9a 100644
--- a/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs
+++ b/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs
@@ -15,6 +15,26 @@ namespace osu.Game.Screens.Multi.Components
     {
         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();
+            }
+        }
+
         protected string Details
         {
             set => details.Text = value;
@@ -22,14 +42,12 @@ namespace osu.Game.Screens.Multi.Components
 
         private readonly Circle line;
         private readonly OsuSpriteText details;
+        private readonly GridContainer grid;
 
         protected OverlinedDisplay(string title)
         {
-            RelativeSizeAxes = Axes.Both;
-
-            InternalChild = new GridContainer
+            InternalChild = grid = new GridContainer
             {
-                RelativeSizeAxes = Axes.Both,
                 Content = new[]
                 {
                     new Drawable[]
@@ -62,19 +80,12 @@ namespace osu.Game.Screens.Multi.Components
                     },
                     new Drawable[]
                     {
-                        Content = new Container
-                        {
-                            Margin = new MarginPadding { Top = 5 },
-                            RelativeSizeAxes = Axes.Both
-                        }
+                        Content = new Container { Margin = new MarginPadding { Top = 5 } }
                     }
-                },
-                RowDimensions = new[]
-                {
-                    new Dimension(GridSizeMode.AutoSize),
-                    new Dimension(GridSizeMode.AutoSize),
                 }
             };
+
+            updateDimensions();
         }
 
         [BackgroundDependencyLoader]
@@ -83,5 +94,25 @@ namespace osu.Game.Screens.Multi.Components
             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),
+            };
+
+            grid.AutoSizeAxes = Axes.None;
+            grid.RelativeSizeAxes = Axes.None;
+            grid.AutoSizeAxes = AutoSizeAxes;
+            grid.RelativeSizeAxes = ~AutoSizeAxes;
+
+            Content.AutoSizeAxes = Axes.None;
+            Content.RelativeSizeAxes = Axes.None;
+            Content.AutoSizeAxes = grid.AutoSizeAxes;
+            Content.RelativeSizeAxes = grid.RelativeSizeAxes;
+        }
     }
 }
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index a8630b79b1..caa88a06e0 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -114,7 +114,7 @@ namespace osu.Game.Screens.Multi.Match
                                                             {
                                                                 RelativeSizeAxes = Axes.Both,
                                                                 Padding = new MarginPadding { Right = 5 },
-                                                                Child = new OverlinedParticipants()
+                                                                Child = new OverlinedParticipants { RelativeSizeAxes = Axes.Both }
                                                             },
                                                             new Container
                                                             {
@@ -122,6 +122,7 @@ namespace osu.Game.Screens.Multi.Match
                                                                 Padding = new MarginPadding { Horizontal = 5 },
                                                                 Child = new OverlinedPlaylist(true) // Temporarily always allow selection
                                                                 {
+                                                                    RelativeSizeAxes = Axes.Both,
                                                                     SelectedItem = { BindTarget = SelectedItem }
                                                                 }
                                                             },

From ec73e8f0c717e6baf11367a6b7ba4291652a958a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 19 Feb 2020 17:37:01 +0900
Subject: [PATCH 0618/1142] Allow different sizing modes for
 OverlinedParticipants

---
 .../TestSceneOverlinedParticipants.cs         | 42 ++++++++++++++++---
 .../Graphics/Containers/OsuScrollContainer.cs |  7 ++--
 .../Multi/Components/OverlinedParticipants.cs | 32 +++++++++++++-
 .../Multi/Components/ParticipantsList.cs      | 41 ++++++++++++------
 .../Multi/Lounge/Components/RoomInspector.cs  | 11 ++++-
 .../Screens/Multi/Match/MatchSubScreen.cs     |  2 +-
 6 files changed, 110 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
index 575602d787..1fc258a225 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedParticipants.cs
@@ -1,8 +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;
+using System.Collections.Generic;
+using NUnit.Framework;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Game.Screens.Multi.Components;
 using osuTK;
 
@@ -10,18 +12,46 @@ namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneOverlinedParticipants : MultiplayerTestScene
     {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(OverlinedParticipants),
+            typeof(OverlinedDisplay),
+            typeof(ParticipantsList)
+        };
+
         protected override bool UseOnlineAPI => true;
 
         public TestSceneOverlinedParticipants()
         {
             Room.RoomID.Value = 7;
+        }
 
-            Add(new Container
+        [Test]
+        public void TestHorizontalLayout()
+        {
+            AddStep("create component", () =>
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Size = new Vector2(500),
-                Child = new OverlinedParticipants()
+                Child = new OverlinedParticipants(Direction.Horizontal)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Width = 500,
+                    AutoSizeAxes = Axes.Y,
+                };
+            });
+        }
+
+        [Test]
+        public void TestVerticalLayout()
+        {
+            AddStep("create component", () =>
+            {
+                Child = new OverlinedParticipants(Direction.Vertical)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(500)
+                };
             });
         }
     }
diff --git a/osu.Game/Graphics/Containers/OsuScrollContainer.cs b/osu.Game/Graphics/Containers/OsuScrollContainer.cs
index 6d531887ed..1824fcd878 100644
--- a/osu.Game/Graphics/Containers/OsuScrollContainer.cs
+++ b/osu.Game/Graphics/Containers/OsuScrollContainer.cs
@@ -14,6 +14,9 @@ namespace osu.Game.Graphics.Containers
 {
     public class OsuScrollContainer : ScrollContainer<Drawable>
     {
+        public const float SCROLL_BAR_HEIGHT = 10;
+        public const float SCROLL_BAR_PADDING = 3;
+
         /// <summary>
         /// Allows controlling the scroll bar from any position in the container using the right mouse button.
         /// Uses the value of <see cref="DistanceDecayOnRightMouseScrollbar"/> to smoothly scroll to the dragged location.
@@ -96,8 +99,6 @@ namespace osu.Game.Graphics.Containers
 
         protected class OsuScrollbar : ScrollbarContainer
         {
-            private const float dim_size = 10;
-
             private Color4 hoverColour;
             private Color4 defaultColour;
             private Color4 highlightColour;
@@ -135,7 +136,7 @@ namespace osu.Game.Graphics.Containers
 
             public override void ResizeTo(float val, int duration = 0, Easing easing = Easing.None)
             {
-                Vector2 size = new Vector2(dim_size)
+                Vector2 size = new Vector2(SCROLL_BAR_HEIGHT)
                 {
                     [(int)ScrollDirection] = val
                 };
diff --git a/osu.Game/Screens/Multi/Components/OverlinedParticipants.cs b/osu.Game/Screens/Multi/Components/OverlinedParticipants.cs
index fbf2bb91c5..a709c6a57a 100644
--- a/osu.Game/Screens/Multi/Components/OverlinedParticipants.cs
+++ b/osu.Game/Screens/Multi/Components/OverlinedParticipants.cs
@@ -3,15 +3,43 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Screens.Multi.Components
 {
     public class OverlinedParticipants : OverlinedDisplay
     {
-        public OverlinedParticipants()
+        public new Axes AutoSizeAxes
+        {
+            get => base.AutoSizeAxes;
+            set => base.AutoSizeAxes = value;
+        }
+
+        public OverlinedParticipants(Direction direction)
             : base("Participants")
         {
-            Content.Add(new ParticipantsList { RelativeSizeAxes = Axes.Both });
+            OsuScrollContainer scroll;
+            ParticipantsList list;
+
+            Content.Add(scroll = new OsuScrollContainer(direction)
+            {
+                Child = list = new ParticipantsList()
+            });
+
+            switch (direction)
+            {
+                case Direction.Horizontal:
+                    scroll.RelativeSizeAxes = Axes.X;
+                    scroll.Height = ParticipantsList.TILE_SIZE + OsuScrollContainer.SCROLL_BAR_HEIGHT + OsuScrollContainer.SCROLL_BAR_PADDING * 2;
+                    list.AutoSizeAxes = Axes.Both;
+                    break;
+
+                case Direction.Vertical:
+                    scroll.RelativeSizeAxes = Axes.Both;
+                    list.RelativeSizeAxes = Axes.X;
+                    list.AutoSizeAxes = Axes.Y;
+                    break;
+            }
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Screens/Multi/Components/ParticipantsList.cs b/osu.Game/Screens/Multi/Components/ParticipantsList.cs
index 2ef36b2795..81d530ce68 100644
--- a/osu.Game/Screens/Multi/Components/ParticipantsList.cs
+++ b/osu.Game/Screens/Multi/Components/ParticipantsList.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Users;
@@ -19,21 +18,39 @@ namespace osu.Game.Screens.Multi.Components
 {
     public class ParticipantsList : MultiplayerComposite
     {
+        public const float TILE_SIZE = 70;
+
+        public override Axes RelativeSizeAxes
+        {
+            get => base.RelativeSizeAxes;
+            set
+            {
+                base.RelativeSizeAxes = value;
+                fill.RelativeSizeAxes = value;
+            }
+        }
+
+        public new Axes AutoSizeAxes
+        {
+            get => base.AutoSizeAxes;
+            set
+            {
+                base.AutoSizeAxes = value;
+                fill.AutoSizeAxes = value;
+            }
+        }
+
+        public FillDirection Direction
+        {
+            get => fill.Direction;
+            set => fill.Direction = value;
+        }
+
         private readonly FillFlowContainer fill;
 
         public ParticipantsList()
         {
-            InternalChild = new OsuScrollContainer
-            {
-                RelativeSizeAxes = Axes.Both,
-                Child = fill = new FillFlowContainer
-                {
-                    Spacing = new Vector2(10),
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Direction = FillDirection.Full,
-                }
-            };
+            InternalChild = fill = new FillFlowContainer { Spacing = new Vector2(10) };
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs
index cb6bbf6731..b86495784a 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Components;
@@ -157,7 +158,15 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                             {
                                 RelativeSizeAxes = Axes.Both,
                                 Padding = new MarginPadding { Horizontal = 10 },
-                                Child = new ParticipantsList { RelativeSizeAxes = Axes.Both }
+                                Child = new OsuScrollContainer
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Child = new ParticipantsList
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y
+                                    }
+                                }
                             }
                         }
                     }
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index caa88a06e0..422aeb3298 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -114,7 +114,7 @@ namespace osu.Game.Screens.Multi.Match
                                                             {
                                                                 RelativeSizeAxes = Axes.Both,
                                                                 Padding = new MarginPadding { Right = 5 },
-                                                                Child = new OverlinedParticipants { RelativeSizeAxes = Axes.Both }
+                                                                Child = new OverlinedParticipants(Direction.Vertical) { RelativeSizeAxes = Axes.Both }
                                                             },
                                                             new Container
                                                             {

From ac416ae743b825705baf45608b40b0bfb34225e9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 19 Feb 2020 17:47:59 +0900
Subject: [PATCH 0619/1142] Implement new room inspector redesign

---
 .../Multiplayer/TestSceneLoungeRoomInfo.cs    |  59 +++++
 .../Multi/Lounge/Components/RoomInfo.cs       |  89 ++++++++
 .../Multi/Lounge/Components/RoomInspector.cs  | 203 +++---------------
 3 files changed, 176 insertions(+), 175 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
 create mode 100644 osu.Game/Screens/Multi/Lounge/Components/RoomInfo.cs

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
new file mode 100644
index 0000000000..1e1bc9725c
--- /dev/null
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomInfo.cs
@@ -0,0 +1,59 @@
+// 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 NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Game.Online.Multiplayer;
+using osu.Game.Online.Multiplayer.RoomStatuses;
+using osu.Game.Screens.Multi.Lounge.Components;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.Visual.Multiplayer
+{
+    public class TestSceneLoungeRoomInfo : MultiplayerTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(RoomInfo)
+        };
+
+        [SetUp]
+        public void Setup() => Schedule(() =>
+        {
+            Room.CopyFrom(new Room());
+
+            Child = new RoomInfo
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Width = 500
+            };
+        });
+
+        public override void SetUpSteps()
+        {
+            // Todo: Temp
+        }
+
+        [Test]
+        public void TestNonSelectedRoom()
+        {
+            AddStep("set null room", () => Room.RoomID.Value = null);
+        }
+
+        [Test]
+        public void TestOpenRoom()
+        {
+            AddStep("set open room", () =>
+            {
+                Room.RoomID.Value = 0;
+                Room.Name.Value = "Room 0";
+                Room.Host.Value = new User { Username = "peppy", Id = 2 };
+                Room.EndDate.Value = DateTimeOffset.Now.AddMonths(1);
+                Room.Status.Value = new RoomStatusOpen();
+            });
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomInfo.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomInfo.cs
new file mode 100644
index 0000000000..02f2667802
--- /dev/null
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomInfo.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 System.Collections.Generic;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Screens.Multi.Components;
+using osuTK;
+
+namespace osu.Game.Screens.Multi.Lounge.Components
+{
+    public class RoomInfo : MultiplayerComposite
+    {
+        private readonly List<Drawable> statusElements = new List<Drawable>();
+        private readonly SpriteText roomName;
+
+        public RoomInfo()
+        {
+            AutoSizeAxes = Axes.Y;
+
+            RoomStatusInfo statusInfo;
+            ModeTypeInfo typeInfo;
+            ParticipantInfo participantInfo;
+
+            InternalChild = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 4),
+                Children = new Drawable[]
+                {
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Children = new Drawable[]
+                        {
+                            new FillFlowContainer
+                            {
+                                Anchor = Anchor.CentreLeft,
+                                Origin = Anchor.CentreLeft,
+                                AutoSizeAxes = Axes.Both,
+                                Direction = FillDirection.Vertical,
+                                Children = new Drawable[]
+                                {
+                                    roomName = new OsuSpriteText { Font = OsuFont.GetFont(size: 30) },
+                                    statusInfo = new RoomStatusInfo(),
+                                }
+                            },
+                            typeInfo = new ModeTypeInfo
+                            {
+                                Anchor = Anchor.CentreRight,
+                                Origin = Anchor.CentreRight
+                            }
+                        }
+                    },
+                    participantInfo = new ParticipantInfo(),
+                }
+            };
+
+            statusElements.AddRange(new Drawable[] { statusInfo, typeInfo, participantInfo });
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            if (RoomID.Value == null)
+                statusElements.ForEach(e => e.FadeOut());
+
+            RoomID.BindValueChanged(id =>
+            {
+                if (id.NewValue == null)
+                    statusElements.ForEach(e => e.FadeOut(100));
+                else
+                    statusElements.ForEach(e => e.FadeIn(100));
+            }, true);
+
+            RoomName.BindValueChanged(name =>
+            {
+                roomName.Text = name.NewValue ?? "No room selected";
+            }, true);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs
index b86495784a..891853dee5 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs
@@ -2,19 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.Multi.Components;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Multi.Lounge.Components
@@ -25,16 +18,9 @@ namespace osu.Game.Screens.Multi.Lounge.Components
 
         private readonly MarginPadding contentPadding = new MarginPadding { Horizontal = 20, Vertical = 10 };
 
-        private ParticipantCountDisplay participantCount;
-        private OsuSpriteText name;
-        private BeatmapTypeInfo beatmapTypeInfo;
-        private ParticipantInfo participantInfo;
-
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
-        private readonly Bindable<RoomStatus> status = new Bindable<RoomStatus>(new RoomStatusNoneSelected());
-
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
@@ -43,185 +29,52 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = OsuColour.FromHex(@"343138"),
+                    Colour = Color4.Black,
+                    Alpha = 0.25f
                 },
-                new GridContainer
+                new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    RowDimensions = new[]
+                    Padding = new MarginPadding { Horizontal = 30 },
+                    Child = new GridContainer
                     {
-                        new Dimension(GridSizeMode.AutoSize),
-                        new Dimension(GridSizeMode.Distributed),
-                    },
-                    Content = new[]
-                    {
-                        new Drawable[]
+                        RelativeSizeAxes = Axes.Both,
+                        Content = new[]
                         {
-                            new FillFlowContainer
+                            new Drawable[]
                             {
-                                RelativeSizeAxes = Axes.X,
-                                AutoSizeAxes = Axes.Y,
-                                Direction = FillDirection.Vertical,
-                                Children = new Drawable[]
+                                new FillFlowContainer
                                 {
-                                    new Container
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Direction = FillDirection.Vertical,
+                                    Children = new Drawable[]
                                     {
-                                        RelativeSizeAxes = Axes.X,
-                                        Height = 200,
-                                        Masking = true,
-                                        Children = new Drawable[]
+                                        new RoomInfo
                                         {
-                                            new MultiplayerBackgroundSprite { RelativeSizeAxes = Axes.Both },
-                                            new Box
-                                            {
-                                                RelativeSizeAxes = Axes.Both,
-                                                Colour = ColourInfo.GradientVertical(Color4.Black.Opacity(0.5f), Color4.Black.Opacity(0)),
-                                            },
-                                            new Container
-                                            {
-                                                RelativeSizeAxes = Axes.Both,
-                                                Padding = new MarginPadding(20),
-                                                Children = new Drawable[]
-                                                {
-                                                    participantCount = new ParticipantCountDisplay
-                                                    {
-                                                        Anchor = Anchor.TopRight,
-                                                        Origin = Anchor.TopRight,
-                                                    },
-                                                    name = new OsuSpriteText
-                                                    {
-                                                        Anchor = Anchor.BottomLeft,
-                                                        Origin = Anchor.BottomLeft,
-                                                        Font = OsuFont.GetFont(size: 30),
-                                                        Current = RoomName
-                                                    },
-                                                },
-                                            },
+                                            RelativeSizeAxes = Axes.X,
+                                            Margin = new MarginPadding { Vertical = 60 },
                                         },
-                                    },
-                                    new StatusColouredContainer(transition_duration)
-                                    {
-                                        RelativeSizeAxes = Axes.X,
-                                        Height = 5,
-                                        Child = new Box { RelativeSizeAxes = Axes.Both }
-                                    },
-                                    new Container
-                                    {
-                                        RelativeSizeAxes = Axes.X,
-                                        AutoSizeAxes = Axes.Y,
-                                        Children = new Drawable[]
+                                        new OverlinedParticipants(Direction.Horizontal)
                                         {
-                                            new Box
-                                            {
-                                                RelativeSizeAxes = Axes.Both,
-                                                Colour = OsuColour.FromHex(@"28242d"),
-                                            },
-                                            new FillFlowContainer
-                                            {
-                                                RelativeSizeAxes = Axes.X,
-                                                AutoSizeAxes = Axes.Y,
-                                                Direction = FillDirection.Vertical,
-                                                LayoutDuration = transition_duration,
-                                                Padding = contentPadding,
-                                                Spacing = new Vector2(0f, 5f),
-                                                Children = new Drawable[]
-                                                {
-                                                    new StatusColouredContainer(transition_duration)
-                                                    {
-                                                        AutoSizeAxes = Axes.Both,
-                                                        Child = new StatusText
-                                                        {
-                                                            Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 14),
-                                                        }
-                                                    },
-                                                    beatmapTypeInfo = new BeatmapTypeInfo(),
-                                                },
-                                            },
+                                            RelativeSizeAxes = Axes.X,
+                                            AutoSizeAxes = Axes.Y
                                         },
-                                    },
-                                    new Container
-                                    {
-                                        RelativeSizeAxes = Axes.X,
-                                        AutoSizeAxes = Axes.Y,
-                                        Padding = contentPadding,
-                                        Children = new Drawable[]
-                                        {
-                                            participantInfo = new ParticipantInfo(),
-                                        },
-                                    },
-                                },
-                            },
-                        },
-                        new Drawable[]
-                        {
-                            new Container
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Padding = new MarginPadding { Horizontal = 10 },
-                                Child = new OsuScrollContainer
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Child = new ParticipantsList
-                                    {
-                                        RelativeSizeAxes = Axes.X,
-                                        AutoSizeAxes = Axes.Y
                                     }
                                 }
-                            }
+                            },
+                            new Drawable[]
+                            {
+                                new OverlinedPlaylist(false) { RelativeSizeAxes = Axes.Both },
+                            },
+                        },
+                        RowDimensions = new[]
+                        {
+                            new Dimension(GridSizeMode.AutoSize),
                         }
                     }
                 }
             };
-
-            Status.BindValueChanged(_ => updateStatus(), true);
-            RoomID.BindValueChanged(_ => updateStatus(), true);
-        }
-
-        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
-        {
-            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-            dependencies.CacheAs(status, new CacheInfo(nameof(Room.Status), typeof(Room)));
-            return dependencies;
-        }
-
-        private void updateStatus()
-        {
-            if (RoomID.Value == null)
-            {
-                status.Value = new RoomStatusNoneSelected();
-
-                participantCount.FadeOut(transition_duration);
-                beatmapTypeInfo.FadeOut(transition_duration);
-                name.FadeOut(transition_duration);
-                participantInfo.FadeOut(transition_duration);
-            }
-            else
-            {
-                status.Value = Status.Value;
-
-                participantCount.FadeIn(transition_duration);
-                beatmapTypeInfo.FadeIn(transition_duration);
-                name.FadeIn(transition_duration);
-                participantInfo.FadeIn(transition_duration);
-            }
-        }
-
-        private class RoomStatusNoneSelected : RoomStatus
-        {
-            public override string Message => @"No Room Selected";
-            public override Color4 GetAppropriateColour(OsuColour colours) => colours.Gray8;
-        }
-
-        private class StatusText : OsuSpriteText
-        {
-            [Resolved(typeof(Room), nameof(Room.Status))]
-            private Bindable<RoomStatus> status { get; set; }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                status.BindValueChanged(s => Text = s.NewValue.Message, true);
-            }
         }
     }
 }

From 7b27f6b37829e98a6643e737227eb0616032aa2b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Feb 2020 17:55:40 +0900
Subject: [PATCH 0620/1142] Add droplet rotation animation

---
 .../Objects/Drawable/DrawableDroplet.cs             | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
index 4e8faed091..b7a097eb71 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Catch.Objects.Drawable.Pieces;
 using osu.Game.Skinning;
 using osuTK.Graphics;
@@ -27,5 +29,16 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                     AccentColour = { Value = Color4.White }
                 });
         }
+
+        protected override void UpdateInitialTransforms()
+        {
+            base.UpdateInitialTransforms();
+
+            // roughly matches osu-stable
+            float startRotation = RNG.NextSingle() * 20;
+            double duration = HitObject.TimePreempt + 2000;
+
+            this.RotateTo(startRotation).RotateTo(startRotation + 720, duration);
+        }
     }
 }

From ea0bbd29260f6db326d1ad44aa8acaaa42197f02 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Feb 2020 18:01:59 +0900
Subject: [PATCH 0621/1142] Rename drawable namespace to avoid clashes with
 framework class

---
 .../TestSceneBananaShower.cs                   |  2 +-
 .../TestSceneDrawableHitObjects.cs             |  2 +-
 .../TestSceneFruitObjects.cs                   |  4 ++--
 osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs |  2 +-
 .../{Drawable => Drawables}/DrawableBanana.cs  |  2 +-
 .../DrawableBananaShower.cs                    |  2 +-
 .../DrawableCatchHitObject.cs                  |  4 ++--
 .../{Drawable => Drawables}/DrawableDroplet.cs |  4 ++--
 .../{Drawable => Drawables}/DrawableFruit.cs   |  2 +-
 .../DrawableJuiceStream.cs                     |  2 +-
 .../DrawableTinyDroplet.cs                     |  2 +-
 .../{Drawable => Drawables}/FruitPiece.cs      | 18 +++++++++---------
 .../{Drawable => Drawables}/Pieces/Pulp.cs     |  2 +-
 .../Skinning/LegacyFruitPiece.cs               |  2 +-
 osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs   |  2 +-
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs      |  2 +-
 .../UI/DrawableCatchRuleset.cs                 |  2 +-
 17 files changed, 28 insertions(+), 28 deletions(-)
 rename osu.Game.Rulesets.Catch/Objects/{Drawable => Drawables}/DrawableBanana.cs (95%)
 rename osu.Game.Rulesets.Catch/Objects/{Drawable => Drawables}/DrawableBananaShower.cs (97%)
 rename osu.Game.Rulesets.Catch/Objects/{Drawable => Drawables}/DrawableCatchHitObject.cs (97%)
 rename osu.Game.Rulesets.Catch/Objects/{Drawable => Drawables}/DrawableDroplet.cs (88%)
 rename osu.Game.Rulesets.Catch/Objects/{Drawable => Drawables}/DrawableFruit.cs (96%)
 rename osu.Game.Rulesets.Catch/Objects/{Drawable => Drawables}/DrawableJuiceStream.cs (97%)
 rename osu.Game.Rulesets.Catch/Objects/{Drawable => Drawables}/DrawableTinyDroplet.cs (89%)
 rename osu.Game.Rulesets.Catch/Objects/{Drawable => Drawables}/FruitPiece.cs (94%)
 rename osu.Game.Rulesets.Catch/Objects/{Drawable => Drawables}/Pieces/Pulp.cs (95%)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs
index 0ad72412fc..56e378d19e 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Rulesets.Catch.Objects.Drawable;
+using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Tests.Visual;
 
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
index 1eb913e900..070847c0c1 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
@@ -10,7 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Rulesets.Catch.Objects.Drawable;
+using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
index b106ee2f77..b65313edf5 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
@@ -6,8 +6,8 @@ using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Rulesets.Catch.Objects.Drawable;
-using osu.Game.Rulesets.Catch.Objects.Drawable.Pieces;
+using osu.Game.Rulesets.Catch.Objects.Drawables;
+using osu.Game.Rulesets.Catch.Objects.Drawables.Pieces;
 using osu.Game.Tests.Visual;
 using osuTK;
 
diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs b/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
index 606a935229..ee88edbea1 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
@@ -3,7 +3,7 @@
 
 using System.Linq;
 using osu.Framework.Graphics;
-using osu.Game.Rulesets.Catch.Objects.Drawable;
+using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;
 
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBanana.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
similarity index 95%
rename from osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBanana.cs
rename to osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
index 8625b93786..60e4ff8946 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBanana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using osu.Framework.Utils;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Catch.Objects.Drawable
+namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     public class DrawableBanana : DrawableFruit
     {
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBananaShower.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBananaShower.cs
similarity index 97%
rename from osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBananaShower.cs
rename to osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBananaShower.cs
index ea415e18fa..4ce80aceb8 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBananaShower.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBananaShower.cs
@@ -7,7 +7,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 
-namespace osu.Game.Rulesets.Catch.Objects.Drawable
+namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     public class DrawableBananaShower : DrawableCatchHitObject<BananaShower>
     {
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
similarity index 97%
rename from osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs
rename to osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index 188de6a6ae..dcf9405e2e 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -12,7 +12,7 @@ using osu.Game.Rulesets.Scoring;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Catch.Objects.Drawable
+namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     public abstract class PalpableCatchHitObject<TObject> : DrawableCatchHitObject<TObject>
         where TObject : CatchHitObject
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddRangeInternal(new Framework.Graphics.Drawable[]
+            AddRangeInternal(new Drawable[]
             {
                 ScaleContainer = new Container
                 {
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
similarity index 88%
rename from osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
rename to osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
index 4e8faed091..bfa63b503e 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
@@ -2,11 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Game.Rulesets.Catch.Objects.Drawable.Pieces;
+using osu.Game.Rulesets.Catch.Objects.Drawables.Pieces;
 using osu.Game.Skinning;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Catch.Objects.Drawable
+namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     public class DrawableDroplet : PalpableCatchHitObject<Droplet>
     {
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
similarity index 96%
rename from osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
rename to osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
index daa84f1057..197ad41247 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
@@ -6,7 +6,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Utils;
 using osu.Game.Skinning;
 
-namespace osu.Game.Rulesets.Catch.Objects.Drawable
+namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     public class DrawableFruit : PalpableCatchHitObject<Fruit>
     {
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableJuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableJuiceStream.cs
similarity index 97%
rename from osu.Game.Rulesets.Catch/Objects/Drawable/DrawableJuiceStream.cs
rename to osu.Game.Rulesets.Catch/Objects/Drawables/DrawableJuiceStream.cs
index f76055e1ea..1399539cdd 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableJuiceStream.cs
@@ -7,7 +7,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 
-namespace osu.Game.Rulesets.Catch.Objects.Drawable
+namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     public class DrawableJuiceStream : DrawableCatchHitObject<JuiceStream>
     {
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableTinyDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableTinyDroplet.cs
similarity index 89%
rename from osu.Game.Rulesets.Catch/Objects/Drawable/DrawableTinyDroplet.cs
rename to osu.Game.Rulesets.Catch/Objects/Drawables/DrawableTinyDroplet.cs
index 4fe1f86f2b..bb55a39186 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableTinyDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableTinyDroplet.cs
@@ -3,7 +3,7 @@
 
 using osu.Framework.Allocation;
 
-namespace osu.Game.Rulesets.Catch.Objects.Drawable
+namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     public class DrawableTinyDroplet : DrawableDroplet
     {
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
similarity index 94%
rename from osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs
rename to osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
index 24f558db78..c6fa5290e9 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
@@ -7,12 +7,12 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Rulesets.Catch.Objects.Drawable.Pieces;
+using osu.Game.Rulesets.Catch.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Objects.Drawables;
 using osuTK;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Catch.Objects.Drawable
+namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     internal class FruitPiece : CompositeDrawable
     {
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                     Origin = Anchor.Centre,
                     BorderColour = Color4.White,
                     BorderThickness = 6f * radius_adjust,
-                    Children = new Framework.Graphics.Drawable[]
+                    Children = new Drawable[]
                     {
                         new Box
                         {
@@ -84,7 +84,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
             border.Alpha = (float)Math.Clamp((hitObject.StartTime - Time.Current) / 500, 0, 1);
         }
 
-        private Framework.Graphics.Drawable createPulp(FruitVisualRepresentation representation)
+        private Drawable createPulp(FruitVisualRepresentation representation)
         {
             const float large_pulp_3 = 16f * radius_adjust;
             const float distance_from_centre_3 = 0.15f;
@@ -107,7 +107,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                     return new Container
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Children = new Framework.Graphics.Drawable[]
+                        Children = new Drawable[]
                         {
                             new Pulp
                             {
@@ -146,7 +146,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                     return new Container
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Children = new Framework.Graphics.Drawable[]
+                        Children = new Drawable[]
                         {
                             new Pulp
                             {
@@ -185,7 +185,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                     return new Container
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Children = new Framework.Graphics.Drawable[]
+                        Children = new Drawable[]
                         {
                             new Pulp
                             {
@@ -218,7 +218,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                     return new Container
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Children = new Framework.Graphics.Drawable[]
+                        Children = new Drawable[]
                         {
                             new Pulp
                             {
@@ -252,7 +252,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                     return new Container
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Children = new Framework.Graphics.Drawable[]
+                        Children = new Drawable[]
                         {
                             new Pulp
                             {
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/Pieces/Pulp.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/Pulp.cs
similarity index 95%
rename from osu.Game.Rulesets.Catch/Objects/Drawable/Pieces/Pulp.cs
rename to osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/Pulp.cs
index 517978eb07..1e7506a257 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/Pieces/Pulp.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/Pieces/Pulp.cs
@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osuTK.Graphics;
 
-namespace osu.Game.Rulesets.Catch.Objects.Drawable.Pieces
+namespace osu.Game.Rulesets.Catch.Objects.Drawables.Pieces
 {
     public class Pulp : Circle
     {
diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
index 909db41736..2631fe5487 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
@@ -6,7 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Rulesets.Catch.Objects.Drawable;
+using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK.Graphics;
diff --git a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
index 2d71fb93fb..2319c5ac1f 100644
--- a/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
@@ -6,7 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Rulesets.Catch.Objects.Drawable;
+using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI.Scrolling;
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 9ded0ff891..32053b861f 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -11,7 +11,7 @@ using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Judgements;
 using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Rulesets.Catch.Objects.Drawable;
+using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Catch.Replays;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
diff --git a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
index fdd820b891..fd8a1d175d 100644
--- a/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
@@ -8,7 +8,7 @@ using osu.Game.Configuration;
 using osu.Game.Input.Handlers;
 using osu.Game.Replays;
 using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Rulesets.Catch.Objects.Drawable;
+using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Catch.Replays;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects.Drawables;

From e96668904406abd2d81c9a0c988835ffaf264152 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 19 Feb 2020 19:42:25 +0900
Subject: [PATCH 0622/1142] Add beatmap background to multiplayer

---
 .../Multi/Lounge/Components/FilterControl.cs  |  3 +-
 .../Screens/Multi/Match/MatchSubScreen.cs     | 21 -----
 osu.Game/Screens/Multi/Multiplayer.cs         | 92 +++++++++++++++----
 3 files changed, 73 insertions(+), 43 deletions(-)

diff --git a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
index 9f93afec9d..666051ba8e 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
@@ -5,7 +5,6 @@ using System.ComponentModel;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Threading;
-using osu.Game.Graphics;
 using osu.Game.Overlays.SearchableList;
 using osu.Game.Rulesets;
 using osuTK.Graphics;
@@ -14,7 +13,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
 {
     public class FilterControl : SearchableListFilterControl<PrimaryFilter, SecondaryFilter>
     {
-        protected override Color4 BackgroundColour => OsuColour.FromHex(@"362e42");
+        protected override Color4 BackgroundColour => Color4.Transparent;
         protected override PrimaryFilter DefaultTab => PrimaryFilter.Open;
         protected override SecondaryFilter DefaultCategory => SecondaryFilter.Public;
 
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index a8630b79b1..5258d8429e 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -5,22 +5,17 @@ using System;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.Drawables;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Multiplayer.GameTypes;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Match.Components;
 using osu.Game.Screens.Multi.Play;
 using osu.Game.Screens.Select;
-using osuTK.Graphics;
 using Footer = osu.Game.Screens.Multi.Match.Components.Footer;
 
 namespace osu.Game.Screens.Multi.Match
@@ -64,12 +59,6 @@ namespace osu.Game.Screens.Multi.Match
         {
             InternalChildren = new Drawable[]
             {
-                new HeaderBackgroundSprite
-                {
-                    RelativeSizeAxes = Axes.X,
-                    Height = 200,
-                    Colour = ColourInfo.GradientVertical(Color4.White.Opacity(0.4f), Color4.White.Opacity(0))
-                },
                 new GridContainer
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -252,15 +241,5 @@ namespace osu.Game.Screens.Multi.Match
             if (beatmapManager != null)
                 beatmapManager.ItemAdded -= beatmapAdded;
         }
-
-        private class HeaderBackgroundSprite : MultiplayerBackgroundSprite
-        {
-            protected override UpdateableBeatmapBackgroundSprite CreateBackgroundSprite() => new BackgroundSprite { RelativeSizeAxes = Axes.Both };
-
-            private class BackgroundSprite : UpdateableBeatmapBackgroundSprite
-            {
-                protected override double TransformDuration => 200;
-            }
-        }
     }
 }
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 2277157134..13537e2be8 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -4,14 +4,16 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input;
@@ -19,6 +21,7 @@ using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Overlays.BeatmapSet.Buttons;
 using osu.Game.Screens.Menu;
+using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Lounge.Components;
 using osu.Game.Screens.Multi.Match;
@@ -62,6 +65,9 @@ namespace osu.Game.Screens.Multi
         [Resolved(CanBeNull = true)]
         private OsuLogo logo { get; set; }
 
+        private readonly Drawable header;
+        private readonly Drawable headerBackground;
+
         public Multiplayer()
         {
             Anchor = Anchor.Centre;
@@ -74,31 +80,51 @@ namespace osu.Game.Screens.Multi
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
                 {
-                    new Container
+                    new Box
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Masking = true,
-                        Children = new Drawable[]
-                        {
-                            new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Colour = OsuColour.FromHex(@"3e3a44"),
-                            },
-                            new Triangles
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                ColourLight = OsuColour.FromHex(@"3c3842"),
-                                ColourDark = OsuColour.FromHex(@"393540"),
-                                TriangleScale = 5,
-                            },
-                        },
+                        Colour = OsuColour.FromHex(@"3e3a44"),
                     },
                     new Container
                     {
                         RelativeSizeAxes = Axes.Both,
                         Padding = new MarginPadding { Top = Header.HEIGHT },
-                        Child = screenStack = new MultiplayerSubScreenStack { RelativeSizeAxes = Axes.Both }
+                        Children = new[]
+                        {
+                            header = new Container
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                Height = 400,
+                                Children = new[]
+                                {
+                                    headerBackground = new Container
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        Width = 1.25f,
+                                        Masking = true,
+                                        Children = new Drawable[]
+                                        {
+                                            new HeaderBackgroundSprite
+                                            {
+                                                RelativeSizeAxes = Axes.X,
+                                                Height = 400 // Keep a static height so the header doesn't change as it's resized
+                                            },
+                                        }
+                                    },
+                                    new Container
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        Padding = new MarginPadding { Bottom = -1 }, // 1px padding to avoid a 1px gap due to masking
+                                        Child = new Box
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Colour = ColourInfo.GradientVertical(OsuColour.FromHex(@"3e3a44").Opacity(0.6f), OsuColour.FromHex(@"3e3a44"))
+                                        },
+                                    }
+                                }
+                            },
+                            screenStack = new MultiplayerSubScreenStack { RelativeSizeAxes = Axes.Both }
+                        }
                     },
                     new Header(screenStack),
                     createButton = new HeaderButton
@@ -259,7 +285,10 @@ namespace osu.Game.Screens.Multi
             Beatmap.ValueChanged -= updateTrack;
         }
 
-        private void screenPushed(IScreen lastScreen, IScreen newScreen) => subScreenChanged(newScreen);
+        private void screenPushed(IScreen lastScreen, IScreen newScreen)
+        {
+            subScreenChanged(newScreen);
+        }
 
         private void screenExited(IScreen lastScreen, IScreen newScreen)
         {
@@ -271,6 +300,19 @@ namespace osu.Game.Screens.Multi
 
         private void subScreenChanged(IScreen newScreen)
         {
+            switch (newScreen)
+            {
+                case LoungeSubScreen _:
+                    header.ResizeHeightTo(400, WaveContainer.APPEAR_DURATION, Easing.OutQuint);
+                    headerBackground.MoveToX(0, WaveContainer.DISAPPEAR_DURATION, Easing.OutQuint);
+                    break;
+
+                case MatchSubScreen _:
+                    header.ResizeHeightTo(135, WaveContainer.APPEAR_DURATION, Easing.OutQuint);
+                    headerBackground.MoveToX(-200, WaveContainer.DISAPPEAR_DURATION, Easing.OutQuint);
+                    break;
+            }
+
             updatePollingRate(isIdle.Value);
             createButton.FadeTo(newScreen is LoungeSubScreen ? 1 : 0, 200);
 
@@ -327,5 +369,15 @@ namespace osu.Game.Screens.Multi
                 FourthWaveColour = OsuColour.FromHex(@"392850");
             }
         }
+
+        private class HeaderBackgroundSprite : MultiplayerBackgroundSprite
+        {
+            protected override UpdateableBeatmapBackgroundSprite CreateBackgroundSprite() => new BackgroundSprite { RelativeSizeAxes = Axes.Both };
+
+            private class BackgroundSprite : UpdateableBeatmapBackgroundSprite
+            {
+                protected override double TransformDuration => 200;
+            }
+        }
     }
 }

From 33382416327e95b1bb0ddfee86fe1f32d1f4a0bd Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 19 Feb 2020 19:48:34 +0900
Subject: [PATCH 0623/1142] Add back filter control background, adjust opacity

---
 osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs | 3 ++-
 osu.Game/Screens/Multi/Multiplayer.cs                     | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
index 666051ba8e..300418441e 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
@@ -4,6 +4,7 @@
 using System.ComponentModel;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Threading;
 using osu.Game.Overlays.SearchableList;
 using osu.Game.Rulesets;
@@ -13,7 +14,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
 {
     public class FilterControl : SearchableListFilterControl<PrimaryFilter, SecondaryFilter>
     {
-        protected override Color4 BackgroundColour => Color4.Transparent;
+        protected override Color4 BackgroundColour => Color4.Black.Opacity(0.5f);
         protected override PrimaryFilter DefaultTab => PrimaryFilter.Open;
         protected override SecondaryFilter DefaultCategory => SecondaryFilter.Public;
 
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 13537e2be8..07d930fa75 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -75,6 +75,8 @@ namespace osu.Game.Screens.Multi
             RelativeSizeAxes = Axes.Both;
             Padding = new MarginPadding { Horizontal = -HORIZONTAL_OVERFLOW_PADDING };
 
+            var backgroundColour = OsuColour.FromHex(@"3e3a44");
+
             InternalChild = waves = new MultiplayerWaveContainer
             {
                 RelativeSizeAxes = Axes.Both,
@@ -83,7 +85,7 @@ namespace osu.Game.Screens.Multi
                     new Box
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Colour = OsuColour.FromHex(@"3e3a44"),
+                        Colour = backgroundColour,
                     },
                     new Container
                     {
@@ -118,7 +120,7 @@ namespace osu.Game.Screens.Multi
                                         Child = new Box
                                         {
                                             RelativeSizeAxes = Axes.Both,
-                                            Colour = ColourInfo.GradientVertical(OsuColour.FromHex(@"3e3a44").Opacity(0.6f), OsuColour.FromHex(@"3e3a44"))
+                                            Colour = ColourInfo.GradientVertical(backgroundColour.Opacity(0.7f), backgroundColour)
                                         },
                                     }
                                 }

From f53349ac9d83dd65bed12cf3feba6ca82ad0509d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 19 Feb 2020 19:54:07 +0900
Subject: [PATCH 0624/1142] Reduce size of participants tiles

---
 osu.Game/Screens/Multi/Components/ParticipantsList.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Multi/Components/ParticipantsList.cs b/osu.Game/Screens/Multi/Components/ParticipantsList.cs
index 81d530ce68..e383e0414b 100644
--- a/osu.Game/Screens/Multi/Components/ParticipantsList.cs
+++ b/osu.Game/Screens/Multi/Components/ParticipantsList.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Screens.Multi.Components
 {
     public class ParticipantsList : MultiplayerComposite
     {
-        public const float TILE_SIZE = 70;
+        public const float TILE_SIZE = 35;
 
         public override Axes RelativeSizeAxes
         {
@@ -113,7 +113,7 @@ namespace osu.Game.Screens.Multi.Components
             public UserTile(User user)
             {
                 this.user = user;
-                Size = new Vector2(70f);
+                Size = new Vector2(TILE_SIZE);
                 CornerRadius = 5f;
                 Masking = true;
 

From 146758862a479ec189261b810a4d3942c5bf6de6 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 19 Feb 2020 16:25:06 +0300
Subject: [PATCH 0625/1142] Remove no longer needed null check

---
 osu.Game/Overlays/RankingsOverlay.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index 81cafef2c1..2c5ea61315 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -135,9 +135,6 @@ namespace osu.Game.Overlays
 
         private void loadNewContent()
         {
-            if (ruleset.Value == null)
-                return;
-
             loading.Show();
 
             cancellationToken?.Cancel();

From 378aaf82c1a50d10a439424805dc5b61496d4c45 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 19 Feb 2020 16:32:54 +0300
Subject: [PATCH 0626/1142] Fix error when first Show call has been triggered
 by ShowCountry

---
 osu.Game/Overlays/RankingsOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index 2c5ea61315..404f896cad 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Overlays
 
             Show();
 
-            Country.Value = requested;
+            Schedule(() => Country.Value = requested);
         }
 
         private void loadNewContent()

From 7b0c3281c29938ef01ff40949a954884bea87357 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 19 Feb 2020 16:49:39 +0300
Subject: [PATCH 0627/1142] Make country names clickable

---
 .../Rankings/Tables/CountriesTable.cs         | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs b/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs
index 32ac1404bc..0b9a48ce0e 100644
--- a/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs
+++ b/osu.Game/Overlays/Rankings/Tables/CountriesTable.cs
@@ -9,6 +9,7 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.Rankings.Tables
 {
@@ -61,18 +62,35 @@ namespace osu.Game.Overlays.Rankings.Tables
             }
         };
 
-        private class CountryName : OsuSpriteText
+        private class CountryName : OsuHoverContainer
         {
+            protected override IEnumerable<Drawable> EffectTargets => new[] { text };
+
+            [Resolved(canBeNull: true)]
+            private RankingsOverlay rankings { get; set; }
+
+            private readonly OsuSpriteText text;
+            private readonly Country country;
+
             public CountryName(Country country)
             {
-                Font = OsuFont.GetFont(size: 12);
-                Text = country.FullName ?? string.Empty;
+                this.country = country;
+
+                AutoSizeAxes = Axes.Both;
+                Add(text = new OsuSpriteText
+                {
+                    Font = OsuFont.GetFont(size: 12),
+                    Text = country.FullName ?? string.Empty,
+                });
             }
 
             [BackgroundDependencyLoader]
             private void load(OverlayColourProvider colourProvider)
             {
-                Colour = colourProvider.Light2;
+                IdleColour = colourProvider.Light2;
+                HoverColour = colourProvider.Content2;
+
+                Action = () => rankings?.ShowCountry(country);
             }
         }
     }

From a79398ddbd698d165ee7b0e35242c7c4bd3f4641 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 19 Feb 2020 17:09:22 +0300
Subject: [PATCH 0628/1142] Fix incorrect caching in TestSceneRankingsOverlay

---
 osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
index a769ebe4a9..47582e5486 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
@@ -29,8 +29,9 @@ namespace osu.Game.Tests.Visual.Online
             typeof(RankingsOverlayHeader)
         };
 
-        [Cached]
-        private RankingsOverlay rankingsOverlay;
+        [Cached(typeof(RankingsOverlay))]
+
+        private readonly RankingsOverlay rankingsOverlay;
 
         private readonly Bindable<Country> countryBindable = new Bindable<Country>();
         private readonly Bindable<RankingsScope> scope = new Bindable<RankingsScope>();

From 1417c901738a5be99f56629d02f055f91598e996 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 19 Feb 2020 17:24:44 +0300
Subject: [PATCH 0629/1142] Remove redundant blank line

---
 osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
index 47582e5486..83e5cd0fe7 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
@@ -30,7 +30,6 @@ namespace osu.Game.Tests.Visual.Online
         };
 
         [Cached(typeof(RankingsOverlay))]
-
         private readonly RankingsOverlay rankingsOverlay;
 
         private readonly Bindable<Country> countryBindable = new Bindable<Country>();

From 98654586de78a3d4ace7cd3ef4d60d7af26580b4 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 19 Feb 2020 17:28:14 +0300
Subject: [PATCH 0630/1142] Implement BeatmapListingHeader component

---
 .../BeatmapListing/BeatmapListingHeader.cs    | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs
new file mode 100644
index 0000000000..5af92914de
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingHeader.cs
@@ -0,0 +1,24 @@
+// 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.Graphics.UserInterface;
+
+namespace osu.Game.Overlays.BeatmapListing
+{
+    public class BeatmapListingHeader : OverlayHeader
+    {
+        protected override ScreenTitle CreateTitle() => new BeatmapListingTitle();
+
+        private class BeatmapListingTitle : ScreenTitle
+        {
+            public BeatmapListingTitle()
+            {
+                Title = @"beatmap";
+                Section = @"listing";
+            }
+
+            protected override Drawable CreateIcon() => new ScreenTitleTextureIcon(@"Icons/changelog");
+        }
+    }
+}

From 1442f5e0db37185c88fae5744d30e2c130904249 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 19 Feb 2020 17:30:26 +0300
Subject: [PATCH 0631/1142] Use DirectSortCriteria for
 BeatmapListingSortTabControl

---
 .../BeatmapListingSortTabControl.cs           | 24 ++++++-------------
 osu.Game/Overlays/Direct/FilterControl.cs     |  3 +--
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs
index cb41b33bc4..27c43b092a 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSortTabControl.cs
@@ -8,16 +8,17 @@ using osu.Framework.Graphics;
 using osuTK.Graphics;
 using osuTK;
 using osu.Framework.Input.Events;
+using osu.Game.Overlays.Direct;
 
 namespace osu.Game.Overlays.BeatmapListing
 {
-    public class BeatmapListingSortTabControl : OverlaySortTabControl<BeatmapSortCriteria>
+    public class BeatmapListingSortTabControl : OverlaySortTabControl<DirectSortCriteria>
     {
         public readonly Bindable<SortDirection> SortDirection = new Bindable<SortDirection>(Overlays.SortDirection.Descending);
 
         public BeatmapListingSortTabControl()
         {
-            Current.Value = BeatmapSortCriteria.Ranked;
+            Current.Value = DirectSortCriteria.Ranked;
         }
 
         protected override SortTabControl CreateControl() => new BeatmapSortTabControl
@@ -29,7 +30,7 @@ namespace osu.Game.Overlays.BeatmapListing
         {
             public readonly Bindable<SortDirection> SortDirection = new Bindable<SortDirection>();
 
-            protected override TabItem<BeatmapSortCriteria> CreateTabItem(BeatmapSortCriteria value) => new BeatmapSortTabItem(value)
+            protected override TabItem<DirectSortCriteria> CreateTabItem(DirectSortCriteria value) => new BeatmapSortTabItem(value)
             {
                 SortDirection = { BindTarget = SortDirection }
             };
@@ -39,12 +40,12 @@ namespace osu.Game.Overlays.BeatmapListing
         {
             public readonly Bindable<SortDirection> SortDirection = new Bindable<SortDirection>();
 
-            public BeatmapSortTabItem(BeatmapSortCriteria value)
+            public BeatmapSortTabItem(DirectSortCriteria value)
                 : base(value)
             {
             }
 
-            protected override TabButton CreateTabButton(BeatmapSortCriteria value) => new BeatmapTabButton(value)
+            protected override TabButton CreateTabButton(DirectSortCriteria value) => new BeatmapTabButton(value)
             {
                 Active = { BindTarget = Active },
                 SortDirection = { BindTarget = SortDirection }
@@ -66,7 +67,7 @@ namespace osu.Game.Overlays.BeatmapListing
 
             private readonly SpriteIcon icon;
 
-            public BeatmapTabButton(BeatmapSortCriteria value)
+            public BeatmapTabButton(DirectSortCriteria value)
                 : base(value)
             {
                 Add(icon = new SpriteIcon
@@ -104,15 +105,4 @@ namespace osu.Game.Overlays.BeatmapListing
             }
         }
     }
-
-    public enum BeatmapSortCriteria
-    {
-        Title,
-        Artist,
-        Difficulty,
-        Ranked,
-        Rating,
-        Plays,
-        Favourites,
-    }
 }
diff --git a/osu.Game/Overlays/Direct/FilterControl.cs b/osu.Game/Overlays/Direct/FilterControl.cs
index 8b04bf0387..70a3ab54fb 100644
--- a/osu.Game/Overlays/Direct/FilterControl.cs
+++ b/osu.Game/Overlays/Direct/FilterControl.cs
@@ -34,14 +34,13 @@ namespace osu.Game.Overlays.Direct
 
     public enum DirectSortCriteria
     {
-        Relevance,
         Title,
         Artist,
-        Creator,
         Difficulty,
         Ranked,
         Rating,
         Plays,
         Favourites,
+        Relevance,
     }
 }

From 01202f09bec882209c314a34cf05543c3acaa0a0 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 19 Feb 2020 17:32:43 +0300
Subject: [PATCH 0632/1142] Expand SearchBeatmapSetsResponse

---
 osu.Game/Online/API/Requests/SearchBeatmapSetsResponse.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsResponse.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsResponse.cs
index 28863cb0e0..845c84430f 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsResponse.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsResponse.cs
@@ -2,12 +2,20 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using Newtonsoft.Json;
 using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Online.API.Requests
 {
     public class SearchBeatmapSetsResponse : ResponseWithCursor
     {
+        [JsonProperty("beatmapsets")]
         public IEnumerable<APIBeatmapSet> BeatmapSets;
+
+        [JsonProperty("error")]
+        public string Error;
+
+        [JsonProperty("total")]
+        public int Total;
     }
 }

From 13873ff1b6dc95bf0290ba98450c08c62a295701 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 19 Feb 2020 23:32:56 +0900
Subject: [PATCH 0633/1142] Split out pulp formations into own piece classes

---
 .../Objects/Drawables/BananaPiece.cs          |  31 +++
 .../Objects/Drawables/FruitPiece.cs           | 193 ++----------------
 .../Objects/Drawables/GrapePiece.cs           |  43 ++++
 .../Objects/Drawables/PearPiece.cs            |  43 ++++
 .../Objects/Drawables/PineapplePiece.cs       |  49 +++++
 .../Objects/Drawables/PulpFormation.cs        |  43 ++++
 .../Objects/Drawables/RaspberryPiece.cs       |  49 +++++
 7 files changed, 272 insertions(+), 179 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch/Objects/Drawables/BananaPiece.cs
 create mode 100644 osu.Game.Rulesets.Catch/Objects/Drawables/GrapePiece.cs
 create mode 100644 osu.Game.Rulesets.Catch/Objects/Drawables/PearPiece.cs
 create mode 100644 osu.Game.Rulesets.Catch/Objects/Drawables/PineapplePiece.cs
 create mode 100644 osu.Game.Rulesets.Catch/Objects/Drawables/PulpFormation.cs
 create mode 100644 osu.Game.Rulesets.Catch/Objects/Drawables/RaspberryPiece.cs

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/BananaPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/BananaPiece.cs
new file mode 100644
index 0000000000..ebb0bf0f2c
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/BananaPiece.cs
@@ -0,0 +1,31 @@
+// 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.Rulesets.Catch.Objects.Drawables.Pieces;
+using osuTK;
+
+namespace osu.Game.Rulesets.Catch.Objects.Drawables
+{
+    public class BananaPiece : PulpFormation
+    {
+        public BananaPiece()
+        {
+            InternalChildren = new Drawable[]
+            {
+                new Pulp
+                {
+                    AccentColour = { BindTarget = AccentColour },
+                    Size = new Vector2(SMALL_PULP),
+                    Y = -0.3f
+                },
+                new Pulp
+                {
+                    AccentColour = { BindTarget = AccentColour },
+                    Size = new Vector2(LARGE_PULP_4 * 0.8f, LARGE_PULP_4 * 2.5f),
+                    Y = 0.05f,
+                },
+            };
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
index c6fa5290e9..0f5044eda7 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         /// <summary>
         /// Because we're adding a border around the fruit, we need to scale down some.
         /// </summary>
-        private const float radius_adjust = 1.1f;
+        public const float RADIUS_ADJUST = 1.1f;
 
         private Circle border;
 
@@ -42,14 +42,14 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
             AddRangeInternal(new[]
             {
-                createPulp(drawableCatchObject.HitObject.VisualRepresentation),
+                getFruitFor(drawableCatchObject.HitObject.VisualRepresentation),
                 border = new Circle
                 {
                     RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     BorderColour = Color4.White,
-                    BorderThickness = 6f * radius_adjust,
+                    BorderThickness = 6f * RADIUS_ADJUST,
                     Children = new Drawable[]
                     {
                         new Box
@@ -80,195 +80,30 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         protected override void Update()
         {
             base.Update();
-
             border.Alpha = (float)Math.Clamp((hitObject.StartTime - Time.Current) / 500, 0, 1);
         }
 
-        private Drawable createPulp(FruitVisualRepresentation representation)
+        private Drawable getFruitFor(FruitVisualRepresentation representation)
         {
-            const float large_pulp_3 = 16f * radius_adjust;
-            const float distance_from_centre_3 = 0.15f;
-
-            const float large_pulp_4 = large_pulp_3 * 0.925f;
-            const float distance_from_centre_4 = distance_from_centre_3 / 0.925f;
-
-            const float small_pulp = large_pulp_3 / 2;
-
-            static Vector2 positionAt(float angle, float distance) => new Vector2(
-                distance * MathF.Sin(angle * MathF.PI / 180),
-                distance * MathF.Cos(angle * MathF.PI / 180));
-
             switch (representation)
             {
-                default:
-                    return new Container();
-
-                case FruitVisualRepresentation.Raspberry:
-                    return new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Children = new Drawable[]
-                        {
-                            new Pulp
-                            {
-                                AccentColour = { BindTarget = accentColour },
-                                Size = new Vector2(small_pulp),
-                                Y = -0.34f,
-                            },
-                            new Pulp
-                            {
-                                AccentColour = { BindTarget = accentColour },
-                                Size = new Vector2(large_pulp_4),
-                                Position = positionAt(0, distance_from_centre_4),
-                            },
-                            new Pulp
-                            {
-                                AccentColour = { BindTarget = accentColour },
-                                Size = new Vector2(large_pulp_4),
-                                Position = positionAt(90, distance_from_centre_4),
-                            },
-                            new Pulp
-                            {
-                                AccentColour = { BindTarget = accentColour },
-                                Size = new Vector2(large_pulp_4),
-                                Position = positionAt(180, distance_from_centre_4),
-                            },
-                            new Pulp
-                            {
-                                Size = new Vector2(large_pulp_4),
-                                AccentColour = { BindTarget = accentColour },
-                                Position = positionAt(270, distance_from_centre_4),
-                            },
-                        }
-                    };
-
-                case FruitVisualRepresentation.Pineapple:
-                    return new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Children = new Drawable[]
-                        {
-                            new Pulp
-                            {
-                                AccentColour = { BindTarget = accentColour },
-                                Size = new Vector2(small_pulp),
-                                Y = -0.3f,
-                            },
-                            new Pulp
-                            {
-                                AccentColour = { BindTarget = accentColour },
-                                Size = new Vector2(large_pulp_4),
-                                Position = positionAt(45, distance_from_centre_4),
-                            },
-                            new Pulp
-                            {
-                                AccentColour = { BindTarget = accentColour },
-                                Size = new Vector2(large_pulp_4),
-                                Position = positionAt(135, distance_from_centre_4),
-                            },
-                            new Pulp
-                            {
-                                AccentColour = { BindTarget = accentColour },
-                                Size = new Vector2(large_pulp_4),
-                                Position = positionAt(225, distance_from_centre_4),
-                            },
-                            new Pulp
-                            {
-                                Size = new Vector2(large_pulp_4),
-                                AccentColour = { BindTarget = accentColour },
-                                Position = positionAt(315, distance_from_centre_4),
-                            },
-                        }
-                    };
-
                 case FruitVisualRepresentation.Pear:
-                    return new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Children = new Drawable[]
-                        {
-                            new Pulp
-                            {
-                                AccentColour = { BindTarget = accentColour },
-                                Size = new Vector2(small_pulp),
-                                Y = -0.33f,
-                            },
-                            new Pulp
-                            {
-                                AccentColour = { BindTarget = accentColour },
-                                Size = new Vector2(large_pulp_3),
-                                Position = positionAt(60, distance_from_centre_3),
-                            },
-                            new Pulp
-                            {
-                                AccentColour = { BindTarget = accentColour },
-                                Size = new Vector2(large_pulp_3),
-                                Position = positionAt(180, distance_from_centre_3),
-                            },
-                            new Pulp
-                            {
-                                Size = new Vector2(large_pulp_3),
-                                AccentColour = { BindTarget = accentColour },
-                                Position = positionAt(300, distance_from_centre_3),
-                            },
-                        }
-                    };
+                    return new PearPiece();
 
                 case FruitVisualRepresentation.Grape:
-                    return new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Children = new Drawable[]
-                        {
-                            new Pulp
-                            {
-                                AccentColour = { BindTarget = accentColour },
-                                Size = new Vector2(small_pulp),
-                                Y = -0.25f,
-                            },
-                            new Pulp
-                            {
-                                AccentColour = { BindTarget = accentColour },
-                                Size = new Vector2(large_pulp_3),
-                                Position = positionAt(0, distance_from_centre_3),
-                            },
-                            new Pulp
-                            {
-                                AccentColour = { BindTarget = accentColour },
-                                Size = new Vector2(large_pulp_3),
-                                Position = positionAt(120, distance_from_centre_3),
-                            },
-                            new Pulp
-                            {
-                                Size = new Vector2(large_pulp_3),
-                                AccentColour = { BindTarget = accentColour },
-                                Position = positionAt(240, distance_from_centre_3),
-                            },
-                        }
-                    };
+                    return new GrapePiece();
+
+                case FruitVisualRepresentation.Pineapple:
+                    return new PineapplePiece();
 
                 case FruitVisualRepresentation.Banana:
+                    return new BananaPiece();
 
-                    return new Container
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Children = new Drawable[]
-                        {
-                            new Pulp
-                            {
-                                AccentColour = { BindTarget = accentColour },
-                                Size = new Vector2(small_pulp),
-                                Y = -0.3f
-                            },
-                            new Pulp
-                            {
-                                AccentColour = { BindTarget = accentColour },
-                                Size = new Vector2(large_pulp_4 * 0.8f, large_pulp_4 * 2.5f),
-                                Y = 0.05f,
-                            },
-                        }
-                    };
+                case FruitVisualRepresentation.Raspberry:
+                    return new RaspberryPiece();
             }
+
+            return Empty();
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/GrapePiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/GrapePiece.cs
new file mode 100644
index 0000000000..1d1faf893b
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/GrapePiece.cs
@@ -0,0 +1,43 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.Catch.Objects.Drawables.Pieces;
+using osuTK;
+
+namespace osu.Game.Rulesets.Catch.Objects.Drawables
+{
+    public class GrapePiece : PulpFormation
+    {
+        public GrapePiece()
+        {
+            InternalChildren = new Drawable[]
+            {
+                new Pulp
+                {
+                    AccentColour = { BindTarget = AccentColour },
+                    Size = new Vector2(SMALL_PULP),
+                    Y = -0.25f,
+                },
+                new Pulp
+                {
+                    AccentColour = { BindTarget = AccentColour },
+                    Size = new Vector2(LARGE_PULP_3),
+                    Position = PositionAt(0, DISTANCE_FROM_CENTRE_3),
+                },
+                new Pulp
+                {
+                    AccentColour = { BindTarget = AccentColour },
+                    Size = new Vector2(LARGE_PULP_3),
+                    Position = PositionAt(120, DISTANCE_FROM_CENTRE_3),
+                },
+                new Pulp
+                {
+                    Size = new Vector2(LARGE_PULP_3),
+                    AccentColour = { BindTarget = AccentColour },
+                    Position = PositionAt(240, DISTANCE_FROM_CENTRE_3),
+                },
+            };
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/PearPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/PearPiece.cs
new file mode 100644
index 0000000000..7f14217cda
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/PearPiece.cs
@@ -0,0 +1,43 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.Catch.Objects.Drawables.Pieces;
+using osuTK;
+
+namespace osu.Game.Rulesets.Catch.Objects.Drawables
+{
+    public class PearPiece : PulpFormation
+    {
+        public PearPiece()
+        {
+            InternalChildren = new Drawable[]
+            {
+                new Pulp
+                {
+                    AccentColour = { BindTarget = AccentColour },
+                    Size = new Vector2(SMALL_PULP),
+                    Y = -0.33f,
+                },
+                new Pulp
+                {
+                    AccentColour = { BindTarget = AccentColour },
+                    Size = new Vector2(LARGE_PULP_3),
+                    Position = PositionAt(60, DISTANCE_FROM_CENTRE_3),
+                },
+                new Pulp
+                {
+                    AccentColour = { BindTarget = AccentColour },
+                    Size = new Vector2(LARGE_PULP_3),
+                    Position = PositionAt(180, DISTANCE_FROM_CENTRE_3),
+                },
+                new Pulp
+                {
+                    Size = new Vector2(LARGE_PULP_3),
+                    AccentColour = { BindTarget = AccentColour },
+                    Position = PositionAt(300, DISTANCE_FROM_CENTRE_3),
+                },
+            };
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/PineapplePiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/PineapplePiece.cs
new file mode 100644
index 0000000000..c328ba1837
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/PineapplePiece.cs
@@ -0,0 +1,49 @@
+// 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.Rulesets.Catch.Objects.Drawables.Pieces;
+using osuTK;
+
+namespace osu.Game.Rulesets.Catch.Objects.Drawables
+{
+    public class PineapplePiece : PulpFormation
+    {
+        public PineapplePiece()
+        {
+            InternalChildren = new Drawable[]
+            {
+                new Pulp
+                {
+                    AccentColour = { BindTarget = AccentColour },
+                    Size = new Vector2(SMALL_PULP),
+                    Y = -0.3f,
+                },
+                new Pulp
+                {
+                    AccentColour = { BindTarget = AccentColour },
+                    Size = new Vector2(LARGE_PULP_4),
+                    Position = PositionAt(45, DISTANCE_FROM_CENTRE_4),
+                },
+                new Pulp
+                {
+                    AccentColour = { BindTarget = AccentColour },
+                    Size = new Vector2(LARGE_PULP_4),
+                    Position = PositionAt(135, DISTANCE_FROM_CENTRE_4),
+                },
+                new Pulp
+                {
+                    AccentColour = { BindTarget = AccentColour },
+                    Size = new Vector2(LARGE_PULP_4),
+                    Position = PositionAt(225, DISTANCE_FROM_CENTRE_4),
+                },
+                new Pulp
+                {
+                    Size = new Vector2(LARGE_PULP_4),
+                    AccentColour = { BindTarget = AccentColour },
+                    Position = PositionAt(315, DISTANCE_FROM_CENTRE_4),
+                },
+            };
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/PulpFormation.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/PulpFormation.cs
new file mode 100644
index 0000000000..be70c3400c
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/PulpFormation.cs
@@ -0,0 +1,43 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets.Objects.Drawables;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Catch.Objects.Drawables
+{
+    public abstract class PulpFormation : CompositeDrawable
+    {
+        protected readonly IBindable<Color4> AccentColour = new Bindable<Color4>();
+
+        protected const float LARGE_PULP_3 = 16f * FruitPiece.RADIUS_ADJUST;
+        protected const float DISTANCE_FROM_CENTRE_3 = 0.15f;
+
+        protected const float LARGE_PULP_4 = LARGE_PULP_3 * 0.925f;
+        protected const float DISTANCE_FROM_CENTRE_4 = DISTANCE_FROM_CENTRE_3 / 0.925f;
+
+        protected const float SMALL_PULP = LARGE_PULP_3 / 2;
+
+        protected PulpFormation()
+        {
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        protected static Vector2 PositionAt(float angle, float distance) => new Vector2(
+            distance * MathF.Sin(angle * MathF.PI / 180),
+            distance * MathF.Cos(angle * MathF.PI / 180));
+
+        [BackgroundDependencyLoader]
+        private void load(DrawableHitObject drawableObject)
+        {
+            DrawableCatchHitObject drawableCatchObject = (DrawableCatchHitObject)drawableObject;
+            AccentColour.BindTo(drawableCatchObject.AccentColour);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/RaspberryPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/RaspberryPiece.cs
new file mode 100644
index 0000000000..22ce3ba5b3
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/RaspberryPiece.cs
@@ -0,0 +1,49 @@
+// 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.Rulesets.Catch.Objects.Drawables.Pieces;
+using osuTK;
+
+namespace osu.Game.Rulesets.Catch.Objects.Drawables
+{
+    public class RaspberryPiece : PulpFormation
+    {
+        public RaspberryPiece()
+        {
+            InternalChildren = new Drawable[]
+            {
+                new Pulp
+                {
+                    AccentColour = { BindTarget = AccentColour },
+                    Size = new Vector2(SMALL_PULP),
+                    Y = -0.34f,
+                },
+                new Pulp
+                {
+                    AccentColour = { BindTarget = AccentColour },
+                    Size = new Vector2(LARGE_PULP_4),
+                    Position = PositionAt(0, DISTANCE_FROM_CENTRE_4),
+                },
+                new Pulp
+                {
+                    AccentColour = { BindTarget = AccentColour },
+                    Size = new Vector2(LARGE_PULP_4),
+                    Position = PositionAt(90, DISTANCE_FROM_CENTRE_4),
+                },
+                new Pulp
+                {
+                    AccentColour = { BindTarget = AccentColour },
+                    Size = new Vector2(LARGE_PULP_4),
+                    Position = PositionAt(180, DISTANCE_FROM_CENTRE_4),
+                },
+                new Pulp
+                {
+                    Size = new Vector2(LARGE_PULP_4),
+                    AccentColour = { BindTarget = AccentColour },
+                    Position = PositionAt(270, DISTANCE_FROM_CENTRE_4),
+                },
+            };
+        }
+    }
+}

From 255c8d3a1306149ff396c96a1a7997ba6a3e9912 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 19 Feb 2020 17:33:48 +0300
Subject: [PATCH 0634/1142] Adjust SearchBeatmapSetsRequest for new usage

---
 .../API/Requests/SearchBeatmapSetsRequest.cs   | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
index 5652b8d2bd..930ca8fdf1 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.ComponentModel;
+using osu.Framework.IO.Network;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Direct;
 using osu.Game.Rulesets;
@@ -26,8 +27,21 @@ namespace osu.Game.Online.API.Requests
             this.direction = direction;
         }
 
-        // ReSharper disable once ImpureMethodCallOnReadonlyValueField
-        protected override string Target => $@"beatmapsets/search?q={query}&m={ruleset.ID ?? 0}&s={searchCategory.ToString().ToLowerInvariant()}&sort={sortCriteria.ToString().ToLowerInvariant()}_{directionString}";
+        protected override WebRequest CreateWebRequest()
+        {
+            var req = base.CreateWebRequest();
+            req.AddParameter("q", query);
+
+            if (ruleset.ID.HasValue)
+                req.AddParameter("m", ruleset.ID.Value.ToString());
+
+            req.AddParameter("s", searchCategory.ToString().ToLowerInvariant());
+            req.AddParameter("sort", $"{sortCriteria.ToString().ToLowerInvariant()}_{directionString}");
+
+            return req;
+        }
+
+        protected override string Target => @"beatmapsets/search";
     }
 
     public enum BeatmapSearchCategory

From 8fcfb73d722b54380bd9b8b525eb38c38197b0ce Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 19 Feb 2020 17:40:54 +0300
Subject: [PATCH 0635/1142] Implement BeatmapListingOverlay

---
 .../Online/TestSceneBeatmapListingOverlay.cs  |  39 +++
 osu.Game/Overlays/BeatmapListingOverlay.cs    | 229 ++++++++++++++++++
 2 files changed, 268 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
 create mode 100644 osu.Game/Overlays/BeatmapListingOverlay.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
new file mode 100644
index 0000000000..7c05d99c59
--- /dev/null
+++ b/osu.Game.Tests/Visual/Online/TestSceneBeatmapListingOverlay.cs
@@ -0,0 +1,39 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using osu.Game.Overlays;
+using NUnit.Framework;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    public class TestSceneBeatmapListingOverlay : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(BeatmapListingOverlay),
+        };
+
+        protected override bool UseOnlineAPI => true;
+
+        private readonly BeatmapListingOverlay overlay;
+
+        public TestSceneBeatmapListingOverlay()
+        {
+            Add(overlay = new BeatmapListingOverlay());
+        }
+
+        [Test]
+        public void TestShow()
+        {
+            AddStep("Show", overlay.Show);
+        }
+
+        [Test]
+        public void TestHide()
+        {
+            AddStep("Hide", overlay.Hide);
+        }
+    }
+}
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
new file mode 100644
index 0000000000..971a1b46d2
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -0,0 +1,229 @@
+// 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.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Threading;
+using osu.Game.Audio;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Online.API.Requests;
+using osu.Game.Overlays.BeatmapListing;
+using osu.Game.Overlays.Direct;
+using osu.Game.Rulesets;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays
+{
+    public class BeatmapListingOverlay : FullscreenOverlay
+    {
+        [Resolved]
+        private PreviewTrackManager previewTrackManager { get; set; }
+
+        [Resolved]
+        private RulesetStore rulesets { get; set; }
+
+        private SearchBeatmapSetsRequest getSetsRequest;
+        private Container panelsPlaceholder;
+        private BeatmapListingSearchSection searchSection;
+        private BeatmapListingSortTabControl sortControl;
+
+        public BeatmapListingOverlay()
+            : base(OverlayColourScheme.Blue)
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = ColourProvider.Background6
+                },
+                new BasicScrollContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    ScrollbarVisible = false,
+                    Child = new ReverseChildIDFillFlowContainer<Drawable>
+                    {
+                        AutoSizeAxes = Axes.Y,
+                        RelativeSizeAxes = Axes.X,
+                        Direction = FillDirection.Vertical,
+                        Spacing = new Vector2(0, 10),
+                        Children = new Drawable[]
+                        {
+                            new FillFlowContainer
+                            {
+                                AutoSizeAxes = Axes.Y,
+                                RelativeSizeAxes = Axes.X,
+                                Direction = FillDirection.Vertical,
+                                Masking = true,
+                                EdgeEffect = new EdgeEffectParameters
+                                {
+                                    Colour = Color4.Black.Opacity(0.25f),
+                                    Type = EdgeEffectType.Shadow,
+                                    Radius = 3,
+                                    Offset = new Vector2(0f, 1f),
+                                },
+                                Children = new Drawable[]
+                                {
+                                    new BeatmapListingHeader(),
+                                    searchSection = new BeatmapListingSearchSection(),
+                                }
+                            },
+                            new Container
+                            {
+                                AutoSizeAxes = Axes.Y,
+                                RelativeSizeAxes = Axes.X,
+                                Children = new Drawable[]
+                                {
+                                    new Box
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        Colour = ColourProvider.Background4,
+                                    },
+                                    new FillFlowContainer
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y,
+                                        Children = new Drawable[]
+                                        {
+                                            new Container
+                                            {
+                                                RelativeSizeAxes = Axes.X,
+                                                Height = 40,
+                                                Children = new Drawable[]
+                                                {
+                                                    new Box
+                                                    {
+                                                        RelativeSizeAxes = Axes.Both,
+                                                        Colour = ColourProvider.Background5
+                                                    },
+                                                    sortControl = new BeatmapListingSortTabControl
+                                                    {
+                                                        Anchor = Anchor.CentreLeft,
+                                                        Origin = Anchor.CentreLeft,
+                                                        Margin = new MarginPadding { Left = 20 }
+                                                    }
+                                                }
+                                            },
+                                            panelsPlaceholder = new Container
+                                            {
+                                                AutoSizeAxes = Axes.Y,
+                                                RelativeSizeAxes = Axes.X,
+                                                Padding = new MarginPadding { Vertical = 15, Horizontal = 20 },
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            var sortCriteria = sortControl.Current;
+            var sortDirection = sortControl.SortDirection;
+
+            searchSection.Query.BindValueChanged(query =>
+            {
+                sortCriteria.Value = string.IsNullOrEmpty(query.NewValue) ? DirectSortCriteria.Ranked : DirectSortCriteria.Relevance;
+                sortDirection.Value = SortDirection.Descending;
+
+                Scheduler.AddOnce(updateSearch);
+            });
+
+            searchSection.Query.BindValueChanged(_ => Scheduler.AddOnce(updateSearch));
+            searchSection.Ruleset.BindValueChanged(_ => Scheduler.AddOnce(updateSearch));
+            searchSection.Category.BindValueChanged(_ => Scheduler.AddOnce(updateSearch));
+            sortCriteria.BindValueChanged(_ => Scheduler.AddOnce(updateSearch));
+            sortDirection.BindValueChanged(_ => Scheduler.AddOnce(updateSearch));
+        }
+
+        private void updateSearch()
+        {
+            if (!IsLoaded)
+                return;
+
+            if (State.Value == Visibility.Hidden)
+                return;
+
+            if (API == null)
+                return;
+
+            getSetsRequest?.Cancel();
+            previewTrackManager.StopAnyPlaying(this);
+
+            panelsPlaceholder.FadeColour(Color4.DimGray, 400, Easing.OutQuint);
+
+            getSetsRequest = new SearchBeatmapSetsRequest(
+                searchSection.Query.Value,
+                searchSection.Ruleset.Value,
+                searchSection.Category.Value,
+                sortControl.Current.Value,
+                sortControl.SortDirection.Value);
+
+            getSetsRequest.Success += response => Schedule(() => recreatePanels(response));
+
+            API.Queue(getSetsRequest);
+        }
+
+        private void recreatePanels(SearchBeatmapSetsResponse response)
+        {
+            var beatmaps = response.BeatmapSets.Select(r => r.ToBeatmapSet(rulesets)).ToList();
+
+            var hasError = !string.IsNullOrEmpty(response.Error);
+
+            if (response.Total == 0 || hasError)
+            {
+                searchSection.BeatmapSet = null;
+                panelsPlaceholder.Clear();
+                panelsPlaceholder.FadeColour(Color4.White);
+                panelsPlaceholder.Add(new OsuSpriteText
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Text = hasError ? response.Error : @"... nope, nothing found."
+                });
+                return;
+            }
+
+            var newPanels = new FillFlowContainer<DirectPanel>
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Spacing = new Vector2(10),
+                Alpha = 0,
+                ChildrenEnumerable = beatmaps.Select<BeatmapSetInfo, DirectPanel>(b => new DirectGridPanel(b)
+                {
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
+                })
+            };
+
+            LoadComponentAsync(newPanels, loaded =>
+            {
+                panelsPlaceholder.Clear();
+                panelsPlaceholder.FadeColour(Color4.White);
+                panelsPlaceholder.Add(loaded);
+                loaded.FadeIn(600, Easing.OutQuint);
+                searchSection.BeatmapSet = beatmaps.First();
+            });
+        }
+    }
+}

From 0c78c8cb4f19283c2b680e1db1d173fbc8fef07d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 19 Feb 2020 17:44:15 +0300
Subject: [PATCH 0636/1142] Update resources

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index b9b127309a..b9ef783b2a 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -53,7 +53,7 @@
     <Reference Include="Java.Interop" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.219.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2020.218.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index bd5219b872..6b8f8fee8c 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -22,7 +22,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.219.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2020.218.0" />
     <PackageReference Include="Sentry" Version="2.0.3" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 2c1aff7d3c..f68bedc57f 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -73,7 +73,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2019.1230.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.219.0" />
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.218.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->

From 237be50e37159c0a7f3f97fc434c76a2f1e0c4aa Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 19 Feb 2020 18:17:02 +0300
Subject: [PATCH 0637/1142] Implement DrawableErrorHandler component

---
 osu.Game/Overlays/BeatmapListingOverlay.cs | 90 ++++++++++++++++++----
 1 file changed, 76 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 971a1b46d2..eacf883339 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -2,12 +2,15 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
+using System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
 using osu.Framework.Threading;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
@@ -31,6 +34,8 @@ namespace osu.Game.Overlays
         private RulesetStore rulesets { get; set; }
 
         private SearchBeatmapSetsRequest getSetsRequest;
+        private CancellationTokenSource cancellationToken;
+
         private Container panelsPlaceholder;
         private BeatmapListingSearchSection searchSection;
         private BeatmapListingSortTabControl sortControl;
@@ -121,7 +126,7 @@ namespace osu.Game.Overlays
                                             {
                                                 AutoSizeAxes = Axes.Y,
                                                 RelativeSizeAxes = Axes.X,
-                                                Padding = new MarginPadding { Vertical = 15, Horizontal = 20 },
+                                                Padding = new MarginPadding { Horizontal = 20 },
                                             }
                                         }
                                     }
@@ -167,6 +172,7 @@ namespace osu.Game.Overlays
                 return;
 
             getSetsRequest?.Cancel();
+            cancellationToken?.Cancel();
             previewTrackManager.StopAnyPlaying(this);
 
             panelsPlaceholder.FadeColour(Color4.DimGray, 400, Easing.OutQuint);
@@ -185,30 +191,28 @@ namespace osu.Game.Overlays
 
         private void recreatePanels(SearchBeatmapSetsResponse response)
         {
-            var beatmaps = response.BeatmapSets.Select(r => r.ToBeatmapSet(rulesets)).ToList();
-
             var hasError = !string.IsNullOrEmpty(response.Error);
 
             if (response.Total == 0 || hasError)
             {
                 searchSection.BeatmapSet = null;
-                panelsPlaceholder.Clear();
-                panelsPlaceholder.FadeColour(Color4.White);
-                panelsPlaceholder.Add(new OsuSpriteText
+
+                LoadComponentAsync(new DrawableErrorHandler(hasError ? response.Error : @"... nope, nothing found."), loaded =>
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Text = hasError ? response.Error : @"... nope, nothing found."
-                });
+                    addContentToPlaceholder(loaded);
+                }, (cancellationToken = new CancellationTokenSource()).Token);
                 return;
             }
 
+            var beatmaps = response.BeatmapSets.Select(r => r.ToBeatmapSet(rulesets)).ToList();
+
             var newPanels = new FillFlowContainer<DirectPanel>
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
                 Spacing = new Vector2(10),
                 Alpha = 0,
+                Margin = new MarginPadding { Vertical = 15 },
                 ChildrenEnumerable = beatmaps.Select<BeatmapSetInfo, DirectPanel>(b => new DirectGridPanel(b)
                 {
                     Anchor = Anchor.TopCentre,
@@ -218,12 +222,70 @@ namespace osu.Game.Overlays
 
             LoadComponentAsync(newPanels, loaded =>
             {
-                panelsPlaceholder.Clear();
-                panelsPlaceholder.FadeColour(Color4.White);
-                panelsPlaceholder.Add(loaded);
+                addContentToPlaceholder(loaded);
                 loaded.FadeIn(600, Easing.OutQuint);
                 searchSection.BeatmapSet = beatmaps.First();
-            });
+            }, (cancellationToken = new CancellationTokenSource()).Token);
+        }
+
+        private void addContentToPlaceholder(Drawable content)
+        {
+            panelsPlaceholder.Clear();
+            panelsPlaceholder.FadeColour(Color4.White);
+            panelsPlaceholder.Add(content);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            getSetsRequest?.Cancel();
+            cancellationToken?.Cancel();
+
+            base.Dispose(isDisposing);
+        }
+
+        private class DrawableErrorHandler : CompositeDrawable
+        {
+            private readonly string error;
+
+            public DrawableErrorHandler(string error)
+            {
+                this.error = error;
+
+                RelativeSizeAxes = Axes.X;
+                Height = 250;
+                Margin = new MarginPadding { Top = 15 };
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(TextureStore textures)
+            {
+                AddInternal(new FillFlowContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Y,
+                    AutoSizeAxes = Axes.X,
+                    Direction = FillDirection.Horizontal,
+                    Spacing = new Vector2(10, 0),
+                    Children = new Drawable[]
+                    {
+                        new Sprite
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            RelativeSizeAxes = Axes.Both,
+                            FillMode = FillMode.Fit,
+                            Texture = textures.Get(@"Online/not-found")
+                        },
+                        new OsuSpriteText
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Text = error,
+                        }
+                    }
+                });
+            }
         }
     }
 }

From 2ef3c7873605f8dcb7b61bacc5cf90bfe2359b3a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 19 Feb 2020 18:19:15 +0300
Subject: [PATCH 0638/1142] Remove query binding duplicate

---
 osu.Game/Overlays/BeatmapListingOverlay.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index eacf883339..143e20d69f 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -153,7 +153,6 @@ namespace osu.Game.Overlays
                 Scheduler.AddOnce(updateSearch);
             });
 
-            searchSection.Query.BindValueChanged(_ => Scheduler.AddOnce(updateSearch));
             searchSection.Ruleset.BindValueChanged(_ => Scheduler.AddOnce(updateSearch));
             searchSection.Category.BindValueChanged(_ => Scheduler.AddOnce(updateSearch));
             sortCriteria.BindValueChanged(_ => Scheduler.AddOnce(updateSearch));

From edef84d9c388588749a390be116240653f80bd8c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 19 Feb 2020 19:15:18 +0300
Subject: [PATCH 0639/1142] CI fixes

---
 osu.Game/Overlays/BeatmapListingOverlay.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 143e20d69f..546d0bc9bb 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osu.Framework.Threading;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
@@ -196,10 +195,9 @@ namespace osu.Game.Overlays
             {
                 searchSection.BeatmapSet = null;
 
-                LoadComponentAsync(new DrawableErrorHandler(hasError ? response.Error : @"... nope, nothing found."), loaded =>
-                {
-                    addContentToPlaceholder(loaded);
-                }, (cancellationToken = new CancellationTokenSource()).Token);
+                LoadComponentAsync(new DrawableErrorHandler(hasError ? response.Error : @"... nope, nothing found."),
+                    addContentToPlaceholder,
+                    (cancellationToken = new CancellationTokenSource()).Token);
                 return;
             }
 

From 62227ad856efb44cf4cb26c31d2965b9e30e277e Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 19 Feb 2020 17:58:10 +0100
Subject: [PATCH 0640/1142] Add MaxCombo to BeatmapInfo

---
 osu.Game/Beatmaps/BeatmapInfo.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index bcc9ab885e..68d113ce40 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -51,6 +51,9 @@ namespace osu.Game.Beatmaps
         [NotMapped]
         public BeatmapOnlineInfo OnlineInfo { get; set; }
 
+        [NotMapped]
+        public int? MaxCombo { get; set; }
+
         /// <summary>
         /// The playable length in milliseconds of this beatmap.
         /// </summary>

From 23c9782f509c5af8f543bedcf57a7c5d1c8e2154 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 19 Feb 2020 17:58:41 +0100
Subject: [PATCH 0641/1142] Add maxCombo to APIBeatmap

---
 osu.Game/Online/API/Requests/Responses/APIBeatmap.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs b/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
index f4d67a56aa..e023a2502f 100644
--- a/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
@@ -61,6 +61,9 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty(@"failtimes")]
         private BeatmapMetrics metrics { get; set; }
 
+        [JsonProperty(@"max_combo")]
+        private int? maxCombo { get; set; }
+
         public BeatmapInfo ToBeatmap(RulesetStore rulesets)
         {
             var set = BeatmapSet?.ToBeatmapSet(rulesets);
@@ -76,6 +79,7 @@ namespace osu.Game.Online.API.Requests.Responses
                 Status = Status,
                 BeatmapSet = set,
                 Metrics = metrics,
+                MaxCombo = maxCombo,
                 BaseDifficulty = new BeatmapDifficulty
                 {
                     DrainRate = drainRate,

From 7ea67aa6726428198498d299e17f7a16c360caad Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 19 Feb 2020 17:58:59 +0100
Subject: [PATCH 0642/1142] Highlight max combo on beatmap leaderboards

---
 osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 43a45bd2fc..cf7ecd7408 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -146,7 +146,8 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 new OsuSpriteText
                 {
                     Text = $@"{score.MaxCombo:N0}x",
-                    Font = OsuFont.GetFont(size: text_size)
+                    Font = OsuFont.GetFont(size: text_size),
+                    Colour = score.MaxCombo == score.Beatmap.MaxCombo ? highAccuracyColour : Color4.White
                 }
             });
 

From 84d6a8ae2ade456f1f4b4e71f2c43b1e4fe980b4 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 19 Feb 2020 19:42:56 +0100
Subject: [PATCH 0643/1142] Add null check

---
 osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index cf7ecd7408..954eada612 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -147,7 +147,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 {
                     Text = $@"{score.MaxCombo:N0}x",
                     Font = OsuFont.GetFont(size: text_size),
-                    Colour = score.MaxCombo == score.Beatmap.MaxCombo ? highAccuracyColour : Color4.White
+                    Colour = score.MaxCombo == score.Beatmap?.MaxCombo ? highAccuracyColour : Color4.White
                 }
             });
 

From b2d9004212c5221f751d4bba813f2d4630acf375 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 Feb 2020 08:37:23 +0900
Subject: [PATCH 0644/1142] Fix possible test failures due to async loads

---
 .../TestSceneDrawableRoomPlaylist.cs          | 57 ++++++++++++-------
 1 file changed, 36 insertions(+), 21 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index 4f54e451b7..9fbe8f7ffe 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             typeof(DrawableRoomPlaylistItem)
         };
 
-        private DrawableRoomPlaylist playlist;
+        private TestPlaylist playlist;
 
         [Test]
         public void TestNonEditableNonSelectable()
@@ -211,30 +211,45 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private void assertDeleteButtonVisibility(int index, bool visible)
             => AddAssert($"delete button {index} {(visible ? "is" : "is not")} visible", () => (playlist.ChildrenOfType<IconButton>().ElementAt(2 + index * 2).Alpha > 0) == visible);
 
-        private void createPlaylist(bool allowEdit, bool allowSelection) => AddStep("create playlist", () =>
+        private void createPlaylist(bool allowEdit, bool allowSelection)
         {
-            Child = playlist = new DrawableRoomPlaylist(allowEdit, allowSelection)
+            AddStep("create playlist", () =>
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Size = new Vector2(500, 300)
-            };
-
-            for (int i = 0; i < 20; i++)
-            {
-                playlist.Items.Add(new PlaylistItem
+                Child = playlist = new TestPlaylist(allowEdit, allowSelection)
                 {
-                    ID = i,
-                    Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
-                    Ruleset = { Value = new OsuRuleset().RulesetInfo },
-                    RequiredMods =
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(500, 300)
+                };
+
+                for (int i = 0; i < 20; i++)
+                {
+                    playlist.Items.Add(new PlaylistItem
                     {
-                        new OsuModHardRock(),
-                        new OsuModDoubleTime(),
-                        new OsuModAutoplay()
-                    }
-                });
+                        ID = i,
+                        Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
+                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                        RequiredMods =
+                        {
+                            new OsuModHardRock(),
+                            new OsuModDoubleTime(),
+                            new OsuModAutoplay()
+                        }
+                    });
+                }
+            });
+
+            AddUntilStep("wait for items to load", () => playlist.ItemMap.Values.All(i => i.IsLoaded));
+        }
+
+        private class TestPlaylist : DrawableRoomPlaylist
+        {
+            public new IReadOnlyDictionary<PlaylistItem, RearrangeableListItem<PlaylistItem>> ItemMap => base.ItemMap;
+
+            public TestPlaylist(bool allowEdit, bool allowSelection)
+                : base(allowEdit, allowSelection)
+            {
             }
-        });
+        }
     }
 }

From 7550685a614eaff25adef260a5344e254944be69 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 20 Feb 2020 02:43:13 +0300
Subject: [PATCH 0645/1142] DrawableErrorHandler -> NotFoundDrawable

---
 .../API/Requests/SearchBeatmapSetsResponse.cs  |  3 ---
 osu.Game/Overlays/BeatmapListingOverlay.cs     | 18 +++++-------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Online/API/Requests/SearchBeatmapSetsResponse.cs b/osu.Game/Online/API/Requests/SearchBeatmapSetsResponse.cs
index 845c84430f..3c4fb11ed1 100644
--- a/osu.Game/Online/API/Requests/SearchBeatmapSetsResponse.cs
+++ b/osu.Game/Online/API/Requests/SearchBeatmapSetsResponse.cs
@@ -12,9 +12,6 @@ namespace osu.Game.Online.API.Requests
         [JsonProperty("beatmapsets")]
         public IEnumerable<APIBeatmapSet> BeatmapSets;
 
-        [JsonProperty("error")]
-        public string Error;
-
         [JsonProperty("total")]
         public int Total;
     }
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 546d0bc9bb..414e911f2e 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -189,15 +189,11 @@ namespace osu.Game.Overlays
 
         private void recreatePanels(SearchBeatmapSetsResponse response)
         {
-            var hasError = !string.IsNullOrEmpty(response.Error);
-
-            if (response.Total == 0 || hasError)
+            if (response.Total == 0)
             {
                 searchSection.BeatmapSet = null;
 
-                LoadComponentAsync(new DrawableErrorHandler(hasError ? response.Error : @"... nope, nothing found."),
-                    addContentToPlaceholder,
-                    (cancellationToken = new CancellationTokenSource()).Token);
+                LoadComponentAsync(new NotFoundDrawable(), addContentToPlaceholder, (cancellationToken = new CancellationTokenSource()).Token);
                 return;
             }
 
@@ -240,14 +236,10 @@ namespace osu.Game.Overlays
             base.Dispose(isDisposing);
         }
 
-        private class DrawableErrorHandler : CompositeDrawable
+        private class NotFoundDrawable : CompositeDrawable
         {
-            private readonly string error;
-
-            public DrawableErrorHandler(string error)
+            public NotFoundDrawable()
             {
-                this.error = error;
-
                 RelativeSizeAxes = Axes.X;
                 Height = 250;
                 Margin = new MarginPadding { Top = 15 };
@@ -278,7 +270,7 @@ namespace osu.Game.Overlays
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
-                            Text = error,
+                            Text = @"... nope, nothing found.",
                         }
                     }
                 });

From 66ea7949358fe9ae9a7dd0c4e5839c39e63ca903 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 20 Feb 2020 02:54:35 +0300
Subject: [PATCH 0646/1142] Add debounce to the querying

---
 osu.Game/Overlays/BeatmapListingOverlay.cs | 32 +++++++++++++---------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 414e911f2e..2a812ddf96 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
-using System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -11,6 +10,7 @@ using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osu.Framework.Threading;
 using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
@@ -33,7 +33,6 @@ namespace osu.Game.Overlays
         private RulesetStore rulesets { get; set; }
 
         private SearchBeatmapSetsRequest getSetsRequest;
-        private CancellationTokenSource cancellationToken;
 
         private Container panelsPlaceholder;
         private BeatmapListingSearchSection searchSection;
@@ -149,13 +148,23 @@ namespace osu.Game.Overlays
                 sortCriteria.Value = string.IsNullOrEmpty(query.NewValue) ? DirectSortCriteria.Ranked : DirectSortCriteria.Relevance;
                 sortDirection.Value = SortDirection.Descending;
 
-                Scheduler.AddOnce(updateSearch);
+                queueUpdateSearch(true);
             });
 
-            searchSection.Ruleset.BindValueChanged(_ => Scheduler.AddOnce(updateSearch));
-            searchSection.Category.BindValueChanged(_ => Scheduler.AddOnce(updateSearch));
-            sortCriteria.BindValueChanged(_ => Scheduler.AddOnce(updateSearch));
-            sortDirection.BindValueChanged(_ => Scheduler.AddOnce(updateSearch));
+            searchSection.Ruleset.BindValueChanged(_ => queueUpdateSearch());
+            searchSection.Category.BindValueChanged(_ => queueUpdateSearch());
+            sortCriteria.BindValueChanged(_ => queueUpdateSearch());
+            sortDirection.BindValueChanged(_ => queueUpdateSearch());
+        }
+
+        private ScheduledDelegate queryChangedDebounce;
+
+        private void queueUpdateSearch(bool queryTextChanged = false)
+        {
+            getSetsRequest?.Cancel();
+
+            queryChangedDebounce?.Cancel();
+            queryChangedDebounce = Scheduler.AddDelayed(updateSearch, queryTextChanged ? 500 : 100);
         }
 
         private void updateSearch()
@@ -169,8 +178,6 @@ namespace osu.Game.Overlays
             if (API == null)
                 return;
 
-            getSetsRequest?.Cancel();
-            cancellationToken?.Cancel();
             previewTrackManager.StopAnyPlaying(this);
 
             panelsPlaceholder.FadeColour(Color4.DimGray, 400, Easing.OutQuint);
@@ -192,8 +199,7 @@ namespace osu.Game.Overlays
             if (response.Total == 0)
             {
                 searchSection.BeatmapSet = null;
-
-                LoadComponentAsync(new NotFoundDrawable(), addContentToPlaceholder, (cancellationToken = new CancellationTokenSource()).Token);
+                LoadComponentAsync(new NotFoundDrawable(), addContentToPlaceholder);
                 return;
             }
 
@@ -218,7 +224,7 @@ namespace osu.Game.Overlays
                 addContentToPlaceholder(loaded);
                 loaded.FadeIn(600, Easing.OutQuint);
                 searchSection.BeatmapSet = beatmaps.First();
-            }, (cancellationToken = new CancellationTokenSource()).Token);
+            });
         }
 
         private void addContentToPlaceholder(Drawable content)
@@ -231,7 +237,7 @@ namespace osu.Game.Overlays
         protected override void Dispose(bool isDisposing)
         {
             getSetsRequest?.Cancel();
-            cancellationToken?.Cancel();
+            queryChangedDebounce?.Cancel();
 
             base.Dispose(isDisposing);
         }

From a8c735b66d7268f1eadeee59cacf8ae345839010 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 20 Feb 2020 04:19:50 +0300
Subject: [PATCH 0647/1142] Change default category value

---
 osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
index f47144e5d8..f9799d8a6b 100644
--- a/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
+++ b/osu.Game/Overlays/BeatmapListing/BeatmapListingSearchSection.cs
@@ -104,6 +104,8 @@ namespace osu.Game.Overlays.BeatmapListing
                     }
                 }
             });
+
+            Category.Value = BeatmapSearchCategory.Leaderboard;
         }
 
         [BackgroundDependencyLoader]

From 907c1b3d1c73d9eaca1c2d022ee27653ce13c111 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Feb 2020 10:48:12 +0900
Subject: [PATCH 0648/1142] Add missing test banana resources

---
 .../old-skin/fruit-bananas-overlay.png          | Bin 0 -> 7823 bytes
 .../Resources/old-skin/fruit-bananas.png        | Bin 0 -> 14274 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-bananas-overlay.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-bananas.png

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-bananas-overlay.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-bananas-overlay.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a6612378e5cc655ec5d9d8ea7c53486c5a6270b
GIT binary patch
literal 7823
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
a2zU=&wPGnM{AV5mfVTP*wOSSX=>GxIE#JKW

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-bananas.png b/osu.Game.Rulesets.Catch.Tests/Resources/old-skin/fruit-bananas.png
new file mode 100644
index 0000000000000000000000000000000000000000..afb8698b2d8ff7285d53e140bcf0c5379ef8a6c6
GIT binary patch
literal 14274
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

literal 0
HcmV?d00001


From 1935a14288c3c9fedb9e73e45ffd1d7a77a20c92 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 20 Feb 2020 05:08:42 +0300
Subject: [PATCH 0649/1142] Adjust animations to be much smoother

---
 osu.Game/Overlays/BeatmapListingOverlay.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 2a812ddf96..da67226eac 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -35,6 +35,7 @@ namespace osu.Game.Overlays
         private SearchBeatmapSetsRequest getSetsRequest;
 
         private Container panelsPlaceholder;
+        private Drawable currentContent;
         private BeatmapListingSearchSection searchSection;
         private BeatmapListingSortTabControl sortControl;
 
@@ -124,6 +125,8 @@ namespace osu.Game.Overlays
                                             {
                                                 AutoSizeAxes = Axes.Y,
                                                 RelativeSizeAxes = Axes.X,
+                                                AutoSizeEasing = Easing.Out,
+                                                AutoSizeDuration = 200,
                                                 Padding = new MarginPadding { Horizontal = 20 },
                                             }
                                         }
@@ -180,7 +183,7 @@ namespace osu.Game.Overlays
 
             previewTrackManager.StopAnyPlaying(this);
 
-            panelsPlaceholder.FadeColour(Color4.DimGray, 400, Easing.OutQuint);
+            currentContent?.FadeColour(Color4.DimGray, 400, Easing.OutQuint);
 
             getSetsRequest = new SearchBeatmapSetsRequest(
                 searchSection.Query.Value,
@@ -222,16 +225,15 @@ namespace osu.Game.Overlays
             LoadComponentAsync(newPanels, loaded =>
             {
                 addContentToPlaceholder(loaded);
-                loaded.FadeIn(600, Easing.OutQuint);
                 searchSection.BeatmapSet = beatmaps.First();
             });
         }
 
         private void addContentToPlaceholder(Drawable content)
         {
-            panelsPlaceholder.Clear();
-            panelsPlaceholder.FadeColour(Color4.White);
-            panelsPlaceholder.Add(content);
+            currentContent?.FadeOut(100, Easing.OutQuint).Expire();
+            panelsPlaceholder.Add(currentContent = content);
+            currentContent.FadeIn(200, Easing.OutQuint);
         }
 
         protected override void Dispose(bool isDisposing)
@@ -248,6 +250,7 @@ namespace osu.Game.Overlays
             {
                 RelativeSizeAxes = Axes.X;
                 Height = 250;
+                Alpha = 0;
                 Margin = new MarginPadding { Top = 15 };
             }
 

From 00d8be92356065111503c18f444e6a5c5b5d9931 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 Feb 2020 13:48:34 +0900
Subject: [PATCH 0650/1142] Adjust height transition

---
 osu.Game/Overlays/BeatmapListingOverlay.cs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index da67226eac..213e9a4244 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -125,8 +125,6 @@ namespace osu.Game.Overlays
                                             {
                                                 AutoSizeAxes = Axes.Y,
                                                 RelativeSizeAxes = Axes.X,
-                                                AutoSizeEasing = Easing.Out,
-                                                AutoSizeDuration = 200,
                                                 Padding = new MarginPadding { Horizontal = 20 },
                                             }
                                         }
@@ -231,7 +229,19 @@ namespace osu.Game.Overlays
 
         private void addContentToPlaceholder(Drawable content)
         {
-            currentContent?.FadeOut(100, Easing.OutQuint).Expire();
+            Drawable lastContent = currentContent;
+
+            if (lastContent != null)
+            {
+                lastContent.FadeOut(100, Easing.OutQuint).Expire();
+
+                // Consider the case when the new content is smaller than the last content.
+                // If the auto-size computation is delayed until fade out completes, the background remain high for too long making the resulting transition to the smaller height look weird.
+                // At the same time, if the last content's height is bypassed immediately, there is a period where the new content is at Alpha = 0 when the auto-sized height will be 0.
+                // To resolve both of these issues, the bypass is delayed until a point when the content transitions (fade-in and fade-out) overlap and it looks good to do so.
+                lastContent.Delay(25).Schedule(() => lastContent.BypassAutoSizeAxes = Axes.Y);
+            }
+
             panelsPlaceholder.Add(currentContent = content);
             currentContent.FadeIn(200, Easing.OutQuint);
         }

From 51f03d0f075489ecb67c4946d55a8cab5cd07ecd Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Thu, 20 Feb 2020 14:28:38 +0900
Subject: [PATCH 0651/1142] Adjust comment
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game/Screens/Multi/Multiplayer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 07d930fa75..54af8ab107 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -109,7 +109,7 @@ namespace osu.Game.Screens.Multi
                                             new HeaderBackgroundSprite
                                             {
                                                 RelativeSizeAxes = Axes.X,
-                                                Height = 400 // Keep a static height so the header doesn't change as it's resized
+                                                Height = 400 // Keep a static height so the header doesn't change as it's resized between subscreens
                                             },
                                         }
                                     },

From 17b669fdf74c456515dbd1daca4d0a1a86625c75 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 Feb 2020 14:32:16 +0900
Subject: [PATCH 0652/1142] Refactor to detail the sizing mode setting

---
 .../Screens/Multi/Components/OverlinedDisplay.cs   | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs b/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs
index 600fa99a9a..71cabd8b50 100644
--- a/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs
+++ b/osu.Game/Screens/Multi/Components/OverlinedDisplay.cs
@@ -104,15 +104,13 @@ namespace osu.Game.Screens.Multi.Components
                 new Dimension(AutoSizeAxes.HasFlag(Axes.Y) ? GridSizeMode.AutoSize : GridSizeMode.Distributed),
             };
 
-            grid.AutoSizeAxes = Axes.None;
-            grid.RelativeSizeAxes = Axes.None;
-            grid.AutoSizeAxes = AutoSizeAxes;
-            grid.RelativeSizeAxes = ~AutoSizeAxes;
+            // 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;
 
-            Content.AutoSizeAxes = Axes.None;
-            Content.RelativeSizeAxes = Axes.None;
-            Content.AutoSizeAxes = grid.AutoSizeAxes;
-            Content.RelativeSizeAxes = grid.RelativeSizeAxes;
+            // Auto-size when required, otherwise eagerly relative-size
+            grid.AutoSizeAxes = Content.AutoSizeAxes = AutoSizeAxes;
+            grid.RelativeSizeAxes = Content.RelativeSizeAxes = ~AutoSizeAxes;
         }
     }
 }

From c5fd969568c1c9c2e22acde5559007d55d5325ba Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 Feb 2020 14:33:13 +0900
Subject: [PATCH 0653/1142] Fix 0 size in test scene

---
 .../Visual/Multiplayer/TestSceneOverlinedPlaylist.cs           | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
index 4e38f6d2c2..9a6273d075 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
@@ -27,12 +27,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 });
             }
 
-            Add(new Container
+            Add(new OverlinedPlaylist(false)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
                 Size = new Vector2(500),
-                Child = new OverlinedPlaylist(false)
             });
         }
     }

From 177935d644be16be513d48b9baa724aaf4b64a10 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 Feb 2020 14:45:35 +0900
Subject: [PATCH 0654/1142] Remove unused using

---
 osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
index 9a6273d075..14b7934dc7 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneOverlinedPlaylist.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Screens.Multi.Components;

From 1a689231c2d14326d5b9b5525e9669e11d1fdaa7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 Feb 2020 14:51:25 +0900
Subject: [PATCH 0655/1142] Support null leaderboard position

---
 .../SongSelect/TestSceneBeatmapLeaderboard.cs | 27 +++++++++++++++++++
 .../API/Requests/Responses/APILegacyScores.cs |  2 +-
 .../Online/Leaderboards/LeaderboardScore.cs   |  6 ++---
 .../BeatmapSet/Scores/ScoresContainer.cs      |  6 ++++-
 4 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
index 3eff75b020..1198488bda 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
@@ -59,6 +59,33 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep(@"None selected", () => leaderboard.SetRetrievalState(PlaceholderState.NoneSelected));
             foreach (BeatmapSetOnlineStatus status in Enum.GetValues(typeof(BeatmapSetOnlineStatus)))
                 AddStep($"{status} beatmap", () => showBeatmapWithStatus(status));
+            AddStep("null personal best position", showPersonalBestWithNullPosition);
+        }
+
+        private void showPersonalBestWithNullPosition()
+        {
+            leaderboard.TopScore = new APILegacyUserTopScoreInfo
+            {
+                Position = null,
+                Score = new APILegacyScoreInfo
+                {
+                    Rank = ScoreRank.XH,
+                    Accuracy = 1,
+                    MaxCombo = 244,
+                    TotalScore = 1707827,
+                    Mods = new[] { new OsuModHidden().Acronym, new OsuModHardRock().Acronym, },
+                    User = new User
+                    {
+                        Id = 6602580,
+                        Username = @"waaiiru",
+                        Country = new Country
+                        {
+                            FullName = @"Spain",
+                            FlagName = @"ES",
+                        },
+                    },
+                }
+            };
         }
 
         private void showPersonalBest()
diff --git a/osu.Game/Online/API/Requests/Responses/APILegacyScores.cs b/osu.Game/Online/API/Requests/Responses/APILegacyScores.cs
index 318fcb00de..75be9171b0 100644
--- a/osu.Game/Online/API/Requests/Responses/APILegacyScores.cs
+++ b/osu.Game/Online/API/Requests/Responses/APILegacyScores.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Online.API.Requests.Responses
     public class APILegacyUserTopScoreInfo
     {
         [JsonProperty(@"position")]
-        public int Position;
+        public int? Position;
 
         [JsonProperty(@"score")]
         public APILegacyScoreInfo Score;
diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index 1f52a4481b..ba92b993a2 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Online.Leaderboards
         protected Container RankContainer { get; private set; }
 
         private readonly ScoreInfo score;
-        private readonly int rank;
+        private readonly int? rank;
         private readonly bool allowHighlight;
 
         private Box background;
@@ -58,7 +58,7 @@ namespace osu.Game.Online.Leaderboards
         [Resolved(CanBeNull = true)]
         private DialogOverlay dialogOverlay { get; set; }
 
-        public LeaderboardScore(ScoreInfo score, int rank, bool allowHighlight = true)
+        public LeaderboardScore(ScoreInfo score, int? rank, bool allowHighlight = true)
         {
             this.score = score;
             this.rank = rank;
@@ -90,7 +90,7 @@ namespace osu.Game.Online.Leaderboards
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                             Font = OsuFont.GetFont(size: 20, italics: true),
-                            Text = rank.ToMetric(decimals: rank < 100000 ? 1 : 0),
+                            Text = rank == null ? "-" : rank.Value.ToMetric(decimals: rank < 100000 ? 1 : 0),
                         },
                     },
                 },
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index 2d8bd10b13..0d0dd08a0f 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -70,7 +71,10 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 topScoresContainer.Add(new DrawableTopScore(topScore));
 
                 if (userScoreInfo != null && userScoreInfo.OnlineScoreID != topScore.OnlineScoreID)
-                    topScoresContainer.Add(new DrawableTopScore(userScoreInfo, userScore.Position));
+                {
+                    Debug.Assert(userScore.Position != null);
+                    topScoresContainer.Add(new DrawableTopScore(userScoreInfo, userScore.Position.Value));
+                }
             });
         }
 

From d79ca97fe901affe1c91172d18e246a78a840c2c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 20 Feb 2020 15:04:12 +0900
Subject: [PATCH 0656/1142] Make beatmap scores also support null position

---
 .../Visual/Online/TestSceneScoresContainer.cs | 29 +++++++++++++++++++
 .../BeatmapSet/Scores/DrawableTopScore.cs     |  2 +-
 .../BeatmapSet/Scores/ScoresContainer.cs      |  6 +---
 .../BeatmapSet/Scores/TopScoreUserSection.cs  |  4 +--
 4 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs
index 3c959e05c1..51f4089058 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs
@@ -195,6 +195,29 @@ namespace osu.Game.Tests.Visual.Online
                 Position = 1337,
             };
 
+            var myBestScoreWithNullPosition = new APILegacyUserTopScoreInfo
+            {
+                Score = new APILegacyScoreInfo
+                {
+                    User = new User
+                    {
+                        Id = 7151382,
+                        Username = @"Mayuri Hana",
+                        Country = new Country
+                        {
+                            FullName = @"Thailand",
+                            FlagName = @"TH",
+                        },
+                    },
+                    Rank = ScoreRank.D,
+                    PP = 160,
+                    MaxCombo = 1234,
+                    TotalScore = 123456,
+                    Accuracy = 0.6543,
+                },
+                Position = null,
+            };
+
             var oneScore = new APILegacyScores
             {
                 Scores = new List<APILegacyScoreInfo>
@@ -250,6 +273,12 @@ namespace osu.Game.Tests.Visual.Online
                 allScores.UserScore = myBestScore;
                 scoresContainer.Scores = allScores;
             });
+
+            AddStep("Load scores with null my best position", () =>
+            {
+                allScores.UserScore = myBestScoreWithNullPosition;
+                scoresContainer.Scores = allScores;
+            });
         }
 
         private class TestScoresContainer : ScoresContainer
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs b/osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
index bb85b4a37b..cad37dd082 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
     {
         private readonly Box background;
 
-        public DrawableTopScore(ScoreInfo score, int position = 1)
+        public DrawableTopScore(ScoreInfo score, int? position = 1)
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index 0d0dd08a0f..2d8bd10b13 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.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.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -71,10 +70,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 topScoresContainer.Add(new DrawableTopScore(topScore));
 
                 if (userScoreInfo != null && userScoreInfo.OnlineScoreID != topScore.OnlineScoreID)
-                {
-                    Debug.Assert(userScore.Position != null);
-                    topScoresContainer.Add(new DrawableTopScore(userScoreInfo, userScore.Position.Value));
-                }
+                    topScoresContainer.Add(new DrawableTopScore(userScoreInfo, userScore.Position));
             });
         }
 
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
index 8a368aa535..9a67ea2b24 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreUserSection.cs
@@ -112,9 +112,9 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             };
         }
 
-        public int ScorePosition
+        public int? ScorePosition
         {
-            set => rankText.Text = $"#{value}";
+            set => rankText.Text = value == null ? "-" : $"#{value}";
         }
 
         /// <summary>

From 5970c102b4e25f7573d4375358a51a79cc4617c7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Feb 2020 15:14:40 +0900
Subject: [PATCH 0657/1142] Change API to be easier to understand

---
 .../Objects/Drawables/DrawableOsuHitObject.cs |  4 ----
 .../Objects/Drawables/DrawableHitObject.cs    | 23 ++++++++++++-------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index 1bb72a3176..a677cb6a72 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -1,13 +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.
 
-using System.Collections.Generic;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu.Judgements;
 using osu.Game.Graphics.Containers;
-using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
@@ -56,8 +54,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
-        protected override void UpdateComboColour(Color4 proposedColour, IReadOnlyList<Color4> comboColours) => AccentColour.Value = proposedColour;
-
         protected override JudgementResult CreateResult(Judgement judgement) => new OsuJudgementResult(HitObject, judgement);
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index c5ce490845..67fe18e8dd 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -346,20 +346,27 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         private void updateComboColour()
         {
-            if (HitObject is IHasComboInformation combo)
-            {
-                var comboColours = CurrentSkin.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
-                UpdateComboColour(comboColours?.Count > 0 ? comboColours[combo.ComboIndex % comboColours.Count] : Color4.White, comboColours);
-            }
+            if (!(HitObject is IHasComboInformation)) return;
+
+            var comboColours = CurrentSkin.GetConfig<GlobalSkinColours, IReadOnlyList<Color4>>(GlobalSkinColours.ComboColours)?.Value;
+
+            AccentColour.Value = GetComboColour(comboColours);
         }
 
         /// <summary>
-        /// Called when a combo colour change is proposed.
+        /// Called to retrieve the combo colour. Automatically assigned to <see cref="AccentColour"/>.
+        /// Defaults to using <see cref="IHasComboInformation.ComboIndex"/> to decide on a colour.
         /// </summary>
-        /// <param name="proposedColour">The proposed combo colour, based off the combo index.</param>
+        /// <remarks>
+        /// This will only be called if the <see cref="HitObject"/> implements <see cref="IHasComboInformation"/>.
+        /// </remarks>
         /// <param name="comboColours">A list of combo colours provided by the beatmap or skin. Can be null if not available.</param>
-        protected virtual void UpdateComboColour(Color4 proposedColour, IReadOnlyList<Color4> comboColours)
+        protected virtual Color4 GetComboColour(IReadOnlyList<Color4> comboColours)
         {
+            if (!(HitObject is IHasComboInformation combo))
+                throw new InvalidOperationException($"{nameof(HitObject)} must implement {nameof(IHasComboInformation)}");
+
+            return comboColours?.Count > 0 ? comboColours[combo.ComboIndex % comboColours.Count] : Color4.White;
         }
 
         /// <summary>

From 337a7986cf7ca5492bf9a0eaf1616e616faee12d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Feb 2020 15:19:12 +0900
Subject: [PATCH 0658/1142] Fix reference in test scene

---
 osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
index 7469771e0b..17dc27543d 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
@@ -76,8 +76,6 @@ namespace osu.Game.Tests.Gameplay
                 : base(new TestHitObjectWithCombo())
             {
             }
-
-            protected override void UpdateComboColour(Color4 proposedColour, IReadOnlyList<Color4> comboColours) => AccentColour.Value = proposedColour;
         }
 
         private class TestHitObjectWithCombo : HitObject, IHasComboInformation

From 2869128e1165b1436c6ee4140dfa9e68554ed6b3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Feb 2020 15:37:15 +0900
Subject: [PATCH 0659/1142] Update in line with combo colour API changes

---
 osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBanana.cs | 4 ++--
 .../Objects/Drawable/DrawableCatchHitObject.cs             | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBanana.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBanana.cs
index 8625b93786..672ff2cb3a 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBanana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableBanana.cs
@@ -16,10 +16,10 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
 
         private Color4? colour;
 
-        protected override void UpdateComboColour(Color4 proposedColour, IReadOnlyList<Color4> comboColours)
+        protected override Color4 GetComboColour(IReadOnlyList<Color4> comboColours)
         {
             // override any external colour changes with banananana
-            AccentColour.Value = (colour ??= getBananaColour());
+            return colour ??= getBananaColour();
         }
 
         private Color4 getBananaColour()
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs
index 188de6a6ae..3293f41eab 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs
@@ -45,11 +45,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
             ScaleContainer.Scale = new Vector2(HitObject.Scale);
         }
 
-        protected override void UpdateComboColour(Color4 proposedColour, IReadOnlyList<Color4> comboColours)
-        {
-            // ignore the incoming combo colour as we use a custom lookup
-            AccentColour.Value = comboColours[(HitObject.IndexInBeatmap + 1) % comboColours.Count];
-        }
+        protected override Color4 GetComboColour(IReadOnlyList<Color4> comboColours) =>
+            comboColours[(HitObject.IndexInBeatmap + 1) % comboColours.Count];
     }
 
     public abstract class DrawableCatchHitObject<TObject> : DrawableCatchHitObject

From 5551343cf34c235326c75547234dab714f73a7ce Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Feb 2020 15:45:25 +0900
Subject: [PATCH 0660/1142] Throw instead of null return

---
 osu.Game.Rulesets.Catch/Objects/Drawable/DrawableJuiceStream.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableJuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableJuiceStream.cs
index f76055e1ea..e1e6708bd8 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableJuiceStream.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
                         ((DrawableCatchHitObject)o).CheckPosition = p => CheckPosition?.Invoke(p) ?? false);
             }
 
-            return null;
+            throw new ArgumentException($"{nameof(hitObject)} must be of type {nameof(CatchHitObject)}.");
         }
     }
 }

From 8f5d3896f65f2ee79d0d18b18ee66b0f378b87c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Feb 2020 15:45:47 +0900
Subject: [PATCH 0661/1142] Remove unnecessary cast by changing method
 siganture

---
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 9ded0ff891..49e535890d 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -221,9 +221,9 @@ namespace osu.Game.Rulesets.Catch.UI
             /// Add a caught fruit to the catcher's stack.
             /// </summary>
             /// <param name="fruit">The fruit that was caught.</param>
-            public void PlaceOnPlate(DrawableHitObject fruit)
+            public void PlaceOnPlate(DrawableCatchHitObject fruit)
             {
-                float ourRadius = ((DrawableCatchHitObject)fruit).DisplayRadius;
+                float ourRadius = fruit.DisplayRadius;
                 float theirRadius = 0;
 
                 const float allowance = 6;

From 049975b5a46bce96baee5132d12157a01d2a7653 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Feb 2020 15:45:54 +0900
Subject: [PATCH 0662/1142] Use kebaberize shorthand

---
 osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
index f8d0880c72..36164c5543 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Catch.Skinning
                 case CatchSkinComponents.FruitOrange:
                 case CatchSkinComponents.FruitGrapes:
                 case CatchSkinComponents.FruitPear:
-                    var lookupName = catchSkinComponent.Component.ToString().Underscore().Hyphenate();
+                    var lookupName = catchSkinComponent.Component.ToString().Kebaberize();
                     if (GetTexture(lookupName) != null)
                         return new LegacyFruitPiece(lookupName);
 

From a11862ba0da03fa909642d770a0450c48b4bd1ba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Feb 2020 18:03:53 +0900
Subject: [PATCH 0663/1142] Improve transition between multiplayer screens (and
 share constants)

---
 osu.Game/Screens/Multi/Multiplayer.cs         |  8 ++---
 .../Screens/Multi/MultiplayerSubScreen.cs     | 29 ++++++++++++-------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 54af8ab107..27ad7c9bc1 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -305,13 +305,13 @@ namespace osu.Game.Screens.Multi
             switch (newScreen)
             {
                 case LoungeSubScreen _:
-                    header.ResizeHeightTo(400, WaveContainer.APPEAR_DURATION, Easing.OutQuint);
-                    headerBackground.MoveToX(0, WaveContainer.DISAPPEAR_DURATION, Easing.OutQuint);
+                    header.Delay(MultiplayerSubScreen.RESUME_TRANSITION_DELAY).ResizeHeightTo(400, MultiplayerSubScreen.APPEAR_DURATION, Easing.OutQuint);
+                    headerBackground.MoveToX(0, MultiplayerSubScreen.X_MOVE_DURATION, Easing.OutQuint);
                     break;
 
                 case MatchSubScreen _:
-                    header.ResizeHeightTo(135, WaveContainer.APPEAR_DURATION, Easing.OutQuint);
-                    headerBackground.MoveToX(-200, WaveContainer.DISAPPEAR_DURATION, Easing.OutQuint);
+                    header.ResizeHeightTo(135, MultiplayerSubScreen.APPEAR_DURATION, Easing.OutQuint);
+                    headerBackground.MoveToX(-MultiplayerSubScreen.X_SHIFT, MultiplayerSubScreen.X_MOVE_DURATION, Easing.OutQuint);
                     break;
             }
 
diff --git a/osu.Game/Screens/Multi/MultiplayerSubScreen.cs b/osu.Game/Screens/Multi/MultiplayerSubScreen.cs
index ff94f63f01..8e46de1a95 100644
--- a/osu.Game/Screens/Multi/MultiplayerSubScreen.cs
+++ b/osu.Game/Screens/Multi/MultiplayerSubScreen.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Screens;
-using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Screens.Multi
 {
@@ -24,31 +23,41 @@ namespace osu.Game.Screens.Multi
             RelativeSizeAxes = Axes.Both;
         }
 
+        public const float X_SHIFT = 200;
+
+        public const double X_MOVE_DURATION = 800;
+
+        public const double RESUME_TRANSITION_DELAY = DISAPPEAR_DURATION / 2;
+
+        public const double APPEAR_DURATION = 800;
+
+        public const double DISAPPEAR_DURATION = 500;
+
         public override void OnEntering(IScreen last)
         {
-            this.FadeInFromZero(WaveContainer.APPEAR_DURATION, Easing.OutQuint);
-            this.FadeInFromZero(WaveContainer.APPEAR_DURATION, Easing.OutQuint);
-            this.MoveToX(200).MoveToX(0, WaveContainer.APPEAR_DURATION, Easing.OutQuint);
+            this.FadeInFromZero(APPEAR_DURATION, Easing.OutQuint);
+            this.FadeInFromZero(APPEAR_DURATION, Easing.OutQuint);
+            this.MoveToX(X_SHIFT).MoveToX(0, X_MOVE_DURATION, Easing.OutQuint);
         }
 
         public override bool OnExiting(IScreen next)
         {
-            this.FadeOut(WaveContainer.DISAPPEAR_DURATION, Easing.OutQuint);
-            this.MoveToX(200, WaveContainer.DISAPPEAR_DURATION, Easing.OutQuint);
+            this.FadeOut(DISAPPEAR_DURATION, Easing.OutQuint);
+            this.MoveToX(X_SHIFT, X_MOVE_DURATION, Easing.OutQuint);
 
             return false;
         }
 
         public override void OnResuming(IScreen last)
         {
-            this.FadeIn(WaveContainer.APPEAR_DURATION, Easing.OutQuint);
-            this.MoveToX(0, WaveContainer.APPEAR_DURATION, Easing.OutQuint);
+            this.Delay(RESUME_TRANSITION_DELAY).FadeIn(APPEAR_DURATION, Easing.OutQuint);
+            this.MoveToX(0, X_MOVE_DURATION, Easing.OutQuint);
         }
 
         public override void OnSuspending(IScreen next)
         {
-            this.FadeOut(WaveContainer.DISAPPEAR_DURATION, Easing.OutQuint);
-            this.MoveToX(-200, WaveContainer.DISAPPEAR_DURATION, Easing.OutQuint);
+            this.FadeOut(DISAPPEAR_DURATION, Easing.OutQuint);
+            this.MoveToX(-X_SHIFT, X_MOVE_DURATION, Easing.OutQuint);
         }
 
         public override string ToString() => Title;

From 063fe191ef3ade3f2dff7f62ec33d29cb61a4859 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Feb 2020 18:15:40 +0900
Subject: [PATCH 0664/1142] Add back missing using

---
 osu.Game/Screens/Multi/Match/MatchSubScreen.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index 38a1e8092c..eef53126c0 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -13,6 +13,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Multiplayer.GameTypes;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Match.Components;
 using osu.Game.Screens.Multi.Play;
 using osu.Game.Screens.Select;

From 973093b5220ff8cee9b02f5e11ee43447466551d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Feb 2020 18:32:28 +0900
Subject: [PATCH 0665/1142] Fix non-selectable playlist items not forwarding
 clicks to children

---
 osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
index ca85aec4e4..a7ed1f5846 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Screens.Multi
         private readonly bool allowEdit;
         private readonly bool allowSelection;
 
-        protected override bool ShouldBeConsideredForInput(Drawable child) => allowEdit || SelectedItem.Value == Model;
+        protected override bool ShouldBeConsideredForInput(Drawable child) => allowEdit || !allowSelection || SelectedItem.Value == Model;
 
         public DrawableRoomPlaylistItem(PlaylistItem item, bool allowEdit, bool allowSelection)
             : base(item)

From 76c57a695bec92daa773801203f130f2daf54a2c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Feb 2020 18:28:20 +0900
Subject: [PATCH 0666/1142] Change create room button colouring to match design

---
 osu.Game/Screens/Multi/Multiplayer.cs | 45 ++++++++++++++++++---------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 27ad7c9bc1..235ca9ec04 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -19,7 +19,6 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Input;
 using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
-using osu.Game.Overlays.BeatmapSet.Buttons;
 using osu.Game.Screens.Menu;
 using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Lounge;
@@ -129,22 +128,11 @@ namespace osu.Game.Screens.Multi
                         }
                     },
                     new Header(screenStack),
-                    createButton = new HeaderButton
+                    createButton = new CreateRoomButton
                     {
                         Anchor = Anchor.TopRight,
                         Origin = Anchor.TopRight,
-                        RelativeSizeAxes = Axes.None,
-                        Size = new Vector2(150, Header.HEIGHT - 20),
-                        Margin = new MarginPadding
-                        {
-                            Top = 10,
-                            Right = 10 + HORIZONTAL_OVERFLOW_PADDING,
-                        },
-                        Text = "Create room",
-                        Action = () => loungeSubScreen.Open(new Room
-                        {
-                            Name = { Value = $"{api.LocalUser}'s awesome room" }
-                        }),
+                        Action = createRoom
                     },
                     roomManager = new RoomManager()
                 }
@@ -276,6 +264,11 @@ namespace osu.Game.Screens.Multi
             logo.Delay(WaveContainer.DISAPPEAR_DURATION / 2).FadeOut();
         }
 
+        private void createRoom()
+        {
+            loungeSubScreen.Open(new Room { Name = { Value = $"{api.LocalUser}'s awesome room" } });
+        }
+
         private void beginHandlingTrack()
         {
             Beatmap.BindValueChanged(updateTrack, true);
@@ -381,5 +374,29 @@ namespace osu.Game.Screens.Multi
                 protected override double TransformDuration => 200;
             }
         }
+
+        public class CreateRoomButton : TriangleButton
+        {
+            public CreateRoomButton()
+            {
+                Size = new Vector2(150, Header.HEIGHT - 20);
+                Margin = new MarginPadding
+                {
+                    Top = 10,
+                    Right = 10 + HORIZONTAL_OVERFLOW_PADDING,
+                };
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                BackgroundColour = OsuColour.FromHex(@"593790");
+                Triangles.ColourLight = OsuColour.FromHex(@"7247b6");
+                Triangles.ColourDark = OsuColour.FromHex(@"593790");
+                Triangles.TriangleScale = 1.5f;
+
+                Text = "Create room";
+            }
+        }
     }
 }

From e7fca689b1ec13bf4ec0d4581badabb992dd598b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Feb 2020 18:34:24 +0900
Subject: [PATCH 0667/1142] Change text on playlist add button to be nicer

---
 osu.Game/Screens/Multi/Components/MatchBeatmapDetailArea.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Components/MatchBeatmapDetailArea.cs b/osu.Game/Screens/Multi/Components/MatchBeatmapDetailArea.cs
index 8e085d6979..2c5fd2d397 100644
--- a/osu.Game/Screens/Multi/Components/MatchBeatmapDetailArea.cs
+++ b/osu.Game/Screens/Multi/Components/MatchBeatmapDetailArea.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Screens.Multi.Components
                         {
                             new TriangleButton
                             {
-                                Text = "create new item",
+                                Text = "Add new playlist entry",
                                 RelativeSizeAxes = Axes.Both,
                                 Size = Vector2.One,
                                 Action = () => CreateNewItem?.Invoke()

From a0b578082e459e706ebec315109324b6f1ffffc3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Feb 2020 18:39:10 +0900
Subject: [PATCH 0668/1142] Make ready button also have triangles

---
 osu.Game/Screens/Multi/Match/Components/Footer.cs      | 1 -
 osu.Game/Screens/Multi/Match/Components/ReadyButton.cs | 9 +++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Multi/Match/Components/Footer.cs b/osu.Game/Screens/Multi/Match/Components/Footer.cs
index 93430d9131..199563c698 100644
--- a/osu.Game/Screens/Multi/Match/Components/Footer.cs
+++ b/osu.Game/Screens/Multi/Match/Components/Footer.cs
@@ -47,7 +47,6 @@ namespace osu.Game.Screens.Multi.Match.Components
         private void load(OsuColour colours)
         {
             background.Colour = OsuColour.FromHex(@"28242d");
-            startButton.BackgroundColour = colours.Green;
         }
     }
 }
diff --git a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
index d39217db5d..8f484d3672 100644
--- a/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
+++ b/osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
@@ -6,12 +6,13 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 
 namespace osu.Game.Screens.Multi.Match.Components
 {
-    public class ReadyButton : OsuButton
+    public class ReadyButton : TriangleButton
     {
         public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
@@ -32,12 +33,16 @@ namespace osu.Game.Screens.Multi.Match.Components
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OsuColour colours)
         {
             beatmaps.ItemAdded += beatmapAdded;
             beatmaps.ItemRemoved += beatmapRemoved;
 
             SelectedItem.BindValueChanged(item => updateSelectedItem(item.NewValue), true);
+
+            BackgroundColour = colours.Green;
+            Triangles.ColourDark = colours.Green;
+            Triangles.ColourLight = colours.GreenLight;
         }
 
         private void updateSelectedItem(PlaylistItem item)

From 4a3f281855784ffaf7bf67f3c1ce5eaa335b8445 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Feb 2020 18:43:47 +0900
Subject: [PATCH 0669/1142] Make buttons purple

---
 .../Screens/Multi/Match/Components/Footer.cs  |  4 +---
 .../Match/Components/MatchSettingsOverlay.cs  |  7 ++-----
 .../Match/Components/PurpleTriangleButton.cs  | 20 +++++++++++++++++++
 osu.Game/Screens/Multi/Multiplayer.cs         |  6 ++----
 4 files changed, 25 insertions(+), 12 deletions(-)
 create mode 100644 osu.Game/Screens/Multi/Match/Components/PurpleTriangleButton.cs

diff --git a/osu.Game/Screens/Multi/Match/Components/Footer.cs b/osu.Game/Screens/Multi/Match/Components/Footer.cs
index 199563c698..c0c866d815 100644
--- a/osu.Game/Screens/Multi/Match/Components/Footer.cs
+++ b/osu.Game/Screens/Multi/Match/Components/Footer.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osuTK;
 
@@ -22,7 +21,6 @@ namespace osu.Game.Screens.Multi.Match.Components
         public readonly Bindable<PlaylistItem> SelectedItem = new Bindable<PlaylistItem>();
 
         private readonly Drawable background;
-        private readonly OsuButton startButton;
 
         public Footer()
         {
@@ -32,7 +30,7 @@ namespace osu.Game.Screens.Multi.Match.Components
             InternalChildren = new[]
             {
                 background = new Box { RelativeSizeAxes = Axes.Both },
-                startButton = new ReadyButton
+                new ReadyButton
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
index e3110cdfc8..97485cd5a1 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
@@ -226,7 +226,7 @@ namespace osu.Game.Screens.Multi.Match.Components
                                                                     },
                                                                     new Drawable[]
                                                                     {
-                                                                        new OsuButton
+                                                                        new PurpleTriangleButton
                                                                         {
                                                                             RelativeSizeAxes = Axes.X,
                                                                             Height = 40,
@@ -447,10 +447,7 @@ namespace osu.Game.Screens.Multi.Match.Components
                 Menu.MaxHeight = 100;
             }
 
-            protected override string GenerateItemText(TimeSpan item)
-            {
-                return item.Humanize();
-            }
+            protected override string GenerateItemText(TimeSpan item) => item.Humanize();
         }
     }
 }
diff --git a/osu.Game/Screens/Multi/Match/Components/PurpleTriangleButton.cs b/osu.Game/Screens/Multi/Match/Components/PurpleTriangleButton.cs
new file mode 100644
index 0000000000..8a0369ceba
--- /dev/null
+++ b/osu.Game/Screens/Multi/Match/Components/PurpleTriangleButton.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.Allocation;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+
+namespace osu.Game.Screens.Multi.Match.Components
+{
+    public class PurpleTriangleButton : TriangleButton
+    {
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            BackgroundColour = OsuColour.FromHex(@"593790");
+            Triangles.ColourLight = OsuColour.FromHex(@"7247b6");
+            Triangles.ColourDark = OsuColour.FromHex(@"593790");
+        }
+    }
+}
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 235ca9ec04..1219919425 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -24,6 +24,7 @@ using osu.Game.Screens.Multi.Components;
 using osu.Game.Screens.Multi.Lounge;
 using osu.Game.Screens.Multi.Lounge.Components;
 using osu.Game.Screens.Multi.Match;
+using osu.Game.Screens.Multi.Match.Components;
 using osu.Game.Screens.Play;
 using osuTK;
 
@@ -375,7 +376,7 @@ namespace osu.Game.Screens.Multi
             }
         }
 
-        public class CreateRoomButton : TriangleButton
+        public class CreateRoomButton : PurpleTriangleButton
         {
             public CreateRoomButton()
             {
@@ -390,9 +391,6 @@ namespace osu.Game.Screens.Multi
             [BackgroundDependencyLoader]
             private void load()
             {
-                BackgroundColour = OsuColour.FromHex(@"593790");
-                Triangles.ColourLight = OsuColour.FromHex(@"7247b6");
-                Triangles.ColourDark = OsuColour.FromHex(@"593790");
                 Triangles.TriangleScale = 1.5f;
 
                 Text = "Create room";

From 3380dbbd71ed950d07c006947c1d7b1ef0cec227 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Feb 2020 19:47:50 +0900
Subject: [PATCH 0670/1142] Improve visual appearance of ProcessingOverlay

---
 .../TestSceneProcessingOverlay.cs             |  86 +++++
 .../UserInterface/ProcessingOverlay.cs        |  58 ++-
 .../Overlays/AccountCreation/ScreenEntry.cs   |   6 +-
 .../Screens/Multi/Lounge/LoungeSubScreen.cs   |   6 +-
 .../Match/Components/MatchSettingsOverlay.cs  | 359 +++++++++---------
 5 files changed, 323 insertions(+), 192 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneProcessingOverlay.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneProcessingOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneProcessingOverlay.cs
new file mode 100644
index 0000000000..2424078e5a
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneProcessingOverlay.cs
@@ -0,0 +1,86 @@
+// 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.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneProcessingOverlay : OsuTestScene
+    {
+        private Drawable dimContent;
+        private ProcessingOverlay overlay;
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            Children = new[]
+            {
+                new Container
+                {
+                    Size = new Vector2(300),
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Children = new[]
+                    {
+                        new Box
+                        {
+                            Colour = Color4.SlateGray,
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        dimContent = new FillFlowContainer
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Direction = FillDirection.Vertical,
+                            Spacing = new Vector2(10),
+                            RelativeSizeAxes = Axes.Both,
+                            Size = new Vector2(0.9f),
+                            Children = new Drawable[]
+                            {
+                                new OsuSpriteText { Text = "Sample content" },
+                                new TriangleButton { Text = "can't puush me", Width = 200, },
+                                new TriangleButton { Text = "puush me", Width = 200, Action = () => { } },
+                            }
+                        },
+                        overlay = new ProcessingOverlay(dimContent),
+                    }
+                },
+            };
+        });
+
+        [Test]
+        public void ShowHide()
+        {
+            AddAssert("not visible", () => !overlay.IsPresent);
+
+            AddStep("show", () => overlay.Show());
+
+            AddUntilStep("wait for content dim", () => dimContent.Colour != Color4.White);
+
+            AddStep("hide", () => overlay.Hide());
+
+            AddUntilStep("wait for content restore", () => dimContent.Colour == Color4.White);
+        }
+
+        [Test]
+        public void ContentRestoreOnDispose()
+        {
+            AddAssert("not visible", () => !overlay.IsPresent);
+
+            AddStep("show", () => overlay.Show());
+
+            AddUntilStep("wait for content dim", () => dimContent.Colour != Color4.White);
+
+            AddStep("hide", () => overlay.Expire());
+
+            AddUntilStep("wait for content restore", () => dimContent.Colour == Color4.White);
+        }
+    }
+}
diff --git a/osu.Game/Graphics/UserInterface/ProcessingOverlay.cs b/osu.Game/Graphics/UserInterface/ProcessingOverlay.cs
index d75e78e2d9..181cfd831e 100644
--- a/osu.Game/Graphics/UserInterface/ProcessingOverlay.cs
+++ b/osu.Game/Graphics/UserInterface/ProcessingOverlay.cs
@@ -6,20 +6,27 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Graphics.UserInterface
 {
     /// <summary>
-    /// An overlay that will consume all available space and block input when required.
+    /// An overlay that will show a loading overlay and completely block input to an area.
+    /// Also optionally dims target elements.
     /// Useful for disabling all elements in a form and showing we are waiting on a response, for instance.
     /// </summary>
     public class ProcessingOverlay : VisibilityContainer
     {
-        private const float transition_duration = 200;
+        private readonly Drawable dimTarget;
 
-        public ProcessingOverlay()
+        private Container loadingBox;
+
+        private const float transition_duration = 600;
+
+        public ProcessingOverlay(Drawable dimTarget = null)
         {
+            this.dimTarget = dimTarget;
             RelativeSizeAxes = Axes.Both;
         }
 
@@ -28,29 +35,54 @@ namespace osu.Game.Graphics.UserInterface
         {
             InternalChildren = new Drawable[]
             {
-                new Box
+                loadingBox = new Container
                 {
-                    Colour = Color4.Black,
-                    RelativeSizeAxes = Axes.Both,
-                    Alpha = 0.9f,
+                    Size = new Vector2(80),
+                    Scale = new Vector2(0.8f),
+                    Masking = true,
+                    CornerRadius = 15,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Colour = Color4.Black,
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        new LoadingAnimation { State = { Value = Visibility.Visible } }
+                    }
                 },
-                new LoadingAnimation { State = { Value = Visibility.Visible } }
             };
         }
 
-        protected override bool Handle(UIEvent e)
-        {
-            return true;
-        }
+        protected override bool Handle(UIEvent e) => true;
 
         protected override void PopIn()
         {
-            this.FadeIn(transition_duration * 2, Easing.OutQuint);
+            this.FadeIn(transition_duration, Easing.OutQuint);
+            loadingBox.ScaleTo(1, transition_duration, Easing.OutElastic);
+
+            dimTarget?.FadeColour(OsuColour.Gray(0.5f), transition_duration, Easing.OutQuint);
         }
 
         protected override void PopOut()
         {
             this.FadeOut(transition_duration, Easing.OutQuint);
+            loadingBox.ScaleTo(0.8f, transition_duration / 2, Easing.In);
+
+            dimTarget?.FadeColour(Color4.White, transition_duration, Easing.OutQuint);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (State.Value == Visibility.Visible)
+            {
+                // ensure we don't leave the targetin a bad state.
+                dimTarget?.FadeColour(Color4.White, transition_duration);
+            }
         }
     }
 }
diff --git a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
index be3a84ca00..454fce0261 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
@@ -48,9 +48,11 @@ namespace osu.Game.Overlays.AccountCreation
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
+            FillFlowContainer mainContent;
+
             InternalChildren = new Drawable[]
             {
-                new FillFlowContainer
+                mainContent = new FillFlowContainer
                 {
                     RelativeSizeAxes = Axes.Both,
                     Direction = FillDirection.Vertical,
@@ -122,7 +124,7 @@ namespace osu.Game.Overlays.AccountCreation
                         },
                     },
                 },
-                processingOverlay = new ProcessingOverlay { Alpha = 0 }
+                processingOverlay = new ProcessingOverlay(mainContent)
             };
 
             textboxes = new[] { usernameTextBox, emailTextBox, passwordTextBox };
diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index 3709b85fcb..58e4548ee2 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Screens.Multi.Lounge
 
         public LoungeSubScreen()
         {
+            SearchContainer searchContainer;
+
             InternalChildren = new Drawable[]
             {
                 Filter = new FilterControl { Depth = -1 },
@@ -49,14 +51,14 @@ namespace osu.Game.Screens.Multi.Lounge
                                     RelativeSizeAxes = Axes.Both,
                                     ScrollbarOverlapsContent = false,
                                     Padding = new MarginPadding(10),
-                                    Child = new SearchContainer
+                                    Child = searchContainer = new SearchContainer
                                     {
                                         RelativeSizeAxes = Axes.X,
                                         AutoSizeAxes = Axes.Y,
                                         Child = new RoomsContainer { JoinRequested = joinRequested }
                                     },
                                 },
-                                processingOverlay = new ProcessingOverlay { Alpha = 0 }
+                                processingOverlay = new ProcessingOverlay(searchContainer),
                             }
                         },
                         new RoomInspector
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
index 97485cd5a1..8c005a2647 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
@@ -79,226 +79,235 @@ namespace osu.Game.Screens.Multi.Match.Components
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
             {
+                Container dimContent;
+
                 InternalChildren = new Drawable[]
                 {
-                    new Box
+                    dimContent = new Container
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Colour = OsuColour.FromHex(@"28242d"),
-                    },
-                    new GridContainer
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        RowDimensions = new[]
+                        Children = new Drawable[]
                         {
-                            new Dimension(GridSizeMode.Distributed),
-                            new Dimension(GridSizeMode.AutoSize),
-                        },
-                        Content = new[]
-                        {
-                            new Drawable[]
+                            new Box
                             {
-                                new OsuScrollContainer
+                                RelativeSizeAxes = Axes.Both,
+                                Colour = OsuColour.FromHex(@"28242d"),
+                            },
+                            new GridContainer
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                RowDimensions = new[]
                                 {
-                                    Padding = new MarginPadding
+                                    new Dimension(GridSizeMode.Distributed),
+                                    new Dimension(GridSizeMode.AutoSize),
+                                },
+                                Content = new[]
+                                {
+                                    new Drawable[]
                                     {
-                                        Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
-                                        Vertical = 10
-                                    },
-                                    RelativeSizeAxes = Axes.Both,
-                                    Children = new[]
-                                    {
-                                        new Container
+                                        new OsuScrollContainer
                                         {
-                                            Padding = new MarginPadding { Horizontal = SearchableListOverlay.WIDTH_PADDING },
-                                            RelativeSizeAxes = Axes.X,
-                                            AutoSizeAxes = Axes.Y,
-                                            Children = new Drawable[]
+                                            Padding = new MarginPadding
                                             {
-                                                new SectionContainer
+                                                Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
+                                                Vertical = 10
+                                            },
+                                            RelativeSizeAxes = Axes.Both,
+                                            Children = new[]
+                                            {
+                                                new Container
                                                 {
-                                                    Padding = new MarginPadding { Right = field_padding / 2 },
-                                                    Children = new[]
+                                                    Padding = new MarginPadding { Horizontal = SearchableListOverlay.WIDTH_PADDING },
+                                                    RelativeSizeAxes = Axes.X,
+                                                    AutoSizeAxes = Axes.Y,
+                                                    Children = new Drawable[]
                                                     {
-                                                        new Section("Room name")
+                                                        new SectionContainer
                                                         {
-                                                            Child = NameField = new SettingsTextBox
+                                                            Padding = new MarginPadding { Right = field_padding / 2 },
+                                                            Children = new[]
                                                             {
-                                                                RelativeSizeAxes = Axes.X,
-                                                                TabbableContentContainer = this,
-                                                                OnCommit = (sender, text) => apply(),
-                                                            },
-                                                        },
-                                                        new Section("Duration")
-                                                        {
-                                                            Child = DurationField = new DurationDropdown
-                                                            {
-                                                                RelativeSizeAxes = Axes.X,
-                                                                Items = new[]
+                                                                new Section("Room name")
                                                                 {
-                                                                    TimeSpan.FromMinutes(30),
-                                                                    TimeSpan.FromHours(1),
-                                                                    TimeSpan.FromHours(2),
-                                                                    TimeSpan.FromHours(4),
-                                                                    TimeSpan.FromHours(8),
-                                                                    TimeSpan.FromHours(12),
-                                                                    //TimeSpan.FromHours(16),
-                                                                    TimeSpan.FromHours(24),
-                                                                    TimeSpan.FromDays(3),
-                                                                    TimeSpan.FromDays(7)
-                                                                }
-                                                            }
-                                                        },
-                                                        new Section("Room visibility")
-                                                        {
-                                                            Alpha = disabled_alpha,
-                                                            Child = AvailabilityPicker = new RoomAvailabilityPicker
-                                                            {
-                                                                Enabled = { Value = false }
-                                                            },
-                                                        },
-                                                        new Section("Game type")
-                                                        {
-                                                            Alpha = disabled_alpha,
-                                                            Child = new FillFlowContainer
-                                                            {
-                                                                AutoSizeAxes = Axes.Y,
-                                                                RelativeSizeAxes = Axes.X,
-                                                                Direction = FillDirection.Vertical,
-                                                                Spacing = new Vector2(7),
-                                                                Children = new Drawable[]
-                                                                {
-                                                                    TypePicker = new GameTypePicker
+                                                                    Child = NameField = new SettingsTextBox
                                                                     {
                                                                         RelativeSizeAxes = Axes.X,
-                                                                        Enabled = { Value = false }
-                                                                    },
-                                                                    typeLabel = new OsuSpriteText
-                                                                    {
-                                                                        Font = OsuFont.GetFont(size: 14),
-                                                                        Colour = colours.Yellow
+                                                                        TabbableContentContainer = this,
+                                                                        OnCommit = (sender, text) => apply(),
                                                                     },
                                                                 },
-                                                            },
-                                                        },
-                                                        new Section("Max participants")
-                                                        {
-                                                            Alpha = disabled_alpha,
-                                                            Child = MaxParticipantsField = new SettingsNumberTextBox
-                                                            {
-                                                                RelativeSizeAxes = Axes.X,
-                                                                TabbableContentContainer = this,
-                                                                ReadOnly = true,
-                                                                OnCommit = (sender, text) => apply()
-                                                            },
-                                                        },
-                                                        new Section("Password (optional)")
-                                                        {
-                                                            Alpha = disabled_alpha,
-                                                            Child = new SettingsPasswordTextBox
-                                                            {
-                                                                RelativeSizeAxes = Axes.X,
-                                                                TabbableContentContainer = this,
-                                                                ReadOnly = true,
-                                                                OnCommit = (sender, text) => apply()
-                                                            },
-                                                        },
-                                                    },
-                                                },
-                                                new SectionContainer
-                                                {
-                                                    Anchor = Anchor.TopRight,
-                                                    Origin = Anchor.TopRight,
-                                                    Padding = new MarginPadding { Left = field_padding / 2 },
-                                                    Children = new[]
-                                                    {
-                                                        new Section("Playlist")
-                                                        {
-                                                            Child = new GridContainer
-                                                            {
-                                                                RelativeSizeAxes = Axes.X,
-                                                                Height = 300,
-                                                                Content = new[]
+                                                                new Section("Duration")
                                                                 {
-                                                                    new Drawable[]
+                                                                    Child = DurationField = new DurationDropdown
                                                                     {
-                                                                        playlist = new DrawableRoomPlaylist(true, true) { RelativeSizeAxes = Axes.Both }
-                                                                    },
-                                                                    new Drawable[]
-                                                                    {
-                                                                        new PurpleTriangleButton
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        Items = new[]
                                                                         {
-                                                                            RelativeSizeAxes = Axes.X,
-                                                                            Height = 40,
-                                                                            Text = "Edit playlist",
-                                                                            Action = () => EditPlaylist?.Invoke()
+                                                                            TimeSpan.FromMinutes(30),
+                                                                            TimeSpan.FromHours(1),
+                                                                            TimeSpan.FromHours(2),
+                                                                            TimeSpan.FromHours(4),
+                                                                            TimeSpan.FromHours(8),
+                                                                            TimeSpan.FromHours(12),
+                                                                            //TimeSpan.FromHours(16),
+                                                                            TimeSpan.FromHours(24),
+                                                                            TimeSpan.FromDays(3),
+                                                                            TimeSpan.FromDays(7)
                                                                         }
                                                                     }
                                                                 },
-                                                                RowDimensions = new[]
+                                                                new Section("Room visibility")
                                                                 {
-                                                                    new Dimension(),
-                                                                    new Dimension(GridSizeMode.AutoSize),
-                                                                }
-                                                            }
+                                                                    Alpha = disabled_alpha,
+                                                                    Child = AvailabilityPicker = new RoomAvailabilityPicker
+                                                                    {
+                                                                        Enabled = { Value = false }
+                                                                    },
+                                                                },
+                                                                new Section("Game type")
+                                                                {
+                                                                    Alpha = disabled_alpha,
+                                                                    Child = new FillFlowContainer
+                                                                    {
+                                                                        AutoSizeAxes = Axes.Y,
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        Direction = FillDirection.Vertical,
+                                                                        Spacing = new Vector2(7),
+                                                                        Children = new Drawable[]
+                                                                        {
+                                                                            TypePicker = new GameTypePicker
+                                                                            {
+                                                                                RelativeSizeAxes = Axes.X,
+                                                                                Enabled = { Value = false }
+                                                                            },
+                                                                            typeLabel = new OsuSpriteText
+                                                                            {
+                                                                                Font = OsuFont.GetFont(size: 14),
+                                                                                Colour = colours.Yellow
+                                                                            },
+                                                                        },
+                                                                    },
+                                                                },
+                                                                new Section("Max participants")
+                                                                {
+                                                                    Alpha = disabled_alpha,
+                                                                    Child = MaxParticipantsField = new SettingsNumberTextBox
+                                                                    {
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        TabbableContentContainer = this,
+                                                                        ReadOnly = true,
+                                                                        OnCommit = (sender, text) => apply()
+                                                                    },
+                                                                },
+                                                                new Section("Password (optional)")
+                                                                {
+                                                                    Alpha = disabled_alpha,
+                                                                    Child = new SettingsPasswordTextBox
+                                                                    {
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        TabbableContentContainer = this,
+                                                                        ReadOnly = true,
+                                                                        OnCommit = (sender, text) => apply()
+                                                                    },
+                                                                },
+                                                            },
+                                                        },
+                                                        new SectionContainer
+                                                        {
+                                                            Anchor = Anchor.TopRight,
+                                                            Origin = Anchor.TopRight,
+                                                            Padding = new MarginPadding { Left = field_padding / 2 },
+                                                            Children = new[]
+                                                            {
+                                                                new Section("Playlist")
+                                                                {
+                                                                    Child = new GridContainer
+                                                                    {
+                                                                        RelativeSizeAxes = Axes.X,
+                                                                        Height = 300,
+                                                                        Content = new[]
+                                                                        {
+                                                                            new Drawable[]
+                                                                            {
+                                                                                playlist = new DrawableRoomPlaylist(true, true) { RelativeSizeAxes = Axes.Both }
+                                                                            },
+                                                                            new Drawable[]
+                                                                            {
+                                                                                new PurpleTriangleButton
+                                                                                {
+                                                                                    RelativeSizeAxes = Axes.X,
+                                                                                    Height = 40,
+                                                                                    Text = "Edit playlist",
+                                                                                    Action = () => EditPlaylist?.Invoke()
+                                                                                }
+                                                                            }
+                                                                        },
+                                                                        RowDimensions = new[]
+                                                                        {
+                                                                            new Dimension(),
+                                                                            new Dimension(GridSizeMode.AutoSize),
+                                                                        }
+                                                                    }
+                                                                },
+                                                            },
                                                         },
                                                     },
-                                                },
+                                                }
                                             },
-                                        }
-                                    },
-                                },
-                            },
-                            new Drawable[]
-                            {
-                                new Container
-                                {
-                                    Anchor = Anchor.BottomLeft,
-                                    Origin = Anchor.BottomLeft,
-                                    Y = 2,
-                                    RelativeSizeAxes = Axes.X,
-                                    AutoSizeAxes = Axes.Y,
-                                    Children = new Drawable[]
-                                    {
-                                        new Box
-                                        {
-                                            RelativeSizeAxes = Axes.Both,
-                                            Colour = OsuColour.FromHex(@"28242d").Darken(0.5f).Opacity(1f),
                                         },
-                                        new FillFlowContainer
+                                    },
+                                    new Drawable[]
+                                    {
+                                        new Container
                                         {
+                                            Anchor = Anchor.BottomLeft,
+                                            Origin = Anchor.BottomLeft,
+                                            Y = 2,
                                             RelativeSizeAxes = Axes.X,
                                             AutoSizeAxes = Axes.Y,
-                                            Direction = FillDirection.Vertical,
-                                            Spacing = new Vector2(0, 20),
-                                            Margin = new MarginPadding { Vertical = 20 },
-                                            Padding = new MarginPadding { Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING },
                                             Children = new Drawable[]
                                             {
-                                                ApplyButton = new CreateRoomButton
+                                                new Box
                                                 {
-                                                    Anchor = Anchor.BottomCentre,
-                                                    Origin = Anchor.BottomCentre,
-                                                    Size = new Vector2(230, 55),
-                                                    Enabled = { Value = false },
-                                                    Action = apply,
+                                                    RelativeSizeAxes = Axes.Both,
+                                                    Colour = OsuColour.FromHex(@"28242d").Darken(0.5f).Opacity(1f),
                                                 },
-                                                ErrorText = new OsuSpriteText
+                                                new FillFlowContainer
                                                 {
-                                                    Anchor = Anchor.BottomCentre,
-                                                    Origin = Anchor.BottomCentre,
-                                                    Alpha = 0,
-                                                    Depth = 1,
-                                                    Colour = colours.RedDark
+                                                    RelativeSizeAxes = Axes.X,
+                                                    AutoSizeAxes = Axes.Y,
+                                                    Direction = FillDirection.Vertical,
+                                                    Spacing = new Vector2(0, 20),
+                                                    Margin = new MarginPadding { Vertical = 20 },
+                                                    Padding = new MarginPadding { Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING },
+                                                    Children = new Drawable[]
+                                                    {
+                                                        ApplyButton = new CreateRoomButton
+                                                        {
+                                                            Anchor = Anchor.BottomCentre,
+                                                            Origin = Anchor.BottomCentre,
+                                                            Size = new Vector2(230, 55),
+                                                            Enabled = { Value = false },
+                                                            Action = apply,
+                                                        },
+                                                        ErrorText = new OsuSpriteText
+                                                        {
+                                                            Anchor = Anchor.BottomCentre,
+                                                            Origin = Anchor.BottomCentre,
+                                                            Alpha = 0,
+                                                            Depth = 1,
+                                                            Colour = colours.RedDark
+                                                        }
+                                                    }
                                                 }
                                             }
                                         }
                                     }
                                 }
-                            }
+                            },
                         }
                     },
-                    processingOverlay = new ProcessingOverlay { Alpha = 0 }
+                    processingOverlay = new ProcessingOverlay(dimContent)
                 };
 
                 TypePicker.Current.BindValueChanged(type => typeLabel.Text = type.NewValue?.Name ?? string.Empty, true);

From 7adedcb7b973a59ead594a0fdfa1d74035ff2405 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 21 Feb 2020 08:34:51 +0900
Subject: [PATCH 0671/1142] Fix typo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game/Graphics/UserInterface/ProcessingOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/ProcessingOverlay.cs b/osu.Game/Graphics/UserInterface/ProcessingOverlay.cs
index 181cfd831e..8109f3bd94 100644
--- a/osu.Game/Graphics/UserInterface/ProcessingOverlay.cs
+++ b/osu.Game/Graphics/UserInterface/ProcessingOverlay.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Graphics.UserInterface
 
             if (State.Value == Visibility.Visible)
             {
-                // ensure we don't leave the targetin a bad state.
+                // ensure we don't leave the target in a bad state.
                 dimTarget?.FadeColour(Color4.White, transition_duration);
             }
         }

From 6c21cc3926f2b0d523a08dadb6cc74dc43d61a21 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Feb 2020 08:55:12 +0900
Subject: [PATCH 0672/1142] Adjust easing type to match in disposal clause

Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>
---
 osu.Game/Graphics/UserInterface/ProcessingOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/ProcessingOverlay.cs b/osu.Game/Graphics/UserInterface/ProcessingOverlay.cs
index 8109f3bd94..c65801a82e 100644
--- a/osu.Game/Graphics/UserInterface/ProcessingOverlay.cs
+++ b/osu.Game/Graphics/UserInterface/ProcessingOverlay.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Graphics.UserInterface
             if (State.Value == Visibility.Visible)
             {
                 // ensure we don't leave the target in a bad state.
-                dimTarget?.FadeColour(Color4.White, transition_duration);
+                dimTarget?.FadeColour(Color4.White, transition_duration, Easing.OutQuint);
             }
         }
     }

From 6468bfa54324231bae6325e149ea445c3eddfb07 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 Feb 2020 10:01:38 +0900
Subject: [PATCH 0673/1142] Apply adjustments

---
 .../Objects/Drawable/DrawableCatchHitObject.cs       |  2 +-
 .../Objects/Drawable/DrawableDroplet.cs              | 12 +++++-------
 .../Objects/Drawable/DrawableTinyDroplet.cs          |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs
index 3293f41eab..ed9e797154 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableCatchHitObject.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
     {
         public override bool CanBePlated => true;
 
-        protected Container ScaleContainer;
+        protected Container ScaleContainer { get; private set; }
 
         protected PalpableCatchHitObject(TObject hitObject)
             : base(hitObject)
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
index 4e8faed091..ef3be7e2ba 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Allocation;
 using osu.Game.Rulesets.Catch.Objects.Drawable.Pieces;
 using osu.Game.Skinning;
-using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawable
 {
@@ -20,12 +19,11 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
         [BackgroundDependencyLoader]
         private void load()
         {
-            ScaleContainer.Child = new SkinnableDrawable(
-                new CatchSkinComponent(CatchSkinComponents.Droplet), _ => new Pulp
-                {
-                    Size = Size / 4,
-                    AccentColour = { Value = Color4.White }
-                });
+            ScaleContainer.Child = new SkinnableDrawable(new CatchSkinComponent(CatchSkinComponents.Droplet), _ => new Pulp
+            {
+                Size = Size / 4,
+                AccentColour = { BindTarget = AccentColour }
+            });
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableTinyDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableTinyDroplet.cs
index 4fe1f86f2b..873e5a3ebb 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableTinyDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableTinyDroplet.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
         [BackgroundDependencyLoader]
         private void load()
         {
-            Scale /= 2;
+            ScaleContainer.Scale /= 2;
         }
     }
 }

From d275bc8a6150125f9423e2cb0d831c3fd0651e7b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Feb 2020 10:44:48 +0900
Subject: [PATCH 0674/1142] Add test steps for droplet / tiny droplet

---
 .../TestSceneFruitObjects.cs                  | 44 ++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
index b106ee2f77..78339de380 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
@@ -38,9 +38,51 @@ namespace osu.Game.Rulesets.Catch.Tests
 
             foreach (FruitVisualRepresentation rep in Enum.GetValues(typeof(FruitVisualRepresentation)))
                 AddStep($"show {rep}", () => SetContents(() => createDrawable(rep)));
+
+            AddStep("show droplet", () => SetContents(createDrawableDroplet));
+
+            AddStep("show tiny droplet", () => SetContents(createDrawableTinyDroplet));
         }
 
-        private DrawableFruit createDrawable(FruitVisualRepresentation rep)
+        private Drawable createDrawableTinyDroplet()
+        {
+            var droplet = new TinyDroplet
+            {
+                StartTime = Clock.CurrentTime,
+                Scale = 1.5f,
+            };
+
+            return new DrawableTinyDroplet(droplet)
+            {
+                Anchor = Anchor.Centre,
+                RelativePositionAxes = Axes.None,
+                Position = Vector2.Zero,
+                Alpha = 1,
+                LifetimeStart = double.NegativeInfinity,
+                LifetimeEnd = double.PositiveInfinity,
+            };
+        }
+
+        private Drawable createDrawableDroplet()
+        {
+            var droplet = new Droplet
+            {
+                StartTime = Clock.CurrentTime,
+                Scale = 1.5f,
+            };
+
+            return new DrawableDroplet(droplet)
+            {
+                Anchor = Anchor.Centre,
+                RelativePositionAxes = Axes.None,
+                Position = Vector2.Zero,
+                Alpha = 1,
+                LifetimeStart = double.NegativeInfinity,
+                LifetimeEnd = double.PositiveInfinity,
+            };
+        }
+
+        private Drawable createDrawable(FruitVisualRepresentation rep)
         {
             Fruit fruit = new TestCatchFruit(rep)
             {

From 0f088cc2c2705bb4dda0ef45d44cf705e9633371 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 21 Feb 2020 03:10:48 +0000
Subject: [PATCH 0675/1142] Bump ppy.osu.Game.Resources from 2020.219.0 to
 2020.221.0

Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2020.219.0 to 2020.221.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2020.219.0...2020.221.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index b9ef783b2a..1774ea0bb4 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -53,7 +53,7 @@
     <Reference Include="Java.Interop" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.219.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.221.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2020.218.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 6b8f8fee8c..c034fb6567 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -22,7 +22,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.219.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.221.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2020.218.0" />
     <PackageReference Include="Sentry" Version="2.0.3" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index f68bedc57f..7f99338c6e 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -73,7 +73,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.219.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.221.0" />
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.218.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->

From b7e14569eb42046a9adf257023ec70abdbb4a5f8 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 21 Feb 2020 03:11:10 +0000
Subject: [PATCH 0676/1142] Bump DiscordRichPresence from 1.0.147 to 1.0.150

Bumps [DiscordRichPresence](https://github.com/Lachee/discord-rpc-csharp) from 1.0.147 to 1.0.150.
- [Release notes](https://github.com/Lachee/discord-rpc-csharp/releases)
- [Commits](https://github.com/Lachee/discord-rpc-csharp/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Desktop/osu.Desktop.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj
index b9294088f4..c34e1e1221 100644
--- a/osu.Desktop/osu.Desktop.csproj
+++ b/osu.Desktop/osu.Desktop.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.6" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
-    <PackageReference Include="DiscordRichPresence" Version="1.0.147" />
+    <PackageReference Include="DiscordRichPresence" Version="1.0.150" />
   </ItemGroup>
   <ItemGroup Label="Resources">
     <EmbeddedResource Include="lazer.ico" />

From 5acaf9b371d9b64d73040673670f7bb3f6ecb71d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 Feb 2020 12:33:49 +0900
Subject: [PATCH 0677/1142] Privatise setter

---
 osu.Game/Overlays/Comments/CommentEditor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Comments/CommentEditor.cs b/osu.Game/Overlays/Comments/CommentEditor.cs
index f7e53addbe..2fa4cb68f3 100644
--- a/osu.Game/Overlays/Comments/CommentEditor.cs
+++ b/osu.Game/Overlays/Comments/CommentEditor.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Overlays.Comments
 
         protected abstract string TextBoxPlaceholder { get; }
 
-        protected FillFlowContainer ButtonsContainer;
+        protected FillFlowContainer ButtonsContainer { get; private set; }
 
         protected readonly Bindable<string> Current = new Bindable<string>();
 

From da41f4cd3f0a59dd0d2eb3317ba012893049bb6d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 21 Feb 2020 08:02:40 +0300
Subject: [PATCH 0678/1142] Add CommentsContainer to ChangelogOverlay

---
 osu.Game/Overlays/Changelog/ChangelogContent.cs     |  2 +-
 osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Changelog/ChangelogContent.cs b/osu.Game/Overlays/Changelog/ChangelogContent.cs
index f8d5bbd66c..2f6c1ae902 100644
--- a/osu.Game/Overlays/Changelog/ChangelogContent.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogContent.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Changelog
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
             Direction = FillDirection.Vertical;
-            Padding = new MarginPadding { Bottom = 100 };
+            Padding = new MarginPadding { Bottom = 50 };
         }
     }
 }
diff --git a/osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs b/osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs
index 67bcb6f558..73f9466179 100644
--- a/osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs
@@ -16,6 +16,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Overlays.Comments;
 using osuTK;
 
 namespace osu.Game.Overlays.Changelog
@@ -57,11 +58,18 @@ namespace osu.Game.Overlays.Changelog
 
             if (build != null)
             {
+                CommentsContainer comments;
+
                 Children = new Drawable[]
                 {
                     new ChangelogBuildWithNavigation(build) { SelectBuild = SelectBuild },
-                    new Comments(build)
+                    comments = new CommentsContainer
+                    {
+                        Margin = new MarginPadding { Top = 10 }
+                    }
                 };
+
+                comments.ShowComments(CommentableType.Build, build.Id);
             }
         }
 

From 623b78d67533f915dfc520b50ab2cc8a871fd74a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Feb 2020 15:31:40 +0900
Subject: [PATCH 0679/1142] Combine all loading animation implementations

---
 .../Visual/Online/TestSceneRankingsTables.cs  |  6 +-
 .../Visual/Online/TestSceneUserRequest.cs     |  9 +-
 ...ingOverlay.cs => TestSceneLoadingLayer.cs} | 10 +-
 .../UserInterface/DimmedLoadingLayer.cs       | 58 ------------
 .../UserInterface/LoadingAnimation.cs         | 92 ++++++++++++++-----
 .../Graphics/UserInterface/LoadingLayer.cs    | 74 +++++++++++++++
 .../UserInterface/ProcessingOverlay.cs        | 88 ------------------
 .../Overlays/AccountCreation/ScreenEntry.cs   | 10 +-
 .../BeatmapSet/Buttons/FavouriteButton.cs     |  8 +-
 .../BeatmapSet/Scores/ScoresContainer.cs      | 15 +--
 .../Overlays/Rankings/SpotlightsLayout.cs     |  4 +-
 osu.Game/Overlays/RankingsOverlay.cs          |  6 +-
 .../Screens/Multi/Lounge/LoungeSubScreen.cs   | 10 +-
 .../Match/Components/MatchSettingsOverlay.cs  | 10 +-
 osu.Game/Screens/Select/BeatmapDetails.cs     | 10 +-
 15 files changed, 185 insertions(+), 225 deletions(-)
 rename osu.Game.Tests/Visual/UserInterface/{TestSceneProcessingOverlay.cs => TestSceneLoadingLayer.cs} (90%)
 delete mode 100644 osu.Game/Graphics/UserInterface/DimmedLoadingLayer.cs
 create mode 100644 osu.Game/Graphics/UserInterface/LoadingLayer.cs
 delete mode 100644 osu.Game/Graphics/UserInterface/ProcessingOverlay.cs

diff --git a/osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs b/osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs
index 656402e713..8542a5e46e 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs
@@ -8,7 +8,6 @@ using osu.Game.Overlays.Rankings.Tables;
 using osu.Framework.Graphics;
 using osu.Game.Online.API.Requests;
 using osu.Game.Rulesets;
-using osu.Game.Graphics.UserInterface;
 using System.Threading;
 using osu.Game.Online.API;
 using osu.Game.Rulesets.Osu;
@@ -16,6 +15,7 @@ using osu.Game.Rulesets.Mania;
 using osu.Game.Rulesets.Taiko;
 using osu.Game.Rulesets.Catch;
 using osu.Framework.Allocation;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays;
 
 namespace osu.Game.Tests.Visual.Online
@@ -41,7 +41,7 @@ namespace osu.Game.Tests.Visual.Online
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
 
         private readonly BasicScrollContainer scrollFlow;
-        private readonly DimmedLoadingLayer loading;
+        private readonly LoadingLayer loading;
         private CancellationTokenSource cancellationToken;
         private APIRequest request;
 
@@ -56,7 +56,7 @@ namespace osu.Game.Tests.Visual.Online
                     RelativeSizeAxes = Axes.Both,
                     Width = 0.8f,
                 },
-                loading = new DimmedLoadingLayer(),
+                loading = new LoadingLayer(),
             };
         }
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserRequest.cs b/osu.Game.Tests/Visual/Online/TestSceneUserRequest.cs
index 0f41247571..15cfd3ee54 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserRequest.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserRequest.cs
@@ -12,8 +12,8 @@ using osu.Game.Rulesets.Mania;
 using osu.Game.Users;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Rulesets.Taiko;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Rulesets.Taiko;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -25,7 +25,7 @@ namespace osu.Game.Tests.Visual.Online
 
         private readonly Bindable<User> user = new Bindable<User>();
         private GetUserRequest request;
-        private readonly DimmedLoadingLayer loading;
+        private readonly LoadingLayer loading;
 
         public TestSceneUserRequest()
         {
@@ -40,10 +40,7 @@ namespace osu.Game.Tests.Visual.Online
                     {
                         User = { BindTarget = user }
                     },
-                    loading = new DimmedLoadingLayer
-                    {
-                        Alpha = 0
-                    }
+                    loading = new LoadingLayer()
                 }
             });
         }
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneProcessingOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs
similarity index 90%
rename from osu.Game.Tests/Visual/UserInterface/TestSceneProcessingOverlay.cs
rename to osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs
index 2424078e5a..0f49835742 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneProcessingOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
+using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -12,10 +14,12 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
-    public class TestSceneProcessingOverlay : OsuTestScene
+    public class TestSceneLoadingLayer : OsuTestScene
     {
         private Drawable dimContent;
-        private ProcessingOverlay overlay;
+        private LoadingLayer overlay;
+
+        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(LoadingAnimation) };
 
         [SetUp]
         public void SetUp() => Schedule(() =>
@@ -49,7 +53,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                                 new TriangleButton { Text = "puush me", Width = 200, Action = () => { } },
                             }
                         },
-                        overlay = new ProcessingOverlay(dimContent),
+                        overlay = new LoadingLayer(dimContent),
                     }
                 },
             };
diff --git a/osu.Game/Graphics/UserInterface/DimmedLoadingLayer.cs b/osu.Game/Graphics/UserInterface/DimmedLoadingLayer.cs
deleted file mode 100644
index bdc3cd4c49..0000000000
--- a/osu.Game/Graphics/UserInterface/DimmedLoadingLayer.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osuTK.Graphics;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Extensions.Color4Extensions;
-using osuTK;
-using osu.Framework.Input.Events;
-
-namespace osu.Game.Graphics.UserInterface
-{
-    public class DimmedLoadingLayer : OverlayContainer
-    {
-        private const float transition_duration = 250;
-
-        private readonly LoadingAnimation loading;
-
-        public DimmedLoadingLayer(float dimAmount = 0.5f, float iconScale = 1f)
-        {
-            RelativeSizeAxes = Axes.Both;
-            Children = new Drawable[]
-            {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = Color4.Black.Opacity(dimAmount),
-                },
-                loading = new LoadingAnimation { Scale = new Vector2(iconScale) },
-            };
-        }
-
-        protected override void PopIn()
-        {
-            this.FadeIn(transition_duration, Easing.OutQuint);
-            loading.Show();
-        }
-
-        protected override void PopOut()
-        {
-            this.FadeOut(transition_duration, Easing.OutQuint);
-            loading.Hide();
-        }
-
-        protected override bool Handle(UIEvent e)
-        {
-            switch (e)
-            {
-                // blocking scroll can cause weird behaviour when this layer is used within a ScrollContainer.
-                case ScrollEvent _:
-                    return false;
-            }
-
-            return base.Handle(e);
-        }
-    }
-}
diff --git a/osu.Game/Graphics/UserInterface/LoadingAnimation.cs b/osu.Game/Graphics/UserInterface/LoadingAnimation.cs
index 5a8a0da135..265c93bce3 100644
--- a/osu.Game/Graphics/UserInterface/LoadingAnimation.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingAnimation.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osuTK;
 using osuTK.Graphics;
@@ -15,36 +16,47 @@ namespace osu.Game.Graphics.UserInterface
     public class LoadingAnimation : VisibilityContainer
     {
         private readonly SpriteIcon spinner;
-        private readonly SpriteIcon spinnerShadow;
 
-        private const float spin_duration = 600;
-        private const float transition_duration = 200;
+        protected Container MainContents;
 
-        public LoadingAnimation()
+        protected const float TRANSITION_DURATION = 500;
+
+        private const float spin_duration = 900;
+
+        /// <summary>
+        /// Constuct a new loading spinner.
+        /// </summary>
+        /// <param name="withBox"></param>
+        public LoadingAnimation(bool withBox = false)
         {
-            Size = new Vector2(20);
+            Size = new Vector2(60);
 
             Anchor = Anchor.Centre;
             Origin = Anchor.Centre;
 
-            Children = new Drawable[]
+            Child = MainContents = new Container
             {
-                spinnerShadow = new SpriteIcon
+                RelativeSizeAxes = Axes.Both,
+                Masking = true,
+                CornerRadius = 20,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Children = new Drawable[]
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    RelativeSizeAxes = Axes.Both,
-                    Position = new Vector2(1, 1),
-                    Colour = Color4.Black,
-                    Alpha = 0.4f,
-                    Icon = FontAwesome.Solid.CircleNotch
-                },
-                spinner = new SpriteIcon
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    RelativeSizeAxes = Axes.Both,
-                    Icon = FontAwesome.Solid.CircleNotch
+                    new Box
+                    {
+                        Colour = Color4.Black,
+                        RelativeSizeAxes = Axes.Both,
+                        Alpha = withBox ? 0.7f : 0
+                    },
+                    spinner = new SpriteIcon
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Scale = new Vector2(withBox ? 0.6f : 1),
+                        RelativeSizeAxes = Axes.Both,
+                        Icon = FontAwesome.Solid.CircleNotch
+                    }
                 }
             };
         }
@@ -53,12 +65,42 @@ namespace osu.Game.Graphics.UserInterface
         {
             base.LoadComplete();
 
-            spinner.Spin(spin_duration, RotationDirection.Clockwise);
-            spinnerShadow.Spin(spin_duration, RotationDirection.Clockwise);
+            rotate();
         }
 
-        protected override void PopIn() => this.FadeIn(transition_duration * 2, Easing.OutQuint);
+        protected override void Update()
+        {
+            base.Update();
 
-        protected override void PopOut() => this.FadeOut(transition_duration, Easing.OutQuint);
+            MainContents.CornerRadius = MainContents.DrawWidth / 4;
+        }
+
+        protected override void PopIn()
+        {
+            if (Alpha < 0.5f)
+                // reset animation if the user can't see us.
+                rotate();
+
+            MainContents.ScaleTo(1, TRANSITION_DURATION, Easing.OutQuint);
+            this.FadeIn(TRANSITION_DURATION * 2, Easing.OutQuint);
+        }
+
+        protected override void PopOut()
+        {
+            MainContents.ScaleTo(0.8f, TRANSITION_DURATION / 2, Easing.In);
+            this.FadeOut(TRANSITION_DURATION, Easing.OutQuint);
+        }
+
+        private void rotate()
+        {
+            spinner.Spin(spin_duration * 4, RotationDirection.Clockwise);
+
+            MainContents.RotateTo(0).Then()
+                        .RotateTo(90, spin_duration, Easing.InOutQuart).Then()
+                        .RotateTo(180, spin_duration, Easing.InOutQuart).Then()
+                        .RotateTo(270, spin_duration, Easing.InOutQuart).Then()
+                        .RotateTo(360, spin_duration, Easing.InOutQuart).Then()
+                        .Loop();
+        }
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/LoadingLayer.cs b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
new file mode 100644
index 0000000000..a7b39c77fa
--- /dev/null
+++ b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
@@ -0,0 +1,74 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Events;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    /// <summary>
+    /// An overlay that will show a loading overlay and completely block input to an area.
+    /// Also optionally dims target elements.
+    /// Useful for disabling all elements in a form and showing we are waiting on a response, for instance.
+    /// </summary>
+    public class LoadingLayer : LoadingAnimation
+    {
+        private readonly Drawable dimTarget;
+
+        public LoadingLayer(Drawable dimTarget = null, bool withBox = true)
+            : base(withBox)
+        {
+            RelativeSizeAxes = Axes.Both;
+            Size = new Vector2(1);
+
+            this.dimTarget = dimTarget;
+
+            MainContents.RelativeSizeAxes = Axes.None;
+        }
+
+        protected override bool Handle(UIEvent e)
+        {
+            switch (e)
+            {
+                // blocking scroll can cause weird behaviour when this layer is used within a ScrollContainer.
+                case ScrollEvent _:
+                    return false;
+            }
+
+            return true;
+        }
+
+        protected override void PopIn()
+        {
+            dimTarget?.FadeColour(OsuColour.Gray(0.5f), TRANSITION_DURATION, Easing.OutQuint);
+            base.PopIn();
+        }
+
+        protected override void PopOut()
+        {
+            dimTarget?.FadeColour(Color4.White, TRANSITION_DURATION, Easing.OutQuint);
+            base.PopOut();
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+            MainContents.Size = new Vector2(Math.Min(DrawWidth, DrawHeight) * 0.25f);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            if (State.Value == Visibility.Visible)
+            {
+                // ensure we don't leave the target in a bad state.
+                dimTarget?.FadeColour(Color4.White, TRANSITION_DURATION, Easing.OutQuint);
+            }
+        }
+    }
+}
diff --git a/osu.Game/Graphics/UserInterface/ProcessingOverlay.cs b/osu.Game/Graphics/UserInterface/ProcessingOverlay.cs
deleted file mode 100644
index c65801a82e..0000000000
--- a/osu.Game/Graphics/UserInterface/ProcessingOverlay.cs
+++ /dev/null
@@ -1,88 +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.Framework.Input.Events;
-using osuTK;
-using osuTK.Graphics;
-
-namespace osu.Game.Graphics.UserInterface
-{
-    /// <summary>
-    /// An overlay that will show a loading overlay and completely block input to an area.
-    /// Also optionally dims target elements.
-    /// Useful for disabling all elements in a form and showing we are waiting on a response, for instance.
-    /// </summary>
-    public class ProcessingOverlay : VisibilityContainer
-    {
-        private readonly Drawable dimTarget;
-
-        private Container loadingBox;
-
-        private const float transition_duration = 600;
-
-        public ProcessingOverlay(Drawable dimTarget = null)
-        {
-            this.dimTarget = dimTarget;
-            RelativeSizeAxes = Axes.Both;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            InternalChildren = new Drawable[]
-            {
-                loadingBox = new Container
-                {
-                    Size = new Vector2(80),
-                    Scale = new Vector2(0.8f),
-                    Masking = true,
-                    CornerRadius = 15,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            Colour = Color4.Black,
-                            RelativeSizeAxes = Axes.Both,
-                        },
-                        new LoadingAnimation { State = { Value = Visibility.Visible } }
-                    }
-                },
-            };
-        }
-
-        protected override bool Handle(UIEvent e) => true;
-
-        protected override void PopIn()
-        {
-            this.FadeIn(transition_duration, Easing.OutQuint);
-            loadingBox.ScaleTo(1, transition_duration, Easing.OutElastic);
-
-            dimTarget?.FadeColour(OsuColour.Gray(0.5f), transition_duration, Easing.OutQuint);
-        }
-
-        protected override void PopOut()
-        {
-            this.FadeOut(transition_duration, Easing.OutQuint);
-            loadingBox.ScaleTo(0.8f, transition_duration / 2, Easing.In);
-
-            dimTarget?.FadeColour(Color4.White, transition_duration, Easing.OutQuint);
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            base.Dispose(isDisposing);
-
-            if (State.Value == Visibility.Visible)
-            {
-                // ensure we don't leave the target in a bad state.
-                dimTarget?.FadeColour(Color4.White, transition_duration, Easing.OutQuint);
-            }
-        }
-    }
-}
diff --git a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
index 454fce0261..2576900db8 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Overlays.AccountCreation
         private IEnumerable<Drawable> characterCheckText;
 
         private OsuTextBox[] textboxes;
-        private ProcessingOverlay processingOverlay;
+        private LoadingLayer loadingLayer;
 
         [Resolved]
         private GameHost host { get; set; }
@@ -124,7 +124,7 @@ namespace osu.Game.Overlays.AccountCreation
                         },
                     },
                 },
-                processingOverlay = new ProcessingOverlay(mainContent)
+                loadingLayer = new LoadingLayer(mainContent)
             };
 
             textboxes = new[] { usernameTextBox, emailTextBox, passwordTextBox };
@@ -144,7 +144,7 @@ namespace osu.Game.Overlays.AccountCreation
         public override void OnEntering(IScreen last)
         {
             base.OnEntering(last);
-            processingOverlay.Hide();
+            loadingLayer.Hide();
 
             if (host?.OnScreenKeyboardOverlapsGameWindow != true)
                 focusNextTextbox();
@@ -162,7 +162,7 @@ namespace osu.Game.Overlays.AccountCreation
             emailAddressDescription.ClearErrors();
             passwordDescription.ClearErrors();
 
-            processingOverlay.Show();
+            loadingLayer.Show();
 
             Task.Run(() =>
             {
@@ -195,7 +195,7 @@ namespace osu.Game.Overlays.AccountCreation
                         }
 
                         registerShake.Shake();
-                        processingOverlay.Hide();
+                        loadingLayer.Hide();
                         return;
                     }
 
diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/FavouriteButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/FavouriteButton.cs
index af0987d183..742b1055b2 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/FavouriteButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/FavouriteButton.cs
@@ -5,7 +5,6 @@ using System.Diagnostics;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
@@ -25,7 +24,7 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
         private readonly BindableBool favourited = new BindableBool();
 
         private PostBeatmapFavouriteRequest request;
-        private DimmedLoadingLayer loading;
+        private LoadingLayer loading;
 
         private readonly Bindable<User> localUser = new Bindable<User>();
 
@@ -54,14 +53,11 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
                     Size = new Vector2(18),
                     Shadow = false,
                 },
-                loading = new DimmedLoadingLayer(0.8f, 0.5f),
+                loading = new LoadingLayer(icon, false),
             });
 
             Action = () =>
             {
-                if (loading.State.Value == Visibility.Visible)
-                    return;
-
                 // guaranteed by disabled state above.
                 Debug.Assert(BeatmapSet.Value.OnlineBeatmapSetID != null);
 
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index 92ff3c3125..e831c8ce42 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -5,7 +5,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics.UserInterface;
 using osuTK;
 using System.Linq;
 using osu.Game.Online.API.Requests.Responses;
@@ -13,6 +12,7 @@ using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Framework.Bindables;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Select.Leaderboards;
 using osu.Game.Users;
@@ -31,7 +31,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
         private readonly Box background;
         private readonly ScoreTable scoreTable;
         private readonly FillFlowContainer topScoresContainer;
-        private readonly DimmedLoadingLayer loading;
+        private readonly LoadingLayer loading;
         private readonly LeaderboardModSelector modSelector;
         private readonly NoScoresPlaceholder noScoresPlaceholder;
         private readonly FillFlowContainer content;
@@ -160,16 +160,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                                         }
                                     }
                                 },
-                                new Container
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Masking = true,
-                                    CornerRadius = 5,
-                                    Child = loading = new DimmedLoadingLayer(iconScale: 0.8f)
-                                    {
-                                        Alpha = 0,
-                                    },
-                                }
+                                loading = new LoadingLayer()
                             }
                         }
                     }
diff --git a/osu.Game/Overlays/Rankings/SpotlightsLayout.cs b/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
index e609fa1487..6f06eecd6e 100644
--- a/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
+++ b/osu.Game/Overlays/Rankings/SpotlightsLayout.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Overlays.Rankings
 
         private SpotlightSelector selector;
         private Container content;
-        private DimmedLoadingLayer loading;
+        private LoadingLayer loading;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -67,7 +67,7 @@ namespace osu.Game.Overlays.Rankings
                                 AutoSizeAxes = Axes.Y,
                                 Margin = new MarginPadding { Vertical = 10 }
                             },
-                            loading = new DimmedLoadingLayer()
+                            loading = new LoadingLayer(content)
                         }
                     }
                 }
diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index 2c5ea61315..b372511bd2 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -9,9 +9,9 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Overlays.Rankings;
 using osu.Game.Users;
 using osu.Game.Rulesets;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using System.Threading;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API.Requests;
 using osu.Game.Overlays.Rankings.Tables;
 
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays
 
         private readonly BasicScrollContainer scrollFlow;
         private readonly Container contentContainer;
-        private readonly DimmedLoadingLayer loading;
+        private readonly LoadingLayer loading;
         private readonly Box background;
         private readonly RankingsOverlayHeader header;
 
@@ -77,7 +77,7 @@ namespace osu.Game.Overlays
                                         RelativeSizeAxes = Axes.X,
                                         Margin = new MarginPadding { Bottom = 10 }
                                     },
-                                    loading = new DimmedLoadingLayer(),
+                                    loading = new LoadingLayer(contentContainer),
                                 }
                             }
                         }
diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index 58e4548ee2..e2e5b1b549 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.Multi.Lounge
         protected readonly FilterControl Filter;
 
         private readonly Container content;
-        private readonly ProcessingOverlay processingOverlay;
+        private readonly LoadingLayer loadingLayer;
 
         [Resolved]
         private Bindable<Room> currentRoom { get; set; }
@@ -58,7 +58,7 @@ namespace osu.Game.Screens.Multi.Lounge
                                         Child = new RoomsContainer { JoinRequested = joinRequested }
                                     },
                                 },
-                                processingOverlay = new ProcessingOverlay(searchContainer),
+                                loadingLayer = new LoadingLayer(searchContainer),
                             }
                         },
                         new RoomInspector
@@ -126,12 +126,12 @@ namespace osu.Game.Screens.Multi.Lounge
 
         private void joinRequested(Room room)
         {
-            processingOverlay.Show();
+            loadingLayer.Show();
             RoomManager?.JoinRoom(room, r =>
             {
                 Open(room);
-                processingOverlay.Hide();
-            }, _ => processingOverlay.Hide());
+                loadingLayer.Hide();
+            }, _ => loadingLayer.Hide());
         }
 
         /// <summary>
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
index 8c005a2647..115ac5037a 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Screens.Multi.Match.Components
             public OsuSpriteText ErrorText;
 
             private OsuSpriteText typeLabel;
-            private ProcessingOverlay processingOverlay;
+            private LoadingLayer loadingLayer;
             private DrawableRoomPlaylist playlist;
 
             [Resolved(CanBeNull = true)]
@@ -307,7 +307,7 @@ namespace osu.Game.Screens.Multi.Match.Components
                             },
                         }
                     },
-                    processingOverlay = new ProcessingOverlay(dimContent)
+                    loadingLayer = new LoadingLayer(dimContent)
                 };
 
                 TypePicker.Current.BindValueChanged(type => typeLabel.Text = type.NewValue?.Name ?? string.Empty, true);
@@ -346,19 +346,19 @@ namespace osu.Game.Screens.Multi.Match.Components
 
                 manager?.CreateRoom(currentRoom.Value, onSuccess, onError);
 
-                processingOverlay.Show();
+                loadingLayer.Show();
             }
 
             private void hideError() => ErrorText.FadeOut(50);
 
-            private void onSuccess(Room room) => processingOverlay.Hide();
+            private void onSuccess(Room room) => loadingLayer.Hide();
 
             private void onError(string text)
             {
                 ErrorText.Text = text;
                 ErrorText.FadeIn(50);
 
-                processingOverlay.Hide();
+                loadingLayer.Hide();
             }
         }
 
diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 85b892336a..aebb8e9d87 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -7,7 +7,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using System.Linq;
 using osu.Game.Online.API;
 using osu.Framework.Threading;
@@ -17,6 +16,7 @@ using osu.Game.Screens.Select.Details;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API.Requests;
 using osu.Game.Rulesets;
 
@@ -35,7 +35,7 @@ namespace osu.Game.Screens.Select
         private readonly MetadataSection description, source, tags;
         private readonly Container failRetryContainer;
         private readonly FailRetryGraph failRetryGraph;
-        private readonly DimmedLoadingLayer loading;
+        private readonly LoadingLayer loading;
 
         [Resolved]
         private IAPIProvider api { get; set; }
@@ -63,6 +63,8 @@ namespace osu.Game.Screens.Select
 
         public BeatmapDetails()
         {
+            Container content;
+
             Children = new Drawable[]
             {
                 new Box
@@ -70,7 +72,7 @@ namespace osu.Game.Screens.Select
                     RelativeSizeAxes = Axes.Both,
                     Colour = Color4.Black.Opacity(0.5f),
                 },
-                new Container
+                content = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
                     Padding = new MarginPadding { Horizontal = spacing },
@@ -157,7 +159,7 @@ namespace osu.Game.Screens.Select
                         },
                     },
                 },
-                loading = new DimmedLoadingLayer(),
+                loading = new LoadingLayer(content),
             };
         }
 

From 92f6f0207cf3310efdd91242a26fa6e2cbf2205f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Feb 2020 15:33:31 +0900
Subject: [PATCH 0680/1142] Rename LoadingAnimation to LoadingSpinner

---
 .../Visual/Online/TestSceneOnlineViewContainer.cs      | 10 +++++-----
 .../Visual/UserInterface/TestSceneLoadingAnimation.cs  | 10 +++++-----
 .../Visual/UserInterface/TestSceneLoadingLayer.cs      |  2 +-
 osu.Game/Graphics/UserInterface/LoadingButton.cs       |  4 ++--
 osu.Game/Graphics/UserInterface/LoadingLayer.cs        |  2 +-
 .../{LoadingAnimation.cs => LoadingSpinner.cs}         |  4 ++--
 osu.Game/Online/Leaderboards/Leaderboard.cs            |  4 ++--
 osu.Game/Online/OnlineViewContainer.cs                 | 10 +++++-----
 osu.Game/Overlays/BeatmapSet/Header.cs                 |  6 +++---
 osu.Game/Overlays/ChatOverlay.cs                       |  4 ++--
 osu.Game/Overlays/Direct/PlayButton.cs                 |  8 ++++----
 .../Settings/Sections/General/LoginSettings.cs         |  2 +-
 osu.Game/Overlays/SocialOverlay.cs                     |  4 ++--
 osu.Game/Screens/Play/BeatmapMetadataDisplay.cs        |  4 ++--
 14 files changed, 37 insertions(+), 37 deletions(-)
 rename osu.Game/Graphics/UserInterface/{LoadingAnimation.cs => LoadingSpinner.cs} (96%)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
index 3c2735ca56..9591d53b24 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneOnlineViewContainer.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("set status to online", () => ((DummyAPIAccess)API).State = APIState.Online);
 
             AddUntilStep("children are visible", () => onlineView.ViewTarget.IsPresent);
-            AddUntilStep("loading animation is not visible", () => !onlineView.LoadingAnimation.IsPresent);
+            AddUntilStep("loading animation is not visible", () => !onlineView.LoadingSpinner.IsPresent);
         }
 
         [Test]
@@ -44,7 +44,7 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("set status to offline", () => ((DummyAPIAccess)API).State = APIState.Offline);
 
             AddUntilStep("children are not visible", () => !onlineView.ViewTarget.IsPresent);
-            AddUntilStep("loading animation is not visible", () => !onlineView.LoadingAnimation.IsPresent);
+            AddUntilStep("loading animation is not visible", () => !onlineView.LoadingSpinner.IsPresent);
         }
 
         [Test]
@@ -53,7 +53,7 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("set status to connecting", () => ((DummyAPIAccess)API).State = APIState.Connecting);
 
             AddUntilStep("children are not visible", () => !onlineView.ViewTarget.IsPresent);
-            AddUntilStep("loading animation is visible", () => onlineView.LoadingAnimation.IsPresent);
+            AddUntilStep("loading animation is visible", () => onlineView.LoadingSpinner.IsPresent);
         }
 
         [Test]
@@ -62,12 +62,12 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("set status to failing", () => ((DummyAPIAccess)API).State = APIState.Failing);
 
             AddUntilStep("children are not visible", () => !onlineView.ViewTarget.IsPresent);
-            AddUntilStep("loading animation is visible", () => onlineView.LoadingAnimation.IsPresent);
+            AddUntilStep("loading animation is visible", () => onlineView.LoadingSpinner.IsPresent);
         }
 
         private class TestOnlineViewContainer : OnlineViewContainer
         {
-            public new LoadingAnimation LoadingAnimation => base.LoadingAnimation;
+            public new LoadingSpinner LoadingSpinner => base.LoadingSpinner;
 
             public CompositeDrawable ViewTarget => base.Content;
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingAnimation.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingAnimation.cs
index b0233d35f9..cdb20b9935 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingAnimation.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingAnimation.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         public TestSceneLoadingAnimation()
             : base(2, 2)
         {
-            LoadingAnimation loading;
+            LoadingSpinner loading;
 
             Cell(0).AddRange(new Drawable[]
             {
@@ -22,7 +22,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                     Colour = Color4.Black,
                     RelativeSizeAxes = Axes.Both
                 },
-                loading = new LoadingAnimation()
+                loading = new LoadingSpinner()
             });
 
             loading.Show();
@@ -34,7 +34,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                     Colour = Color4.White,
                     RelativeSizeAxes = Axes.Both
                 },
-                loading = new LoadingAnimation()
+                loading = new LoadingSpinner()
             });
 
             loading.Show();
@@ -46,14 +46,14 @@ namespace osu.Game.Tests.Visual.UserInterface
                     Colour = Color4.Gray,
                     RelativeSizeAxes = Axes.Both
                 },
-                loading = new LoadingAnimation()
+                loading = new LoadingSpinner()
             });
 
             loading.Show();
 
             Cell(3).AddRange(new Drawable[]
             {
-                loading = new LoadingAnimation()
+                loading = new LoadingSpinner()
             });
 
             Scheduler.AddDelayed(() => loading.ToggleVisibility(), 200, true);
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs
index 0f49835742..4636c74ca9 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         private Drawable dimContent;
         private LoadingLayer overlay;
 
-        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(LoadingAnimation) };
+        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(LoadingSpinner) };
 
         [SetUp]
         public void SetUp() => Schedule(() =>
diff --git a/osu.Game/Graphics/UserInterface/LoadingButton.cs b/osu.Game/Graphics/UserInterface/LoadingButton.cs
index 49ec18ce8e..81dc023d7e 100644
--- a/osu.Game/Graphics/UserInterface/LoadingButton.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingButton.cs
@@ -40,14 +40,14 @@ namespace osu.Game.Graphics.UserInterface
             set => loading.Size = value;
         }
 
-        private readonly LoadingAnimation loading;
+        private readonly LoadingSpinner loading;
 
         protected LoadingButton()
         {
             AddRange(new[]
             {
                 CreateContent(),
-                loading = new LoadingAnimation
+                loading = new LoadingSpinner
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game/Graphics/UserInterface/LoadingLayer.cs b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
index a7b39c77fa..23906e76b9 100644
--- a/osu.Game/Graphics/UserInterface/LoadingLayer.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Graphics.UserInterface
     /// Also optionally dims target elements.
     /// Useful for disabling all elements in a form and showing we are waiting on a response, for instance.
     /// </summary>
-    public class LoadingLayer : LoadingAnimation
+    public class LoadingLayer : LoadingSpinner
     {
         private readonly Drawable dimTarget;
 
diff --git a/osu.Game/Graphics/UserInterface/LoadingAnimation.cs b/osu.Game/Graphics/UserInterface/LoadingSpinner.cs
similarity index 96%
rename from osu.Game/Graphics/UserInterface/LoadingAnimation.cs
rename to osu.Game/Graphics/UserInterface/LoadingSpinner.cs
index 265c93bce3..4f42d1d8c8 100644
--- a/osu.Game/Graphics/UserInterface/LoadingAnimation.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingSpinner.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Graphics.UserInterface
     /// <summary>
     /// A loading spinner.
     /// </summary>
-    public class LoadingAnimation : VisibilityContainer
+    public class LoadingSpinner : VisibilityContainer
     {
         private readonly SpriteIcon spinner;
 
@@ -27,7 +27,7 @@ namespace osu.Game.Graphics.UserInterface
         /// Constuct a new loading spinner.
         /// </summary>
         /// <param name="withBox"></param>
-        public LoadingAnimation(bool withBox = false)
+        public LoadingSpinner(bool withBox = false)
         {
             Size = new Vector2(60);
 
diff --git a/osu.Game/Online/Leaderboards/Leaderboard.cs b/osu.Game/Online/Leaderboards/Leaderboard.cs
index 71859d3aeb..e2a817aaff 100644
--- a/osu.Game/Online/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Online/Leaderboards/Leaderboard.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Online.Leaderboards
 
         private FillFlowContainer<LeaderboardScore> scrollFlow;
 
-        private readonly LoadingAnimation loading;
+        private readonly LoadingSpinner loading;
 
         private ScheduledDelegate showScoresDelegate;
         private CancellationTokenSource showScoresCancellationSource;
@@ -202,7 +202,7 @@ namespace osu.Game.Online.Leaderboards
                         }
                     },
                 },
-                loading = new LoadingAnimation(),
+                loading = new LoadingSpinner(),
                 placeholderContainer = new Container
                 {
                     RelativeSizeAxes = Axes.Both
diff --git a/osu.Game/Online/OnlineViewContainer.cs b/osu.Game/Online/OnlineViewContainer.cs
index 689c1c0afb..b52e3d9e3c 100644
--- a/osu.Game/Online/OnlineViewContainer.cs
+++ b/osu.Game/Online/OnlineViewContainer.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Online
     /// </summary>
     public abstract class OnlineViewContainer : Container, IOnlineComponent
     {
-        protected LoadingAnimation LoadingAnimation { get; private set; }
+        protected LoadingSpinner LoadingSpinner { get; private set; }
 
         protected override Container<Drawable> Content { get; } = new Container { RelativeSizeAxes = Axes.Both };
 
@@ -41,7 +41,7 @@ namespace osu.Game.Online
             {
                 Content,
                 placeholder = new LoginPlaceholder(placeholderMessage),
-                LoadingAnimation = new LoadingAnimation
+                LoadingSpinner = new LoadingSpinner
                 {
                     Alpha = 0,
                 }
@@ -63,19 +63,19 @@ namespace osu.Game.Online
                     PopContentOut(Content);
                     placeholder.ScaleTo(0.8f).Then().ScaleTo(1, 3 * transform_duration, Easing.OutQuint);
                     placeholder.FadeInFromZero(2 * transform_duration, Easing.OutQuint);
-                    LoadingAnimation.Hide();
+                    LoadingSpinner.Hide();
                     break;
 
                 case APIState.Online:
                     PopContentIn(Content);
                     placeholder.FadeOut(transform_duration / 2, Easing.OutQuint);
-                    LoadingAnimation.Hide();
+                    LoadingSpinner.Hide();
                     break;
 
                 case APIState.Failing:
                 case APIState.Connecting:
                     PopContentOut(Content);
-                    LoadingAnimation.Show();
+                    LoadingSpinner.Show();
                     placeholder.FadeOut(transform_duration / 2, Easing.OutQuint);
                     break;
             }
diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
index c1e9ce2008..29c259b7f8 100644
--- a/osu.Game/Overlays/BeatmapSet/Header.cs
+++ b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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;
@@ -45,7 +45,7 @@ namespace osu.Game.Overlays.BeatmapSet
 
         private readonly FavouriteButton favouriteButton;
         private readonly FillFlowContainer fadeContent;
-        private readonly LoadingAnimation loading;
+        private readonly LoadingSpinner loading;
         private readonly BeatmapSetHeader beatmapSetHeader;
 
         [Cached(typeof(IBindable<RulesetInfo>))]
@@ -179,7 +179,7 @@ namespace osu.Game.Overlays.BeatmapSet
                                     },
                                 }
                             },
-                            loading = new LoadingAnimation
+                            loading = new LoadingSpinner
                             {
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index bdc241a437..34afc3c431 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Overlays
 
         private readonly List<DrawableChannel> loadedChannels = new List<DrawableChannel>();
 
-        private LoadingAnimation loading;
+        private LoadingSpinner loading;
 
         private FocusedTextBox textbox;
 
@@ -146,7 +146,7 @@ namespace osu.Game.Overlays
                                         }
                                     }
                                 },
-                                loading = new LoadingAnimation(),
+                                loading = new LoadingSpinner(),
                             }
                         },
                         tabsArea = new TabsArea
diff --git a/osu.Game/Overlays/Direct/PlayButton.cs b/osu.Game/Overlays/Direct/PlayButton.cs
index 10abe15177..d9f335b6a7 100644
--- a/osu.Game/Overlays/Direct/PlayButton.cs
+++ b/osu.Game/Overlays/Direct/PlayButton.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Overlays.Direct
 
         private Color4 hoverColour;
         private readonly SpriteIcon icon;
-        private readonly LoadingAnimation loadingAnimation;
+        private readonly LoadingSpinner loadingSpinner;
 
         private const float transition_duration = 500;
 
@@ -53,12 +53,12 @@ namespace osu.Game.Overlays.Direct
                 if (value)
                 {
                     icon.FadeTo(0.5f, transition_duration, Easing.OutQuint);
-                    loadingAnimation.Show();
+                    loadingSpinner.Show();
                 }
                 else
                 {
                     icon.FadeTo(1, transition_duration, Easing.OutQuint);
-                    loadingAnimation.Hide();
+                    loadingSpinner.Hide();
                 }
             }
         }
@@ -76,7 +76,7 @@ namespace osu.Game.Overlays.Direct
                     RelativeSizeAxes = Axes.Both,
                     Icon = FontAwesome.Solid.Play,
                 },
-                loadingAnimation = new LoadingAnimation
+                loadingSpinner = new LoadingSpinner
                 {
                     Size = new Vector2(15),
                 },
diff --git a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
index c55183772b..bf0e073350 100644
--- a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
 
                     Children = new Drawable[]
                     {
-                        new LoadingAnimation
+                        new LoadingSpinner
                         {
                             State = { Value = Visibility.Visible },
                             Anchor = Anchor.TopCentre,
diff --git a/osu.Game/Overlays/SocialOverlay.cs b/osu.Game/Overlays/SocialOverlay.cs
index 9a523bc1bc..54c978738d 100644
--- a/osu.Game/Overlays/SocialOverlay.cs
+++ b/osu.Game/Overlays/SocialOverlay.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Overlays
 {
     public class SocialOverlay : SearchableListOverlay<SocialTab, SocialSortCriteria, SortDirection>
     {
-        private readonly LoadingAnimation loading;
+        private readonly LoadingSpinner loading;
         private FillFlowContainer<SocialPanel> panels;
 
         protected override Color4 BackgroundColour => OsuColour.FromHex(@"60284b");
@@ -54,7 +54,7 @@ namespace osu.Game.Overlays
         public SocialOverlay()
             : base(OverlayColourScheme.Pink)
         {
-            Add(loading = new LoadingAnimation());
+            Add(loading = new LoadingSpinner());
 
             Filter.Search.Current.ValueChanged += text =>
             {
diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index 074341226e..77ee52f23e 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Screens.Play
         private readonly WorkingBeatmap beatmap;
         private readonly Bindable<IReadOnlyList<Mod>> mods;
         private readonly Drawable facade;
-        private LoadingAnimation loading;
+        private LoadingSpinner loading;
         private Sprite backgroundSprite;
 
         public IBindable<IReadOnlyList<Mod>> Mods => mods;
@@ -138,7 +138,7 @@ namespace osu.Game.Screens.Play
                                     Anchor = Anchor.Centre,
                                     FillMode = FillMode.Fill,
                                 },
-                                loading = new LoadingAnimation { Scale = new Vector2(1.3f) }
+                                loading = new LoadingSpinner { Scale = new Vector2(1.3f) }
                             }
                         },
                         new OsuSpriteText

From b94f937f7e122bc6a962b591a642dc53af757130 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Feb 2020 15:35:40 +0900
Subject: [PATCH 0681/1142] Fill in missing xmldoc

---
 osu.Game/Graphics/UserInterface/LoadingLayer.cs   | 7 ++++++-
 osu.Game/Graphics/UserInterface/LoadingSpinner.cs | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/LoadingLayer.cs b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
index 23906e76b9..f1d347138f 100644
--- a/osu.Game/Graphics/UserInterface/LoadingLayer.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
@@ -11,7 +11,7 @@ using osuTK.Graphics;
 namespace osu.Game.Graphics.UserInterface
 {
     /// <summary>
-    /// An overlay that will show a loading overlay and completely block input to an area.
+    /// A layer that will show a loading spinner and completely block input to an area.
     /// Also optionally dims target elements.
     /// Useful for disabling all elements in a form and showing we are waiting on a response, for instance.
     /// </summary>
@@ -19,6 +19,11 @@ namespace osu.Game.Graphics.UserInterface
     {
         private readonly Drawable dimTarget;
 
+        /// <summary>
+        /// Constuct a new loading spinner.
+        /// </summary>
+        /// <param name="dimTarget">An optional target to dim when displayed.</param>
+        /// <param name="withBox">Whether the spinner should have a surrounding black box for visibility.</param>
         public LoadingLayer(Drawable dimTarget = null, bool withBox = true)
             : base(withBox)
         {
diff --git a/osu.Game/Graphics/UserInterface/LoadingSpinner.cs b/osu.Game/Graphics/UserInterface/LoadingSpinner.cs
index 4f42d1d8c8..b5a235f9d8 100644
--- a/osu.Game/Graphics/UserInterface/LoadingSpinner.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingSpinner.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Graphics.UserInterface
         /// <summary>
         /// Constuct a new loading spinner.
         /// </summary>
-        /// <param name="withBox"></param>
+        /// <param name="withBox">Whether the spinner should have a surrounding black box for visibility.</param>
         public LoadingSpinner(bool withBox = false)
         {
             Size = new Vector2(60);

From dacbbb5eeefff51ea7915cf60ef5b93ec3c589cd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Feb 2020 16:11:09 +0900
Subject: [PATCH 0682/1142] Add a maximum size to ensure things don't get out
 of hand

---
 osu.Game/Graphics/UserInterface/LoadingLayer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/LoadingLayer.cs b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
index f1d347138f..4fdc95f483 100644
--- a/osu.Game/Graphics/UserInterface/LoadingLayer.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Graphics.UserInterface
         protected override void Update()
         {
             base.Update();
-            MainContents.Size = new Vector2(Math.Min(DrawWidth, DrawHeight) * 0.25f);
+            MainContents.Size = new Vector2(Math.Min(100, Math.Min(DrawWidth, DrawHeight) * 0.25f));
         }
 
         protected override void Dispose(bool isDisposing)

From 2bda310fa735c66d52baebef2b4233ba743c7db3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Feb 2020 16:13:24 +0900
Subject: [PATCH 0683/1142] Use new loading layer in beatmap listing overlay

---
 osu.Game/Overlays/BeatmapListingOverlay.cs | 24 +++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index 213e9a4244..5bac5a5402 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -15,6 +15,7 @@ using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API.Requests;
 using osu.Game.Overlays.BeatmapListing;
 using osu.Game.Overlays.Direct;
@@ -34,7 +35,6 @@ namespace osu.Game.Overlays
 
         private SearchBeatmapSetsRequest getSetsRequest;
 
-        private Container panelsPlaceholder;
         private Drawable currentContent;
         private BeatmapListingSearchSection searchSection;
         private BeatmapListingSortTabControl sortControl;
@@ -121,12 +121,21 @@ namespace osu.Game.Overlays
                                                     }
                                                 }
                                             },
-                                            panelsPlaceholder = new Container
+                                            new Container
                                             {
                                                 AutoSizeAxes = Axes.Y,
                                                 RelativeSizeAxes = Axes.X,
                                                 Padding = new MarginPadding { Horizontal = 20 },
-                                            }
+                                                Children = new Drawable[]
+                                                {
+                                                    panelTarget = new Container
+                                                    {
+                                                        AutoSizeAxes = Axes.Y,
+                                                        RelativeSizeAxes = Axes.X,
+                                                    },
+                                                    loadingLayer = new LoadingLayer(panelTarget),
+                                                }
+                                            },
                                         }
                                     }
                                 }
@@ -160,6 +169,9 @@ namespace osu.Game.Overlays
 
         private ScheduledDelegate queryChangedDebounce;
 
+        private LoadingLayer loadingLayer;
+        private Container panelTarget;
+
         private void queueUpdateSearch(bool queryTextChanged = false)
         {
             getSetsRequest?.Cancel();
@@ -181,7 +193,7 @@ namespace osu.Game.Overlays
 
             previewTrackManager.StopAnyPlaying(this);
 
-            currentContent?.FadeColour(Color4.DimGray, 400, Easing.OutQuint);
+            loadingLayer.Show();
 
             getSetsRequest = new SearchBeatmapSetsRequest(
                 searchSection.Query.Value,
@@ -229,6 +241,8 @@ namespace osu.Game.Overlays
 
         private void addContentToPlaceholder(Drawable content)
         {
+            loadingLayer.Hide();
+
             Drawable lastContent = currentContent;
 
             if (lastContent != null)
@@ -242,7 +256,7 @@ namespace osu.Game.Overlays
                 lastContent.Delay(25).Schedule(() => lastContent.BypassAutoSizeAxes = Axes.Y);
             }
 
-            panelsPlaceholder.Add(currentContent = content);
+            panelTarget.Add(currentContent = content);
             currentContent.FadeIn(200, Easing.OutQuint);
         }
 

From 38d9a46ffb854f1540177d636a1c1a2e8a824166 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Feb 2020 16:20:17 +0900
Subject: [PATCH 0684/1142] Add test for relative sizing scenarios

---
 .../UserInterface/TestSceneLoadingLayer.cs    | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs
index 4636c74ca9..7e9654715b 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs
@@ -21,12 +21,14 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(LoadingSpinner) };
 
+        private Container content;
+
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
             Children = new[]
             {
-                new Container
+                content = new Container
                 {
                     Size = new Vector2(300),
                     Anchor = Anchor.Centre,
@@ -60,7 +62,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         });
 
         [Test]
-        public void ShowHide()
+        public void TestShowHide()
         {
             AddAssert("not visible", () => !overlay.IsPresent);
 
@@ -74,7 +76,7 @@ namespace osu.Game.Tests.Visual.UserInterface
         }
 
         [Test]
-        public void ContentRestoreOnDispose()
+        public void TestContentRestoreOnDispose()
         {
             AddAssert("not visible", () => !overlay.IsPresent);
 
@@ -82,9 +84,23 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             AddUntilStep("wait for content dim", () => dimContent.Colour != Color4.White);
 
-            AddStep("hide", () => overlay.Expire());
+            AddStep("expire", () => overlay.Expire());
 
             AddUntilStep("wait for content restore", () => dimContent.Colour == Color4.White);
         }
+
+        [Test]
+        public void TestLargeArea()
+        {
+            AddStep("show", () =>
+            {
+                content.RelativeSizeAxes = Axes.Both;
+                content.Size = new Vector2(1);
+
+                overlay.Show();
+            });
+
+            AddStep("hide", () => overlay.Hide());
+        }
     }
 }

From bbac95958cc26ff36f6772cc3cb02bc79a066eec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Feb 2020 16:20:55 +0900
Subject: [PATCH 0685/1142] Fix incorrect test scene name

---
 ...estSceneLoadingAnimation.cs => TestSceneLoadingSpinner.cs} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename osu.Game.Tests/Visual/UserInterface/{TestSceneLoadingAnimation.cs => TestSceneLoadingSpinner.cs} (93%)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingAnimation.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingSpinner.cs
similarity index 93%
rename from osu.Game.Tests/Visual/UserInterface/TestSceneLoadingAnimation.cs
rename to osu.Game.Tests/Visual/UserInterface/TestSceneLoadingSpinner.cs
index cdb20b9935..45d846a825 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingAnimation.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingSpinner.cs
@@ -8,9 +8,9 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
-    public class TestSceneLoadingAnimation : OsuGridTestScene
+    public class TestSceneLoadingSpinner : OsuGridTestScene
     {
-        public TestSceneLoadingAnimation()
+        public TestSceneLoadingSpinner()
             : base(2, 2)
         {
             LoadingSpinner loading;

From 7d145a74704d61a1a44360cac41cd20be0180495 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Feb 2020 16:21:44 +0900
Subject: [PATCH 0686/1142] Add test for loading spinner with box

---
 osu.Game.Tests/Visual/UserInterface/TestSceneLoadingSpinner.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingSpinner.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingSpinner.cs
index 45d846a825..47f5bdfe17 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingSpinner.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingSpinner.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                     Colour = Color4.White,
                     RelativeSizeAxes = Axes.Both
                 },
-                loading = new LoadingSpinner()
+                loading = new LoadingSpinner(true)
             });
 
             loading.Show();

From e7ac37715f0d1ca9f16f271558811ccd2ee187f8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Feb 2020 16:31:16 +0900
Subject: [PATCH 0687/1142] Don't handle non-positional input

---
 osu.Game/Graphics/UserInterface/LoadingLayer.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Graphics/UserInterface/LoadingLayer.cs b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
index 4fdc95f483..25a62acaba 100644
--- a/osu.Game/Graphics/UserInterface/LoadingLayer.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
@@ -35,6 +35,8 @@ namespace osu.Game.Graphics.UserInterface
             MainContents.RelativeSizeAxes = Axes.None;
         }
 
+        public override bool HandleNonPositionalInput => false;
+
         protected override bool Handle(UIEvent e)
         {
             switch (e)

From 37e295e4beb5008af9ad5b7139f41ab20fa15959 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 Feb 2020 17:02:48 +0900
Subject: [PATCH 0688/1142] Refactor orphaning to better follow osu-web
 specification

---
 .../Online/API/Requests/Responses/Comment.cs  |   3 -
 osu.Game/Overlays/Comments/CommentsPage.cs    | 105 ++++++++----------
 2 files changed, 47 insertions(+), 61 deletions(-)

diff --git a/osu.Game/Online/API/Requests/Responses/Comment.cs b/osu.Game/Online/API/Requests/Responses/Comment.cs
index 03ed8916e2..05a24cec0e 100644
--- a/osu.Game/Online/API/Requests/Responses/Comment.cs
+++ b/osu.Game/Online/API/Requests/Responses/Comment.cs
@@ -4,7 +4,6 @@
 using Newtonsoft.Json;
 using osu.Game.Users;
 using System;
-using System.Collections.Generic;
 
 namespace osu.Game.Online.API.Requests.Responses
 {
@@ -16,8 +15,6 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty(@"parent_id")]
         public long? ParentId { get; set; }
 
-        public readonly List<Comment> ChildComments = new List<Comment>();
-
         public Comment ParentComment { get; set; }
 
         [JsonProperty(@"user_id")]
diff --git a/osu.Game/Overlays/Comments/CommentsPage.cs b/osu.Game/Overlays/Comments/CommentsPage.cs
index 43a223be8b..9255a39c22 100644
--- a/osu.Game/Overlays/Comments/CommentsPage.cs
+++ b/osu.Game/Overlays/Comments/CommentsPage.cs
@@ -12,6 +12,7 @@ using System.Linq;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API;
 using System.Collections.Generic;
+using JetBrains.Annotations;
 
 namespace osu.Game.Overlays.Comments
 {
@@ -60,87 +61,75 @@ namespace osu.Game.Overlays.Comments
                 return;
             }
 
-            createBaseTree(commentBundle.Comments);
+            appendComments(null, commentBundle);
         }
 
-        private readonly Dictionary<long, Comment> nodeDictionary = new Dictionary<long, Comment>();
+        private readonly Dictionary<long, DrawableComment> commentDictionary = new Dictionary<long, DrawableComment>();
 
-        private void createBaseTree(List<Comment> comments)
+        /// <summary>
+        /// Appends retrieved comments to the subtree rooted at a parenting <see cref="DrawableComment"/>.
+        /// </summary>
+        /// <param name="parent">The parenting <see cref="DrawableComment"/>.</param>
+        /// <param name="bundle">The bundle of comments to add.</param>
+        private void appendComments([CanBeNull] DrawableComment parent, [NotNull] CommentBundle bundle)
         {
-            var topLevelNodes = new List<Comment>();
-            var orphanedNodes = new List<Comment>();
+            var orphaned = new List<Comment>();
 
-            foreach (var comment in comments)
+            foreach (var topLevel in bundle.Comments)
+                add(topLevel);
+
+            foreach (var child in bundle.IncludedComments)
+                add(child);
+
+            // Comments whose parents did not previously have corresponding drawables, are now guaranteed that their parents have corresponding drawables.
+            foreach (var o in orphaned)
+                add(o);
+
+            void add(Comment comment)
             {
-                nodeDictionary.Add(comment.Id, comment);
+                var drawableComment = getDrawableComment(comment);
 
-                if (comment.IsTopLevel)
-                    topLevelNodes.Add(comment);
-
-                var orphanedNodesCopy = new List<Comment>(orphanedNodes);
-
-                foreach (var orphan in orphanedNodesCopy)
+                if (comment.ParentId == null)
                 {
-                    if (orphan.ParentId == comment.Id)
-                    {
-                        comment.ChildComments.Add(orphan);
-                        orphanedNodes.Remove(orphan);
-                    }
+                    // Comment that has no parent is added as a top-level comment to the flow.
+                    flow.Add(drawableComment);
+                }
+                else if (commentDictionary.TryGetValue(comment.ParentId.Value, out var parentDrawable))
+                {
+                    // The comment's parent already has a corresponding drawable.
+                    parentDrawable.Replies.Add(drawableComment);
                 }
-
-                // No need to find parent for top-level comment
-                if (!comment.ParentId.HasValue)
-                    continue;
-
-                if (nodeDictionary.ContainsKey(comment.ParentId.Value))
-                    nodeDictionary[comment.ParentId.Value].ChildComments.Add(comment);
                 else
-                    orphanedNodes.Add(comment);
+                {
+                    // The comment's parent does not have a corresponding drawable yet, so keep it as orphaned for the time being.
+                    // Note that this comment's corresponding drawable has already been created by this point, so future children will be able to be added without being orphaned themselves.
+                    orphaned.Add(comment);
+                }
             }
-
-            foreach (var comment in topLevelNodes)
-                flow.Add(createCommentWithReplies(comment));
         }
 
-        private DrawableComment createCommentWithReplies(Comment comment)
+        private DrawableComment getDrawableComment(Comment comment)
         {
-            if (comment.ParentId.HasValue)
-                comment.ParentComment = nodeDictionary[comment.ParentId.Value];
+            if (commentDictionary.TryGetValue(comment.Id, out var existing))
+                return existing;
 
-            var drawableComment = createDrawableComment(comment);
-
-            var replies = comment.ChildComments;
-
-            if (replies.Any())
-                drawableComment.Replies.AddRange(replies.Select(createCommentWithReplies));
-
-            return drawableComment;
+            return commentDictionary[comment.Id] = new DrawableComment(comment)
+            {
+                ShowDeleted = { BindTarget = ShowDeleted },
+                Sort = { BindTarget = Sort },
+                RepliesRequested = onCommentRepliesRequested
+            };
         }
 
         private void onCommentRepliesRequested(DrawableComment drawableComment, int page)
         {
             var request = new GetCommentRepliesRequest(drawableComment.Comment.Id, Type.Value, CommentableId.Value, Sort.Value, page);
-            request.Success += response => onCommentRepliesReceived(response, drawableComment);
+
+            request.Success += response => Schedule(() => appendComments(drawableComment, response));
+
             api.PerformAsync(request);
         }
 
-        private void onCommentRepliesReceived(CommentBundle response, DrawableComment drawableComment)
-        {
-            // We may receive already loaded comments
-            var uniqueComments = response.Comments.Where(c => !drawableComment.ContainsReply(c.Id)).ToList();
-
-            uniqueComments.ForEach(c => c.ParentComment = drawableComment.Comment);
-
-            drawableComment.Replies.AddRange(uniqueComments.Select(createDrawableComment));
-        }
-
-        private DrawableComment createDrawableComment(Comment comment) => new DrawableComment(comment)
-        {
-            ShowDeleted = { BindTarget = ShowDeleted },
-            Sort = { BindTarget = Sort },
-            RepliesRequested = onCommentRepliesRequested
-        };
-
         private class NoCommentsPlaceholder : CompositeDrawable
         {
             [BackgroundDependencyLoader]

From 00b4fc1e1f66e66b4d77bebd11f524664ee9d341 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Feb 2020 17:38:23 +0900
Subject: [PATCH 0689/1142] Add fill to default skin slider ball when tracking

---
 .../Objects/Drawables/Pieces/SliderBall.cs       | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
index 0dc5c9b4a0..c871089acd 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -214,9 +215,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 
         public class DefaultSliderBall : CompositeDrawable
         {
+            private Box box;
+
             [BackgroundDependencyLoader]
             private void load(DrawableHitObject drawableObject, ISkinSource skin)
             {
+                var slider = (DrawableSlider)drawableObject;
+
                 RelativeSizeAxes = Axes.Both;
 
                 float radius = skin.GetConfig<OsuSkinConfiguration, float>(OsuSkinConfiguration.SliderPathRadius)?.Value ?? OsuHitObject.OBJECT_RADIUS;
@@ -231,14 +236,21 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                     BorderThickness = 10,
                     BorderColour = Color4.White,
                     Alpha = 1,
-                    Child = new Box
+                    Child = box = new Box
                     {
+                        Blending = BlendingParameters.Additive,
                         RelativeSizeAxes = Axes.Both,
                         Colour = Color4.White,
-                        Alpha = 0.4f,
+                        AlwaysPresent = true,
+                        Alpha = 0
                     }
                 };
+
+                slider.Tracking.BindValueChanged(trackingChanged, true);
             }
+
+            private void trackingChanged(ValueChangedEvent<bool> tracking) =>
+                box.FadeTo(tracking.NewValue ? 0.6f : 0.05f, 200, Easing.OutQuint);
         }
     }
 }

From a55b2b89184cb505151ca258307611440f05ec1e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Feb 2020 18:09:50 +0900
Subject: [PATCH 0690/1142] Add explosion effect when catching fruit

---
 .../TestSceneCatcherArea.cs                   |   9 ++
 .../TestSceneFruitObjects.cs                  |   9 +-
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs     | 116 ++++++++++++++++++
 3 files changed, 128 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index 83ea6359c2..df1ac4c725 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -8,7 +8,10 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Tests.Visual;
 
@@ -30,6 +33,10 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddToggleStep("Hyperdash", t =>
                 CreatedDrawables.OfType<CatchInputManager>().Select(i => i.Child)
                                 .OfType<TestCatcherArea>().ForEach(c => c.ToggleHyperDash(t)));
+
+            AddRepeatStep("catch fruit", () =>
+                this.ChildrenOfType<CatcherArea>().ForEach(area =>
+                    area.MovableCatcher.PlaceOnPlate(new DrawableFruit(new TestSceneFruitObjects.TestCatchFruit(FruitVisualRepresentation.Grape)))), 20);
         }
 
         private void createCatcher(float size)
@@ -58,6 +65,8 @@ namespace osu.Game.Rulesets.Catch.Tests
             {
             }
 
+            public new Catcher MovableCatcher => base.MovableCatcher;
+
             public void ToggleHyperDash(bool status) => MovableCatcher.SetHyperDashState(status ? 2 : 1);
         }
     }
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
index 47b4258ad9..7bade41e6c 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
@@ -84,11 +84,7 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         private Drawable createDrawable(FruitVisualRepresentation rep)
         {
-            Fruit fruit = new TestCatchFruit(rep)
-            {
-                StartTime = 1000000000000,
-                Scale = 1.5f,
-            };
+            Fruit fruit = new TestCatchFruit(rep) { Scale = 1.5f };
 
             return new DrawableFruit(fruit)
             {
@@ -101,11 +97,12 @@ namespace osu.Game.Rulesets.Catch.Tests
             };
         }
 
-        private class TestCatchFruit : Fruit
+        public class TestCatchFruit : Fruit
         {
             public TestCatchFruit(FruitVisualRepresentation rep)
             {
                 VisualRepresentation = rep;
+                StartTime = 1000000000000;
             }
 
             public override FruitVisualRepresentation VisualRepresentation { get; }
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index fae928e168..ff2471f8bf 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -4,8 +4,10 @@
 using System;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
@@ -240,6 +242,12 @@ namespace osu.Game.Rulesets.Catch.UI
                 fruit.X = Math.Clamp(fruit.X, -CATCHER_SIZE / 2, CATCHER_SIZE / 2);
 
                 caughtFruit.Add(fruit);
+
+                Add(new HitExplosion(fruit)
+                {
+                    X = fruit.X,
+                    Scale = new Vector2(fruit.HitObject.Scale)
+                });
             }
 
             /// <summary>
@@ -465,4 +473,112 @@ namespace osu.Game.Rulesets.Catch.UI
             }
         }
     }
+
+    public class HitExplosion : CompositeDrawable
+    {
+        private readonly CircularContainer largeFaint;
+
+        public HitExplosion(DrawableCatchHitObject fruit)
+        {
+            Size = new Vector2(20);
+            Anchor = Anchor.TopCentre;
+            Origin = Anchor.BottomCentre;
+
+            Color4 objectColour = fruit.AccentColour.Value;
+
+            // scale roughly in-line with visual appearance of notes
+
+            const float angle_variangle = 15; // should be less than 45
+
+            const float roundness = 100;
+
+            const float initial_height = 10;
+
+            var colour = Interpolation.ValueAt(0.4f, objectColour, Color4.White, 0, 1);
+
+            InternalChildren = new Drawable[]
+            {
+                largeFaint = new CircularContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    // we want our size to be very small so the glow dominates it.
+                    Size = new Vector2(0.8f),
+                    Blending = BlendingParameters.Additive,
+                    EdgeEffect = new EdgeEffectParameters
+                    {
+                        Type = EdgeEffectType.Glow,
+                        Colour = Interpolation.ValueAt(0.1f, objectColour, Color4.White, 0, 1).Opacity(0.3f),
+                        Roundness = 160,
+                        Radius = 200,
+                    },
+                },
+                new CircularContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    Blending = BlendingParameters.Additive,
+                    EdgeEffect = new EdgeEffectParameters
+                    {
+                        Type = EdgeEffectType.Glow,
+                        Colour = Interpolation.ValueAt(0.6f, objectColour, Color4.White, 0, 1),
+                        Roundness = 20,
+                        Radius = 50,
+                    },
+                },
+                new CircularContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    Size = new Vector2(0.01f, initial_height),
+                    Blending = BlendingParameters.Additive,
+                    Rotation = RNG.NextSingle(-angle_variangle, angle_variangle),
+                    EdgeEffect = new EdgeEffectParameters
+                    {
+                        Type = EdgeEffectType.Glow,
+                        Colour = colour,
+                        Roundness = roundness,
+                        Radius = 40,
+                    },
+                },
+                new CircularContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    Size = new Vector2(0.01f, initial_height),
+                    Blending = BlendingParameters.Additive,
+                    Rotation = RNG.NextSingle(-angle_variangle, angle_variangle),
+                    EdgeEffect = new EdgeEffectParameters
+                    {
+                        Type = EdgeEffectType.Glow,
+                        Colour = colour,
+                        Roundness = roundness,
+                        Radius = 40,
+                    },
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            const double duration = 400;
+
+            largeFaint
+                .ResizeTo(largeFaint.Size * new Vector2(5, 1), duration, Easing.OutQuint)
+                .FadeOut(duration * 2);
+
+            this.FadeInFromZero(50).Then().FadeOut(duration, Easing.Out);
+            Expire(true);
+        }
+    }
 }

From 514160e4bb48e5f9d4d06822ab15d18b139bb0c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Feb 2020 18:38:25 +0900
Subject: [PATCH 0691/1142] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 1774ea0bb4..939d179b1d 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -54,6 +54,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.221.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.218.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.221.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index c034fb6567..24ee25c4de 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.221.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.218.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.221.0" />
     <PackageReference Include="Sentry" Version="2.0.3" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 7f99338c6e..3743138c1a 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -74,7 +74,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.221.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.218.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.221.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
@@ -82,7 +82,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.218.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.221.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 81f9103f9cfdc0a67adfc3f2635519d5b6c5a6ac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Feb 2020 18:54:48 +0900
Subject: [PATCH 0692/1142] Bind with global ruleset for now

---
 osu.Game/Overlays/RankingsOverlay.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index 404f896cad..4e0b644d16 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -23,8 +23,6 @@ namespace osu.Game.Overlays
 
         protected Bindable<RankingsScope> Scope => header.Current;
 
-        private Bindable<RulesetInfo> ruleset => header.Ruleset;
-
         private readonly BasicScrollContainer scrollFlow;
         private readonly Container contentContainer;
         private readonly DimmedLoadingLayer loading;
@@ -92,10 +90,15 @@ namespace osu.Game.Overlays
             background.Colour = ColourProvider.Background5;
         }
 
+        [Resolved]
+        private Bindable<RulesetInfo> ruleset { get; set; }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
+            header.Ruleset.BindTo(ruleset);
+
             Country.BindValueChanged(_ =>
             {
                 // if a country is requested, force performance scope.
@@ -121,6 +124,8 @@ namespace osu.Game.Overlays
 
                 Scheduler.AddOnce(loadNewContent);
             });
+
+            Scheduler.AddOnce(loadNewContent);
         }
 
         public void ShowCountry(Country requested)
@@ -130,7 +135,7 @@ namespace osu.Game.Overlays
 
             Show();
 
-            Schedule(() => Country.Value = requested);
+            Country.Value = requested;
         }
 
         private void loadNewContent()

From f9d7e7c6b89dc1335f2a260d4004ae890e218ef8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 21 Feb 2020 19:16:08 +0900
Subject: [PATCH 0693/1142] Add simple updater support for linux AppImages

---
 osu.Game/Updater/SimpleUpdateManager.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Updater/SimpleUpdateManager.cs b/osu.Game/Updater/SimpleUpdateManager.cs
index e490ac14e9..1e8a96444f 100644
--- a/osu.Game/Updater/SimpleUpdateManager.cs
+++ b/osu.Game/Updater/SimpleUpdateManager.cs
@@ -78,6 +78,10 @@ namespace osu.Game.Updater
                     bestAsset = release.Assets?.Find(f => f.Name.EndsWith(".app.zip"));
                     break;
 
+                case RuntimeInfo.Platform.Linux:
+                    bestAsset = release.Assets?.Find(f => f.Name.EndsWith(".AppImage"));
+                    break;
+
                 case RuntimeInfo.Platform.Android:
                     // on our testing device this causes the download to magically disappear.
                     //bestAsset = release.Assets?.Find(f => f.Name.EndsWith(".apk"));

From 957b33b141b8d64aee4f28cfafe469ab0caf4aab Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 Feb 2020 18:41:03 +0900
Subject: [PATCH 0694/1142] Fix included comment properties not being set
 correctly

---
 .../Online/API/Requests/Responses/CommentBundle.cs     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/osu.Game/Online/API/Requests/Responses/CommentBundle.cs b/osu.Game/Online/API/Requests/Responses/CommentBundle.cs
index f4c81bf66f..d76ede67cd 100644
--- a/osu.Game/Online/API/Requests/Responses/CommentBundle.cs
+++ b/osu.Game/Online/API/Requests/Responses/CommentBundle.cs
@@ -35,6 +35,7 @@ namespace osu.Game.Online.API.Requests.Responses
                 userVotes = value;
 
                 Comments.ForEach(c => c.IsVoted = value.Contains(c.Id));
+                IncludedComments.ForEach(c => c.IsVoted = value.Contains(c.Id));
             }
         }
 
@@ -58,6 +59,15 @@ namespace osu.Game.Online.API.Requests.Responses
                         if (c.EditedById == u.Id)
                             c.EditedUser = u;
                     });
+
+                    IncludedComments.ForEach(c =>
+                    {
+                        if (c.UserId == u.Id)
+                            c.User = u;
+
+                        if (c.EditedById == u.Id)
+                            c.EditedUser = u;
+                    });
                 });
             }
         }

From db78b9522814b09753bd5e6a1419f852e83eee63 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 Feb 2020 18:42:11 +0900
Subject: [PATCH 0695/1142] Remove duplicated api request

---
 .../API/Requests/GetCommentRepliesRequest.cs  | 45 -------------------
 .../Online/API/Requests/GetCommentsRequest.cs | 17 ++++---
 .../Overlays/Comments/CommentsContainer.cs    |  2 +-
 osu.Game/Overlays/Comments/CommentsPage.cs    |  2 +-
 4 files changed, 13 insertions(+), 53 deletions(-)
 delete mode 100644 osu.Game/Online/API/Requests/GetCommentRepliesRequest.cs

diff --git a/osu.Game/Online/API/Requests/GetCommentRepliesRequest.cs b/osu.Game/Online/API/Requests/GetCommentRepliesRequest.cs
deleted file mode 100644
index 203f5d5635..0000000000
--- a/osu.Game/Online/API/Requests/GetCommentRepliesRequest.cs
+++ /dev/null
@@ -1,45 +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 Humanizer;
-using osu.Framework.IO.Network;
-using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Overlays.Comments;
-
-namespace osu.Game.Online.API.Requests
-{
-    public class GetCommentRepliesRequest : APIRequest<CommentBundle>
-    {
-        private readonly long commentId;
-        private readonly CommentableType commentableType;
-        private readonly long commentableId;
-        private readonly int page;
-        private readonly CommentsSortCriteria sort;
-
-        public GetCommentRepliesRequest(long commentId, CommentableType commentableType, long commentableId, CommentsSortCriteria sort, int page)
-        {
-            this.commentId = commentId;
-            this.page = page;
-            this.sort = sort;
-
-            // These parameters are necessary to get deleted comments
-            this.commentableType = commentableType;
-            this.commentableId = commentableId;
-        }
-
-        protected override WebRequest CreateWebRequest()
-        {
-            var req = base.CreateWebRequest();
-
-            req.AddParameter("parent_id", commentId.ToString());
-            req.AddParameter("sort", sort.ToString().ToLowerInvariant());
-            req.AddParameter("commentable_type", commentableType.ToString().Underscore().ToLowerInvariant());
-            req.AddParameter("commentable_id", commentableId.ToString());
-            req.AddParameter("page", page.ToString());
-
-            return req;
-        }
-
-        protected override string Target => "comments";
-    }
-}
diff --git a/osu.Game/Online/API/Requests/GetCommentsRequest.cs b/osu.Game/Online/API/Requests/GetCommentsRequest.cs
index 7763501860..24dae4adf1 100644
--- a/osu.Game/Online/API/Requests/GetCommentsRequest.cs
+++ b/osu.Game/Online/API/Requests/GetCommentsRequest.cs
@@ -10,27 +10,32 @@ namespace osu.Game.Online.API.Requests
 {
     public class GetCommentsRequest : APIRequest<CommentBundle>
     {
-        private readonly long id;
-        private readonly int page;
+        private readonly long commentableId;
         private readonly CommentableType type;
         private readonly CommentsSortCriteria sort;
+        private readonly int page;
+        private readonly long? parentId;
 
-        public GetCommentsRequest(CommentableType type, long id, CommentsSortCriteria sort = CommentsSortCriteria.New, int page = 1)
+        public GetCommentsRequest(long commentableId, CommentableType type, CommentsSortCriteria sort = CommentsSortCriteria.New, int page = 1, long? parentId = null)
         {
+            this.commentableId = commentableId;
             this.type = type;
             this.sort = sort;
-            this.id = id;
             this.page = page;
+            this.parentId = parentId;
         }
 
         protected override WebRequest CreateWebRequest()
         {
             var req = base.CreateWebRequest();
 
+            req.AddParameter("commentable_id", commentableId.ToString());
             req.AddParameter("commentable_type", type.ToString().Underscore().ToLowerInvariant());
-            req.AddParameter("commentable_id", id.ToString());
-            req.AddParameter("sort", sort.ToString().ToLowerInvariant());
             req.AddParameter("page", page.ToString());
+            req.AddParameter("sort", sort.ToString().ToLowerInvariant());
+
+            if (parentId != null)
+                req.AddParameter("parent_id", parentId.ToString());
 
             return req;
         }
diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index 751fd8a353..5a04f6b4c4 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -152,7 +152,7 @@ namespace osu.Game.Overlays.Comments
 
             request?.Cancel();
             loadCancellation?.Cancel();
-            request = new GetCommentsRequest(type.Value, id.Value, Sort.Value, currentPage++);
+            request = new GetCommentsRequest(id.Value, type.Value, Sort.Value, currentPage++, 0);
             request.Success += onSuccess;
             api.PerformAsync(request);
         }
diff --git a/osu.Game/Overlays/Comments/CommentsPage.cs b/osu.Game/Overlays/Comments/CommentsPage.cs
index 9255a39c22..2715ea791b 100644
--- a/osu.Game/Overlays/Comments/CommentsPage.cs
+++ b/osu.Game/Overlays/Comments/CommentsPage.cs
@@ -123,7 +123,7 @@ namespace osu.Game.Overlays.Comments
 
         private void onCommentRepliesRequested(DrawableComment drawableComment, int page)
         {
-            var request = new GetCommentRepliesRequest(drawableComment.Comment.Id, Type.Value, CommentableId.Value, Sort.Value, page);
+            var request = new GetCommentsRequest(CommentableId.Value, Type.Value, Sort.Value, page, drawableComment.Comment.Id);
 
             request.Success += response => Schedule(() => appendComments(drawableComment, response));
 

From 1cd84754c8ec08f71561c221c3653767861b926e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 Feb 2020 18:46:14 +0900
Subject: [PATCH 0696/1142] Add back parent-child linking

---
 osu.Game/Overlays/Comments/CommentsPage.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Comments/CommentsPage.cs b/osu.Game/Overlays/Comments/CommentsPage.cs
index 2715ea791b..6548ad1dd0 100644
--- a/osu.Game/Overlays/Comments/CommentsPage.cs
+++ b/osu.Game/Overlays/Comments/CommentsPage.cs
@@ -96,7 +96,8 @@ namespace osu.Game.Overlays.Comments
                 }
                 else if (commentDictionary.TryGetValue(comment.ParentId.Value, out var parentDrawable))
                 {
-                    // The comment's parent already has a corresponding drawable.
+                    // The comment's parent already has a corresponding drawable, so add the parent<->child links.
+                    comment.ParentComment = parentDrawable.Comment;
                     parentDrawable.Replies.Add(drawableComment);
                 }
                 else

From a7b5117d8808074b1901f566fbffc4bff4176b76 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 Feb 2020 18:46:33 +0900
Subject: [PATCH 0697/1142] Fix attempting to add parent comments twice

---
 osu.Game/Overlays/Comments/CommentsPage.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Overlays/Comments/CommentsPage.cs b/osu.Game/Overlays/Comments/CommentsPage.cs
index 6548ad1dd0..4b0ac3ceb2 100644
--- a/osu.Game/Overlays/Comments/CommentsPage.cs
+++ b/osu.Game/Overlays/Comments/CommentsPage.cs
@@ -80,6 +80,12 @@ namespace osu.Game.Overlays.Comments
 
             foreach (var child in bundle.IncludedComments)
                 add(child);
+            {
+                // Included comments can contain the parent comment, which already exists in the hierarchy.
+                if (commentDictionary.ContainsKey(child.Id))
+                    continue;
+
+            }
 
             // Comments whose parents did not previously have corresponding drawables, are now guaranteed that their parents have corresponding drawables.
             foreach (var o in orphaned)

From 4fd420e61df3b8b5639afec6d0c58aa755dd908a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 Feb 2020 18:47:14 +0900
Subject: [PATCH 0698/1142] Rename method

---
 osu.Game/Overlays/Comments/CommentsPage.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentsPage.cs b/osu.Game/Overlays/Comments/CommentsPage.cs
index 4b0ac3ceb2..7c3757a8e9 100644
--- a/osu.Game/Overlays/Comments/CommentsPage.cs
+++ b/osu.Game/Overlays/Comments/CommentsPage.cs
@@ -76,28 +76,28 @@ namespace osu.Game.Overlays.Comments
             var orphaned = new List<Comment>();
 
             foreach (var topLevel in bundle.Comments)
-                add(topLevel);
+                addNewComment(topLevel);
 
             foreach (var child in bundle.IncludedComments)
-                add(child);
             {
                 // Included comments can contain the parent comment, which already exists in the hierarchy.
                 if (commentDictionary.ContainsKey(child.Id))
                     continue;
 
+                addNewComment(child);
             }
 
             // Comments whose parents did not previously have corresponding drawables, are now guaranteed that their parents have corresponding drawables.
             foreach (var o in orphaned)
-                add(o);
+                addNewComment(o);
 
-            void add(Comment comment)
+            void addNewComment(Comment comment)
             {
                 var drawableComment = getDrawableComment(comment);
 
                 if (comment.ParentId == null)
                 {
-                    // Comment that has no parent is added as a top-level comment to the flow.
+                    // Comments that have no parent are added as top-level comments to the flow.
                     flow.Add(drawableComment);
                 }
                 else if (commentDictionary.TryGetValue(comment.ParentId.Value, out var parentDrawable))

From 4c3468f40ed012f48df24bd4a6a08c73c8762feb Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 Feb 2020 18:47:56 +0900
Subject: [PATCH 0699/1142] Reorder file

---
 osu.Game/Overlays/Comments/CommentsPage.cs | 44 +++++++++++-----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentsPage.cs b/osu.Game/Overlays/Comments/CommentsPage.cs
index 7c3757a8e9..65dabc4050 100644
--- a/osu.Game/Overlays/Comments/CommentsPage.cs
+++ b/osu.Game/Overlays/Comments/CommentsPage.cs
@@ -64,6 +64,28 @@ namespace osu.Game.Overlays.Comments
             appendComments(null, commentBundle);
         }
 
+        private DrawableComment getDrawableComment(Comment comment)
+        {
+            if (commentDictionary.TryGetValue(comment.Id, out var existing))
+                return existing;
+
+            return commentDictionary[comment.Id] = new DrawableComment(comment)
+            {
+                ShowDeleted = { BindTarget = ShowDeleted },
+                Sort = { BindTarget = Sort },
+                RepliesRequested = onCommentRepliesRequested
+            };
+        }
+
+        private void onCommentRepliesRequested(DrawableComment drawableComment, int page)
+        {
+            var request = new GetCommentsRequest(CommentableId.Value, Type.Value, Sort.Value, page, drawableComment.Comment.Id);
+
+            request.Success += response => Schedule(() => appendComments(drawableComment, response));
+
+            api.PerformAsync(request);
+        }
+
         private readonly Dictionary<long, DrawableComment> commentDictionary = new Dictionary<long, DrawableComment>();
 
         /// <summary>
@@ -115,28 +137,6 @@ namespace osu.Game.Overlays.Comments
             }
         }
 
-        private DrawableComment getDrawableComment(Comment comment)
-        {
-            if (commentDictionary.TryGetValue(comment.Id, out var existing))
-                return existing;
-
-            return commentDictionary[comment.Id] = new DrawableComment(comment)
-            {
-                ShowDeleted = { BindTarget = ShowDeleted },
-                Sort = { BindTarget = Sort },
-                RepliesRequested = onCommentRepliesRequested
-            };
-        }
-
-        private void onCommentRepliesRequested(DrawableComment drawableComment, int page)
-        {
-            var request = new GetCommentsRequest(CommentableId.Value, Type.Value, Sort.Value, page, drawableComment.Comment.Id);
-
-            request.Success += response => Schedule(() => appendComments(drawableComment, response));
-
-            api.PerformAsync(request);
-        }
-
         private class NoCommentsPlaceholder : CompositeDrawable
         {
             [BackgroundDependencyLoader]

From 05ff4de944626e031ec3c318d798aef92a3f1b34 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 Feb 2020 19:16:14 +0900
Subject: [PATCH 0700/1142] Remove the concept of orphaning and refactor

---
 osu.Game/Overlays/Comments/CommentsPage.cs | 27 ++++++----------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentsPage.cs b/osu.Game/Overlays/Comments/CommentsPage.cs
index 65dabc4050..88e209ea2c 100644
--- a/osu.Game/Overlays/Comments/CommentsPage.cs
+++ b/osu.Game/Overlays/Comments/CommentsPage.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Overlays.Comments
                 return;
             }
 
-            appendComments(null, commentBundle);
+            appendComments(commentBundle);
         }
 
         private DrawableComment getDrawableComment(Comment comment)
@@ -81,7 +81,7 @@ namespace osu.Game.Overlays.Comments
         {
             var request = new GetCommentsRequest(CommentableId.Value, Type.Value, Sort.Value, page, drawableComment.Comment.Id);
 
-            request.Success += response => Schedule(() => appendComments(drawableComment, response));
+            request.Success += response => Schedule(() => appendComments(response));
 
             api.PerformAsync(request);
         }
@@ -89,16 +89,13 @@ namespace osu.Game.Overlays.Comments
         private readonly Dictionary<long, DrawableComment> commentDictionary = new Dictionary<long, DrawableComment>();
 
         /// <summary>
-        /// Appends retrieved comments to the subtree rooted at a parenting <see cref="DrawableComment"/>.
+        /// Appends retrieved comments to the subtree of comments in this page.
         /// </summary>
-        /// <param name="parent">The parenting <see cref="DrawableComment"/>.</param>
         /// <param name="bundle">The bundle of comments to add.</param>
-        private void appendComments([CanBeNull] DrawableComment parent, [NotNull] CommentBundle bundle)
+        private void appendComments([NotNull] CommentBundle bundle)
         {
-            var orphaned = new List<Comment>();
-
-            foreach (var topLevel in bundle.Comments)
-                addNewComment(topLevel);
+            foreach (var child in bundle.Comments)
+                addNewComment(child);
 
             foreach (var child in bundle.IncludedComments)
             {
@@ -109,10 +106,6 @@ namespace osu.Game.Overlays.Comments
                 addNewComment(child);
             }
 
-            // Comments whose parents did not previously have corresponding drawables, are now guaranteed that their parents have corresponding drawables.
-            foreach (var o in orphaned)
-                addNewComment(o);
-
             void addNewComment(Comment comment)
             {
                 var drawableComment = getDrawableComment(comment);
@@ -124,16 +117,10 @@ namespace osu.Game.Overlays.Comments
                 }
                 else if (commentDictionary.TryGetValue(comment.ParentId.Value, out var parentDrawable))
                 {
-                    // The comment's parent already has a corresponding drawable, so add the parent<->child links.
+                    // The comment's parent has already been seen, so the parent<-> child links can be added.
                     comment.ParentComment = parentDrawable.Comment;
                     parentDrawable.Replies.Add(drawableComment);
                 }
-                else
-                {
-                    // The comment's parent does not have a corresponding drawable yet, so keep it as orphaned for the time being.
-                    // Note that this comment's corresponding drawable has already been created by this point, so future children will be able to be added without being orphaned themselves.
-                    orphaned.Add(comment);
-                }
             }
         }
 

From 4c083e0e7ef660009ea75374865ee9a5c54a43c4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 Feb 2020 19:41:00 +0900
Subject: [PATCH 0701/1142] Add back orphaning as a fail-safe

---
 osu.Game/Overlays/Comments/CommentsPage.cs | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentsPage.cs b/osu.Game/Overlays/Comments/CommentsPage.cs
index 88e209ea2c..4f82ee5a19 100644
--- a/osu.Game/Overlays/Comments/CommentsPage.cs
+++ b/osu.Game/Overlays/Comments/CommentsPage.cs
@@ -89,13 +89,15 @@ namespace osu.Game.Overlays.Comments
         private readonly Dictionary<long, DrawableComment> commentDictionary = new Dictionary<long, DrawableComment>();
 
         /// <summary>
-        /// Appends retrieved comments to the subtree of comments in this page.
+        /// Appends retrieved comments to the subtree rooted of comments in this page.
         /// </summary>
         /// <param name="bundle">The bundle of comments to add.</param>
         private void appendComments([NotNull] CommentBundle bundle)
         {
-            foreach (var child in bundle.Comments)
-                addNewComment(child);
+            var orphaned = new List<Comment>();
+
+            foreach (var topLevel in bundle.Comments)
+                addNewComment(topLevel);
 
             foreach (var child in bundle.IncludedComments)
             {
@@ -106,6 +108,10 @@ namespace osu.Game.Overlays.Comments
                 addNewComment(child);
             }
 
+            // Comments whose parents were seen later than themselves can now be added.
+            foreach (var o in orphaned)
+                addNewComment(o);
+
             void addNewComment(Comment comment)
             {
                 var drawableComment = getDrawableComment(comment);
@@ -121,6 +127,12 @@ namespace osu.Game.Overlays.Comments
                     comment.ParentComment = parentDrawable.Comment;
                     parentDrawable.Replies.Add(drawableComment);
                 }
+                else
+                {
+                    // The comment's parent has not been seen yet, so keep it orphaned for the time being. This can occur if the comments arrive out of order.
+                    // Since this comment has now been seen, any further children can be added to it without being orphaned themselves.
+                    orphaned.Add(comment);
+                }
             }
         }
 

From 7fd71d9b6caea947208b621623b050a65101c412 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 21 Feb 2020 19:50:16 +0900
Subject: [PATCH 0702/1142] Adjust conditional

---
 osu.Game/Overlays/Comments/CommentsContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index 5a04f6b4c4..591a9dc86e 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -147,7 +147,7 @@ namespace osu.Game.Overlays.Comments
 
         private void getComments()
         {
-            if (id.Value == 0)
+            if (id.Value <= 0)
                 return;
 
             request?.Cancel();

From 3fdf8dc386125522ce1c025a8d52fc276b987da7 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 21 Feb 2020 16:41:52 +0300
Subject: [PATCH 0703/1142] Recolour main background

---
 osu.Game/Overlays/ChangelogOverlay.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/ChangelogOverlay.cs b/osu.Game/Overlays/ChangelogOverlay.cs
index 6a8cb29d3e..d13ac5c2de 100644
--- a/osu.Game/Overlays/ChangelogOverlay.cs
+++ b/osu.Game/Overlays/ChangelogOverlay.cs
@@ -13,7 +13,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Input.Bindings;
 using osu.Game.Online.API.Requests;
@@ -42,14 +41,14 @@ namespace osu.Game.Overlays
         }
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio, OsuColour colour)
+        private void load(AudioManager audio)
         {
             Children = new Drawable[]
             {
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = colour.PurpleDarkAlternative,
+                    Colour = ColourProvider.Background4,
                 },
                 new OsuScrollContainer
                 {

From e9f69d2c23706e3668bb9457f771e9c86955248a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 21 Feb 2020 16:55:12 +0300
Subject: [PATCH 0704/1142] Adjust date for ChangelogSingleBuild

---
 osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs b/osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs
index 73f9466179..4d2c8346a5 100644
--- a/osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs
@@ -80,6 +80,8 @@ namespace osu.Game.Overlays.Changelog
             {
             }
 
+            private OsuSpriteText date;
+
             protected override FillFlowContainer CreateHeader()
             {
                 var fill = base.CreateHeader();
@@ -89,11 +91,10 @@ namespace osu.Game.Overlays.Changelog
                     existing.Scale = new Vector2(1.25f);
                     existing.Action = null;
 
-                    existing.Add(new OsuSpriteText
+                    existing.Add(date = new OsuSpriteText
                     {
-                        Text = Build.CreatedAt.Date.ToString("dd MMM yyyy"),
+                        Text = Build.CreatedAt.Date.ToString("dd MMMM yyyy"),
                         Font = OsuFont.GetFont(weight: FontWeight.Regular, size: 14),
-                        Colour = OsuColour.FromHex(@"FD5"),
                         Anchor = Anchor.BottomCentre,
                         Origin = Anchor.TopCentre,
                         Margin = new MarginPadding { Top = 5 },
@@ -113,6 +114,12 @@ namespace osu.Game.Overlays.Changelog
 
                 return fill;
             }
+
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                date.Colour = colourProvider.Light1;
+            }
         }
 
         private class NavigationIconButton : IconButton

From 70eb2ed09e6ee46f84708bd9ae228238cd1bc949 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 21 Feb 2020 17:11:29 +0300
Subject: [PATCH 0705/1142] Adjust ChangelogBuild appearance

---
 osu.Game/Overlays/Changelog/ChangelogBuild.cs | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Overlays/Changelog/ChangelogBuild.cs b/osu.Game/Overlays/Changelog/ChangelogBuild.cs
index 5a3ce6291e..00bd36649a 100644
--- a/osu.Game/Overlays/Changelog/ChangelogBuild.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogBuild.cs
@@ -51,28 +51,27 @@ namespace osu.Game.Overlays.Changelog
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OsuColour colours, OverlayColourProvider colourProvider)
         {
             foreach (var categoryEntries in Build.ChangelogEntries.GroupBy(b => b.Category).OrderBy(c => c.Key))
             {
                 ChangelogEntries.Add(new OsuSpriteText
                 {
                     Text = categoryEntries.Key,
-                    Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 24),
+                    Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 18),
                     Margin = new MarginPadding { Top = 35, Bottom = 15 },
                 });
 
-                var fontLarge = OsuFont.GetFont(size: 18);
-                var fontMedium = OsuFont.GetFont(size: 14);
-                var fontSmall = OsuFont.GetFont(size: 12);
+                var fontLarge = OsuFont.GetFont(size: 16);
+                var fontMedium = OsuFont.GetFont(size: 12);
 
-                foreach (APIChangelogEntry entry in categoryEntries)
+                foreach (var entry in categoryEntries)
                 {
                     var entryColour = entry.Major ? colours.YellowLight : Color4.White;
 
                     LinkFlowContainer title;
 
-                    Container titleContainer = new Container
+                    var titleContainer = new Container
                     {
                         AutoSizeAxes = Axes.Y,
                         RelativeSizeAxes = Axes.X,
@@ -83,7 +82,7 @@ namespace osu.Game.Overlays.Changelog
                             {
                                 Anchor = Anchor.CentreLeft,
                                 Origin = Anchor.CentreRight,
-                                Size = new Vector2(fontSmall.Size),
+                                Size = new Vector2(10),
                                 Icon = entry.Type == ChangelogEntryType.Fix ? FontAwesome.Solid.Check : FontAwesome.Solid.Plus,
                                 Colour = entryColour,
                                 Margin = new MarginPadding { Right = 5 },
@@ -123,9 +122,9 @@ namespace osu.Game.Overlays.Changelog
                         });
                     }
 
-                    title.AddText(" by ", t =>
+                    title.AddText("  by ", t =>
                     {
-                        t.Font = fontMedium;
+                        t.Font = fontMedium.With(italics: true);
                         t.Colour = entryColour;
                     });
 
@@ -137,7 +136,7 @@ namespace osu.Game.Overlays.Changelog
                             Id = entry.GithubUser.UserId.Value
                         }, t =>
                         {
-                            t.Font = fontMedium;
+                            t.Font = fontMedium.With(italics: true);
                             t.Colour = entryColour;
                         });
                     }
@@ -145,7 +144,7 @@ namespace osu.Game.Overlays.Changelog
                     {
                         title.AddLink(entry.GithubUser.DisplayName, entry.GithubUser.GithubUrl, t =>
                         {
-                            t.Font = fontMedium;
+                            t.Font = fontMedium.With(italics: true);
                             t.Colour = entryColour;
                         });
                     }
@@ -153,7 +152,7 @@ namespace osu.Game.Overlays.Changelog
                     {
                         title.AddText(entry.GithubUser.DisplayName, t =>
                         {
-                            t.Font = fontSmall;
+                            t.Font = fontMedium.With(italics: true);
                             t.Colour = entryColour;
                         });
                     }
@@ -162,7 +161,7 @@ namespace osu.Game.Overlays.Changelog
 
                     if (!string.IsNullOrEmpty(entry.MessageHtml))
                     {
-                        TextFlowContainer message = new TextFlowContainer
+                        var message = new TextFlowContainer
                         {
                             AutoSizeAxes = Axes.Y,
                             RelativeSizeAxes = Axes.X,
@@ -171,8 +170,8 @@ namespace osu.Game.Overlays.Changelog
                         // todo: use markdown parsing once API returns markdown
                         message.AddText(WebUtility.HtmlDecode(Regex.Replace(entry.MessageHtml, @"<(.|\n)*?>", string.Empty)), t =>
                         {
-                            t.Font = fontSmall;
-                            t.Colour = new Color4(235, 184, 254, 255);
+                            t.Font = fontMedium;
+                            t.Colour = colourProvider.Foreground1;
                         });
 
                         ChangelogEntries.Add(message);

From 491906d53416125deb9a753772b7512afe187802 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 21 Feb 2020 17:19:49 +0300
Subject: [PATCH 0706/1142] Adjust ChangelogListing appearance

---
 osu.Game/Overlays/Changelog/ChangelogListing.cs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Changelog/ChangelogListing.cs b/osu.Game/Overlays/Changelog/ChangelogListing.cs
index 41d8228475..19bc5975f1 100644
--- a/osu.Game/Overlays/Changelog/ChangelogListing.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogListing.cs
@@ -24,13 +24,13 @@ namespace osu.Game.Overlays.Changelog
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OverlayColourProvider colourProvider)
         {
-            DateTime currentDate = DateTime.MinValue;
+            var currentDate = DateTime.MinValue;
 
             if (entries == null) return;
 
-            foreach (APIChangelogBuild build in entries)
+            foreach (var build in entries)
             {
                 if (build.CreatedAt.Date != currentDate)
                 {
@@ -49,10 +49,9 @@ namespace osu.Game.Overlays.Changelog
                     {
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
-                        Margin = new MarginPadding { Top = 15 },
-                        Text = build.CreatedAt.Date.ToString("dd MMM yyyy"),
+                        Margin = new MarginPadding { Top = 20 },
+                        Text = build.CreatedAt.Date.ToString("dd MMMM yyyy"),
                         Font = OsuFont.GetFont(weight: FontWeight.Regular, size: 24),
-                        Colour = OsuColour.FromHex(@"FD5"),
                     });
 
                     currentDate = build.CreatedAt.Date;
@@ -68,7 +67,7 @@ namespace osu.Game.Overlays.Changelog
                         Child = new Box
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Colour = new Color4(32, 24, 35, 255),
+                            Colour = colourProvider.Background6,
                         }
                     });
                 }

From 48a9b465ef473e8ac5495132a1aac7f46776f94c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 21 Feb 2020 17:22:46 +0300
Subject: [PATCH 0707/1142] Adjust icons colour

---
 osu.Game/Overlays/Changelog/ChangelogBuild.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Changelog/ChangelogBuild.cs b/osu.Game/Overlays/Changelog/ChangelogBuild.cs
index 00bd36649a..94bb8b5abe 100644
--- a/osu.Game/Overlays/Changelog/ChangelogBuild.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogBuild.cs
@@ -16,6 +16,7 @@ using osuTK.Graphics;
 using osu.Framework.Allocation;
 using System.Net;
 using osuTK;
+using osu.Framework.Extensions.Color4Extensions;
 
 namespace osu.Game.Overlays.Changelog
 {
@@ -84,7 +85,7 @@ namespace osu.Game.Overlays.Changelog
                                 Origin = Anchor.CentreRight,
                                 Size = new Vector2(10),
                                 Icon = entry.Type == ChangelogEntryType.Fix ? FontAwesome.Solid.Check : FontAwesome.Solid.Plus,
-                                Colour = entryColour,
+                                Colour = entryColour.Darken(0.7f),
                                 Margin = new MarginPadding { Right = 5 },
                             },
                             title = new LinkFlowContainer

From c49074dde36776c3c627d2db3b2d30daa03feba3 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 21 Feb 2020 17:29:51 +0300
Subject: [PATCH 0708/1142] Adjust comments placement

---
 osu.Game/Overlays/Changelog/ChangelogContent.cs     |  1 -
 osu.Game/Overlays/Changelog/ChangelogListing.cs     |  2 +-
 osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs | 13 +++++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Changelog/ChangelogContent.cs b/osu.Game/Overlays/Changelog/ChangelogContent.cs
index 2f6c1ae902..49dd9bb835 100644
--- a/osu.Game/Overlays/Changelog/ChangelogContent.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogContent.cs
@@ -19,7 +19,6 @@ namespace osu.Game.Overlays.Changelog
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
             Direction = FillDirection.Vertical;
-            Padding = new MarginPadding { Bottom = 50 };
         }
     }
 }
diff --git a/osu.Game/Overlays/Changelog/ChangelogListing.cs b/osu.Game/Overlays/Changelog/ChangelogListing.cs
index 19bc5975f1..55c79e7e79 100644
--- a/osu.Game/Overlays/Changelog/ChangelogListing.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogListing.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Overlays.Changelog
                         {
                             RelativeSizeAxes = Axes.X,
                             Height = 2,
-                            Colour = new Color4(17, 17, 17, 255),
+                            Colour = colourProvider.Background6,
                             Margin = new MarginPadding { Top = 30 },
                         });
                     }
diff --git a/osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs b/osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs
index 4d2c8346a5..8b89d63aab 100644
--- a/osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogSingleBuild.cs
@@ -8,6 +8,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
@@ -31,7 +32,7 @@ namespace osu.Game.Overlays.Changelog
         }
 
         [BackgroundDependencyLoader]
-        private void load(CancellationToken? cancellation, IAPIProvider api)
+        private void load(CancellationToken? cancellation, IAPIProvider api, OverlayColourProvider colourProvider)
         {
             bool complete = false;
 
@@ -63,10 +64,14 @@ namespace osu.Game.Overlays.Changelog
                 Children = new Drawable[]
                 {
                     new ChangelogBuildWithNavigation(build) { SelectBuild = SelectBuild },
-                    comments = new CommentsContainer
+                    new Box
                     {
-                        Margin = new MarginPadding { Top = 10 }
-                    }
+                        RelativeSizeAxes = Axes.X,
+                        Height = 2,
+                        Colour = colourProvider.Background6,
+                        Margin = new MarginPadding { Top = 30 },
+                    },
+                    comments = new CommentsContainer()
                 };
 
                 comments.ShowComments(CommentableType.Build, build.Id);

From 32962650668a6327f3fa2a220057507e1698e6a6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 22 Feb 2020 00:07:20 +0900
Subject: [PATCH 0709/1142] Add linux download link to readme

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6cc110280c..0a555027d4 100644
--- a/README.md
+++ b/README.md
@@ -27,8 +27,8 @@ If you are looking to install or test osu! without setting up a development envi
 
 **Latest build:**
 
-| [Windows (x64)](https://github.com/ppy/osu/releases/latest/download/install.exe)  | [macOS 10.12+](https://github.com/ppy/osu/releases/latest/download/osu.app.zip) | [iOS(iOS 10+)](https://osu.ppy.sh/home/testflight) | [Android (5+)](https://github.com/ppy/osu/releases/latest/download/sh.ppy.osulazer.apk)
-| ------------- | ------------- | ------------- | ------------- |
+| [Windows (x64)](https://github.com/ppy/osu/releases/latest/download/install.exe)  | [macOS 10.12+](https://github.com/ppy/osu/releases/latest/download/osu.app.zip) | [Linux (x64)](https://github.com/ppy/osu/releases/latest/download/osu.x86_64.AppImage) | [iOS(iOS 10+)](https://osu.ppy.sh/home/testflight) | [Android (5+)](https://github.com/ppy/osu/releases/latest/download/sh.ppy.osulazer.apk)
+| ------------- | ------------- | ------------- | ------------- | ------------- |
 
 - **Linux** users are recommended to self-compile until we have official deployment in place.
 - When running on Windows 7 or 8.1, **[additional prerequisites](https://docs.microsoft.com/en-us/dotnet/core/install/dependencies?tabs=netcore31&pivots=os-windows)** may be required to correctly run .NET Core applications if your operating system is not up-to-date with the latest service packs.

From e21db7dbbeb124080b759957066f27d75623b28a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 22 Feb 2020 00:09:55 +0900
Subject: [PATCH 0710/1142] Remove linux self-compile recommendation

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 0a555027d4..f61f118ea8 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,6 @@ If you are looking to install or test osu! without setting up a development envi
 | [Windows (x64)](https://github.com/ppy/osu/releases/latest/download/install.exe)  | [macOS 10.12+](https://github.com/ppy/osu/releases/latest/download/osu.app.zip) | [Linux (x64)](https://github.com/ppy/osu/releases/latest/download/osu.x86_64.AppImage) | [iOS(iOS 10+)](https://osu.ppy.sh/home/testflight) | [Android (5+)](https://github.com/ppy/osu/releases/latest/download/sh.ppy.osulazer.apk)
 | ------------- | ------------- | ------------- | ------------- | ------------- |
 
-- **Linux** users are recommended to self-compile until we have official deployment in place.
 - When running on Windows 7 or 8.1, **[additional prerequisites](https://docs.microsoft.com/en-us/dotnet/core/install/dependencies?tabs=netcore31&pivots=os-windows)** may be required to correctly run .NET Core applications if your operating system is not up-to-date with the latest service packs.
 
 If your platform is not listed above, there is still a chance you can manually build it by following the instructions below.

From 8593642a045df159c965a2baa6683c1eccd426b2 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 21 Feb 2020 18:12:23 +0300
Subject: [PATCH 0711/1142] Adjust StreamBadgeArea

---
 .../Overlays/Changelog/UpdateStreamBadge.cs   | 125 ++++++++----------
 .../Changelog/UpdateStreamBadgeArea.cs        |  13 +-
 2 files changed, 64 insertions(+), 74 deletions(-)

diff --git a/osu.Game/Overlays/Changelog/UpdateStreamBadge.cs b/osu.Game/Overlays/Changelog/UpdateStreamBadge.cs
index 52b77604d9..99929058e2 100644
--- a/osu.Game/Overlays/Changelog/UpdateStreamBadge.cs
+++ b/osu.Game/Overlays/Changelog/UpdateStreamBadge.cs
@@ -3,8 +3,6 @@
 
 using Humanizer;
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -16,99 +14,90 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Changelog
 {
     public class UpdateStreamBadge : TabItem<APIUpdateStream>
     {
-        private const float badge_height = 66.5f;
         private const float badge_width = 100;
         private const float transition_duration = 100;
 
-        private readonly ExpandingBar expandingBar;
-        private SampleChannel sampleClick;
-        private SampleChannel sampleHover;
-
-        private readonly FillFlowContainer<SpriteText> text;
-
         public readonly Bindable<APIUpdateStream> SelectedTab = new Bindable<APIUpdateStream>();
 
-        private readonly Container fadeContainer;
+        private readonly APIUpdateStream stream;
+
+        private Container fadeContainer;
+        private FillFlowContainer<SpriteText> text;
+        private ExpandingBar expandingBar;
 
         public UpdateStreamBadge(APIUpdateStream stream)
             : base(stream)
         {
-            Size = new Vector2(stream.IsFeatured ? badge_width * 2 : badge_width, badge_height);
-            Padding = new MarginPadding(5);
-
-            Child = fadeContainer = new Container
-            {
-                RelativeSizeAxes = Axes.Both,
-                Children = new Drawable[]
-                {
-                    text = new FillFlowContainer<SpriteText>
-                    {
-                        AutoSizeAxes = Axes.X,
-                        RelativeSizeAxes = Axes.Y,
-                        Direction = FillDirection.Vertical,
-                        Children = new[]
-                        {
-                            new OsuSpriteText
-                            {
-                                Text = stream.DisplayName,
-                                Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 12),
-                                Margin = new MarginPadding { Top = 6 },
-                            },
-                            new OsuSpriteText
-                            {
-                                Text = stream.LatestBuild.DisplayVersion,
-                                Font = OsuFont.GetFont(weight: FontWeight.Light, size: 16),
-                            },
-                            new OsuSpriteText
-                            {
-                                Text = stream.LatestBuild.Users > 0 ? $"{stream.LatestBuild.Users:N0} {"user".Pluralize(stream.LatestBuild.Users == 1)} online" : null,
-                                Font = OsuFont.GetFont(weight: FontWeight.Regular, size: 10),
-                                Colour = new Color4(203, 164, 218, 255),
-                            },
-                        }
-                    },
-                    expandingBar = new ExpandingBar
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Colour = stream.Colour,
-                        ExpandedSize = 4,
-                        CollapsedSize = 2,
-                        IsCollapsed = true
-                    },
-                }
-            };
-
-            SelectedTab.BindValueChanged(_ => updateState(), true);
+            this.stream = stream;
         }
 
         [BackgroundDependencyLoader]
-        private void load(AudioManager audio)
+        private void load(OverlayColourProvider colourProvider)
         {
-            sampleClick = audio.Samples.Get(@"UI/generic-select-soft");
-            sampleHover = audio.Samples.Get(@"UI/generic-hover-soft");
+            Size = new Vector2(stream.IsFeatured ? badge_width * 2 : badge_width, 60);
+            Padding = new MarginPadding(5);
+
+            AddRange(new Drawable[]
+            {
+                fadeContainer = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        text = new FillFlowContainer<SpriteText>
+                        {
+                            AutoSizeAxes = Axes.X,
+                            RelativeSizeAxes = Axes.Y,
+                            Direction = FillDirection.Vertical,
+                            Margin = new MarginPadding { Top = 6 },
+                            Children = new[]
+                            {
+                                new OsuSpriteText
+                                {
+                                    Text = stream.DisplayName,
+                                    Font = OsuFont.GetFont(size: 12, weight: FontWeight.Black),
+                                },
+                                new OsuSpriteText
+                                {
+                                    Text = stream.LatestBuild.DisplayVersion,
+                                    Font = OsuFont.GetFont(size: 16, weight: FontWeight.Regular),
+                                },
+                                new OsuSpriteText
+                                {
+                                    Text = stream.LatestBuild.Users > 0 ? $"{stream.LatestBuild.Users:N0} {"user".Pluralize(stream.LatestBuild.Users == 1)} online" : null,
+                                    Font = OsuFont.GetFont(size: 10),
+                                    Colour = colourProvider.Foreground1
+                                },
+                            }
+                        },
+                        expandingBar = new ExpandingBar
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Colour = stream.Colour,
+                            ExpandedSize = 4,
+                            CollapsedSize = 2,
+                            IsCollapsed = true
+                        },
+                    }
+                },
+                new HoverClickSounds()
+            });
+
+            SelectedTab.BindValueChanged(_ => updateState(), true);
         }
 
         protected override void OnActivated() => updateState();
 
         protected override void OnDeactivated() => updateState();
 
-        protected override bool OnClick(ClickEvent e)
-        {
-            sampleClick?.Play();
-            return base.OnClick(e);
-        }
-
         protected override bool OnHover(HoverEvent e)
         {
-            sampleHover?.Play();
             updateState();
-
             return base.OnHover(e);
         }
 
diff --git a/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs b/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs
index ca57ba24e2..ccb1314885 100644
--- a/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs
+++ b/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs
@@ -9,33 +9,34 @@ using System.Linq;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osuTK.Graphics;
+using osu.Framework.Allocation;
 
 namespace osu.Game.Overlays.Changelog
 {
     public class UpdateStreamBadgeArea : TabControl<APIUpdateStream>
     {
-        public UpdateStreamBadgeArea()
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
             AddInternal(new Box
             {
-                Colour = Color4.Black,
-                Alpha = 0.12f,
                 RelativeSizeAxes = Axes.Both,
+                Colour = colourProvider.Background5,
             });
         }
 
         public void Populate(List<APIUpdateStream> streams)
         {
-            foreach (APIUpdateStream updateStream in streams)
+            foreach (var updateStream in streams)
                 AddItem(updateStream);
         }
 
         protected override bool OnHover(HoverEvent e)
         {
-            foreach (UpdateStreamBadge streamBadge in TabContainer.Children.OfType<UpdateStreamBadge>())
+            foreach (var streamBadge in TabContainer.Children.OfType<UpdateStreamBadge>())
                 streamBadge.EnableDim();
 
             return base.OnHover(e);
@@ -43,7 +44,7 @@ namespace osu.Game.Overlays.Changelog
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            foreach (UpdateStreamBadge streamBadge in TabContainer.Children.OfType<UpdateStreamBadge>())
+            foreach (var streamBadge in TabContainer.Children.OfType<UpdateStreamBadge>())
                 streamBadge.DisableDim();
 
             base.OnHoverLost(e);

From 44ddc585daf94f81b7c48f916bd8e9e4ffc73cbe Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 21 Feb 2020 18:40:42 +0300
Subject: [PATCH 0712/1142] Remove unused usings

---
 osu.Game/Overlays/Changelog/ChangelogListing.cs      | 1 -
 osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs | 1 -
 2 files changed, 2 deletions(-)

diff --git a/osu.Game/Overlays/Changelog/ChangelogListing.cs b/osu.Game/Overlays/Changelog/ChangelogListing.cs
index 55c79e7e79..9b74a8da6d 100644
--- a/osu.Game/Overlays/Changelog/ChangelogListing.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogListing.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API.Requests.Responses;
-using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Changelog
 {
diff --git a/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs b/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs
index ccb1314885..639c0d9780 100644
--- a/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs
+++ b/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs
@@ -8,7 +8,6 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
-using osuTK.Graphics;
 using osu.Framework.Allocation;
 
 namespace osu.Game.Overlays.Changelog

From f248c0a98eed52098eb364ed66c3ba3a37cd2b9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 22 Feb 2020 00:56:17 +0100
Subject: [PATCH 0713/1142] Fix regressed direct panel test scene

Due to unnoticed past changes TestSceneDirectPanel has regressed in that
clicking the preview track button would crash due to an unregistered
IPreviewTrackOwner dependency.

Make the test scene itself implement that empty interface and cache
itself as IPreviewTrackOwner so that preview tracks lower down can
resolve the dependency.

As the test is purely visual and has no assertions, and the important
logic in that area (preview track playing logic) is already well-covered
enough elsewhere, no further changes were made.
---
 osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs
index 731cb62518..ccd428fe68 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Overlays.Direct;
 using osu.Game.Rulesets;
@@ -14,7 +15,7 @@ using osuTK;
 
 namespace osu.Game.Tests.Visual.Online
 {
-    public class TestSceneDirectPanel : OsuTestScene
+    public class TestSceneDirectPanel : OsuTestScene, IPreviewTrackOwner
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -23,6 +24,13 @@ namespace osu.Game.Tests.Visual.Online
             typeof(IconPill)
         };
 
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+        {
+            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+            dependencies.CacheAs<IPreviewTrackOwner>(this);
+            return dependencies;
+        }
+
         private BeatmapSetInfo getUndownloadableBeatmapSet() => new BeatmapSetInfo
         {
             OnlineBeatmapSetID = 123,

From 894b50f95572899305df5868236acdf8723d70ac Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 22 Feb 2020 03:24:50 +0300
Subject: [PATCH 0714/1142] Basic implementation of BeatmapSetCommentsContainer

---
 osu.Game/Overlays/BeatmapSet/Info.cs   | 11 ----
 osu.Game/Overlays/BeatmapSetOverlay.cs | 76 ++++++++++++++++++++++----
 2 files changed, 65 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Info.cs b/osu.Game/Overlays/BeatmapSet/Info.cs
index 0f2d6a9e35..bac658b76e 100644
--- a/osu.Game/Overlays/BeatmapSet/Info.cs
+++ b/osu.Game/Overlays/BeatmapSet/Info.cs
@@ -3,17 +3,14 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Overlays.BeatmapSet
 {
@@ -43,14 +40,6 @@ namespace osu.Game.Overlays.BeatmapSet
 
             RelativeSizeAxes = Axes.X;
             Height = base_height;
-            Masking = true;
-            EdgeEffect = new EdgeEffectParameters
-            {
-                Colour = Color4.Black.Opacity(0.25f),
-                Type = EdgeEffectType.Shadow,
-                Radius = 3,
-                Offset = new Vector2(0f, 1f),
-            };
 
             Children = new Drawable[]
             {
diff --git a/osu.Game/Overlays/BeatmapSetOverlay.cs b/osu.Game/Overlays/BeatmapSetOverlay.cs
index d29997f7e5..5b5580f286 100644
--- a/osu.Game/Overlays/BeatmapSetOverlay.cs
+++ b/osu.Game/Overlays/BeatmapSetOverlay.cs
@@ -4,8 +4,10 @@
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
@@ -13,8 +15,10 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Online.API.Requests;
 using osu.Game.Overlays.BeatmapSet;
 using osu.Game.Overlays.BeatmapSet.Scores;
+using osu.Game.Overlays.Comments;
 using osu.Game.Rulesets;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
@@ -40,6 +44,7 @@ namespace osu.Game.Overlays
         {
             OsuScrollContainer scroll;
             Info info;
+            BeatmapSetCommentsContainer comments;
 
             Children = new Drawable[]
             {
@@ -51,28 +56,38 @@ namespace osu.Game.Overlays
                 {
                     RelativeSizeAxes = Axes.Both,
                     ScrollbarVisible = false,
-                    Child = new ReverseChildIDFillFlowContainer<Drawable>
+                    Child = new ReverseChildIDFillFlowContainer<Section>
                     {
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
                         Direction = FillDirection.Vertical,
                         Spacing = new Vector2(0, 20),
-                        Children = new Drawable[]
+                        Children = new[]
                         {
-                            new ReverseChildIDFillFlowContainer<Drawable>
+                            new Section
                             {
-                                AutoSizeAxes = Axes.Y,
-                                RelativeSizeAxes = Axes.X,
-                                Direction = FillDirection.Vertical,
-                                Children = new Drawable[]
+                                Child = new ReverseChildIDFillFlowContainer<Drawable>
                                 {
-                                    Header = new Header(),
-                                    info = new Info()
+                                    AutoSizeAxes = Axes.Y,
+                                    RelativeSizeAxes = Axes.X,
+                                    Direction = FillDirection.Vertical,
+                                    Children = new Drawable[]
+                                    {
+                                        Header = new Header(),
+                                        info = new Info()
+                                    }
+                                },
+                            },
+                            new Section
+                            {
+                                Child = new ScoresContainer
+                                {
+                                    Beatmap = { BindTarget = Header.Picker.Beatmap }
                                 }
                             },
-                            new ScoresContainer
+                            new Section
                             {
-                                Beatmap = { BindTarget = Header.Picker.Beatmap }
+                                Child = comments = new BeatmapSetCommentsContainer()
                             }
                         },
                     },
@@ -81,6 +96,7 @@ namespace osu.Game.Overlays
 
             Header.BeatmapSet.BindTo(beatmapSet);
             info.BeatmapSet.BindTo(beatmapSet);
+            comments.BeatmapSet.BindTo(beatmapSet);
 
             Header.Picker.Beatmap.ValueChanged += b =>
             {
@@ -143,5 +159,43 @@ namespace osu.Game.Overlays
             beatmapSet.Value = set;
             Show();
         }
+
+        private class Section : Container
+        {
+            public Section()
+            {
+                RelativeSizeAxes = Axes.X;
+                AutoSizeAxes = Axes.Y;
+                Masking = true;
+                EdgeEffect = new EdgeEffectParameters
+                {
+                    Colour = Color4.Black.Opacity(0.25f),
+                    Type = EdgeEffectType.Shadow,
+                    Radius = 3,
+                    Offset = new Vector2(0f, 1f),
+                };
+            }
+        }
+
+        private class BeatmapSetCommentsContainer : CommentsContainer
+        {
+            public readonly Bindable<BeatmapSetInfo> BeatmapSet = new Bindable<BeatmapSetInfo>();
+
+            public BeatmapSetCommentsContainer()
+            {
+                BeatmapSet.BindValueChanged(beatmapSet =>
+                {
+                    if (beatmapSet.NewValue?.OnlineBeatmapSetID.HasValue != true)
+                    {
+                        Hide();
+                    }
+                    else
+                    {
+                        Show();
+                        ShowComments(CommentableType.Beatmapset, beatmapSet.NewValue.OnlineBeatmapSetID.Value);
+                    }
+                }, true);
+            }
+        }
     }
 }

From 63006e8672276d44ccd85ae12a163087e6d84cb5 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 22 Feb 2020 03:40:59 +0300
Subject: [PATCH 0715/1142] Refactor to avoid visual inconsistency for beatmaps
 with no leaderboard

---
 .../BeatmapSet/BeatmapSetLayoutSection.cs     | 29 +++++++++++
 .../BeatmapSet/Scores/ScoresContainer.cs      | 17 +++----
 osu.Game/Overlays/BeatmapSetOverlay.cs        | 48 +++++--------------
 3 files changed, 49 insertions(+), 45 deletions(-)
 create mode 100644 osu.Game/Overlays/BeatmapSet/BeatmapSetLayoutSection.cs

diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapSetLayoutSection.cs b/osu.Game/Overlays/BeatmapSet/BeatmapSetLayoutSection.cs
new file mode 100644
index 0000000000..e6d433f7bc
--- /dev/null
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapSetLayoutSection.cs
@@ -0,0 +1,29 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.BeatmapSet
+{
+    public class BeatmapSetLayoutSection : Container
+    {
+        public BeatmapSetLayoutSection()
+        {
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+            Masking = true;
+            EdgeEffect = new EdgeEffectParameters
+            {
+                Colour = Color4.Black.Opacity(0.25f),
+                Type = EdgeEffectType.Shadow,
+                Radius = 3,
+                Offset = new Vector2(0f, 1f),
+            };
+        }
+    }
+}
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index e831c8ce42..7607eac1f8 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -19,7 +19,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Overlays.BeatmapSet.Scores
 {
-    public class ScoresContainer : CompositeDrawable
+    public class ScoresContainer : BeatmapSetLayoutSection
     {
         private const int spacing = 15;
 
@@ -34,7 +34,6 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
         private readonly LoadingLayer loading;
         private readonly LeaderboardModSelector modSelector;
         private readonly NoScoresPlaceholder noScoresPlaceholder;
-        private readonly FillFlowContainer content;
         private readonly NotSupporterPlaceholder notSupporterPlaceholder;
 
         [Resolved]
@@ -76,15 +75,13 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
 
         public ScoresContainer()
         {
-            RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
-            InternalChildren = new Drawable[]
+            AddRange(new Drawable[]
             {
                 background = new Box
                 {
                     RelativeSizeAxes = Axes.Both,
                 },
-                content = new FillFlowContainer
+                new FillFlowContainer
                 {
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
@@ -164,8 +161,8 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                             }
                         }
                     }
-                },
-            };
+                }
+            });
         }
 
         [BackgroundDependencyLoader]
@@ -223,7 +220,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             if (Beatmap.Value?.OnlineBeatmapID.HasValue != true || Beatmap.Value.Status <= BeatmapSetOnlineStatus.Pending)
             {
                 Scores = null;
-                content.Hide();
+                Hide();
                 return;
             }
 
@@ -237,7 +234,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
 
             notSupporterPlaceholder.Hide();
 
-            content.Show();
+            Show();
             loading.Show();
 
             getScoresRequest = new GetScoresRequest(Beatmap.Value, Beatmap.Value.Ruleset, scope.Value, modSelector.SelectedMods);
diff --git a/osu.Game/Overlays/BeatmapSetOverlay.cs b/osu.Game/Overlays/BeatmapSetOverlay.cs
index 5b5580f286..efa9e27f5c 100644
--- a/osu.Game/Overlays/BeatmapSetOverlay.cs
+++ b/osu.Game/Overlays/BeatmapSetOverlay.cs
@@ -4,10 +4,8 @@
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
@@ -18,7 +16,6 @@ using osu.Game.Overlays.BeatmapSet.Scores;
 using osu.Game.Overlays.Comments;
 using osu.Game.Rulesets;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
@@ -44,7 +41,7 @@ namespace osu.Game.Overlays
         {
             OsuScrollContainer scroll;
             Info info;
-            BeatmapSetCommentsContainer comments;
+            CommentsSection comments;
 
             Children = new Drawable[]
             {
@@ -56,7 +53,7 @@ namespace osu.Game.Overlays
                 {
                     RelativeSizeAxes = Axes.Both,
                     ScrollbarVisible = false,
-                    Child = new ReverseChildIDFillFlowContainer<Section>
+                    Child = new ReverseChildIDFillFlowContainer<BeatmapSetLayoutSection>
                     {
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
@@ -64,7 +61,7 @@ namespace osu.Game.Overlays
                         Spacing = new Vector2(0, 20),
                         Children = new[]
                         {
-                            new Section
+                            new BeatmapSetLayoutSection
                             {
                                 Child = new ReverseChildIDFillFlowContainer<Drawable>
                                 {
@@ -78,17 +75,11 @@ namespace osu.Game.Overlays
                                     }
                                 },
                             },
-                            new Section
+                            new ScoresContainer
                             {
-                                Child = new ScoresContainer
-                                {
-                                    Beatmap = { BindTarget = Header.Picker.Beatmap }
-                                }
+                                Beatmap = { BindTarget = Header.Picker.Beatmap }
                             },
-                            new Section
-                            {
-                                Child = comments = new BeatmapSetCommentsContainer()
-                            }
+                            comments = new CommentsSection()
                         },
                     },
                 },
@@ -160,29 +151,16 @@ namespace osu.Game.Overlays
             Show();
         }
 
-        private class Section : Container
-        {
-            public Section()
-            {
-                RelativeSizeAxes = Axes.X;
-                AutoSizeAxes = Axes.Y;
-                Masking = true;
-                EdgeEffect = new EdgeEffectParameters
-                {
-                    Colour = Color4.Black.Opacity(0.25f),
-                    Type = EdgeEffectType.Shadow,
-                    Radius = 3,
-                    Offset = new Vector2(0f, 1f),
-                };
-            }
-        }
-
-        private class BeatmapSetCommentsContainer : CommentsContainer
+        private class CommentsSection : BeatmapSetLayoutSection
         {
             public readonly Bindable<BeatmapSetInfo> BeatmapSet = new Bindable<BeatmapSetInfo>();
 
-            public BeatmapSetCommentsContainer()
+            public CommentsSection()
             {
+                CommentsContainer comments;
+
+                Add(comments = new CommentsContainer());
+
                 BeatmapSet.BindValueChanged(beatmapSet =>
                 {
                     if (beatmapSet.NewValue?.OnlineBeatmapSetID.HasValue != true)
@@ -192,7 +170,7 @@ namespace osu.Game.Overlays
                     else
                     {
                         Show();
-                        ShowComments(CommentableType.Beatmapset, beatmapSet.NewValue.OnlineBeatmapSetID.Value);
+                        comments.ShowComments(CommentableType.Beatmapset, beatmapSet.NewValue.OnlineBeatmapSetID.Value);
                     }
                 }, true);
             }

From c9d600b69c0320967e65aff73d8fd53d7c76cafe Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sat, 22 Feb 2020 09:39:17 +0100
Subject: [PATCH 0716/1142] Show RankingsOverlay when clicking on charts button

---
 osu.Game/Screens/Charts/ChartInfo.cs    |  9 ---------
 osu.Game/Screens/Charts/ChartListing.cs | 16 ----------------
 osu.Game/Screens/Menu/MainMenu.cs       |  5 ++---
 3 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 osu.Game/Screens/Charts/ChartInfo.cs
 delete mode 100644 osu.Game/Screens/Charts/ChartListing.cs

diff --git a/osu.Game/Screens/Charts/ChartInfo.cs b/osu.Game/Screens/Charts/ChartInfo.cs
deleted file mode 100644
index d9a9ad5eeb..0000000000
--- a/osu.Game/Screens/Charts/ChartInfo.cs
+++ /dev/null
@@ -1,9 +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.
-
-namespace osu.Game.Screens.Charts
-{
-    public class ChartInfo : ScreenWhiteBox
-    {
-    }
-}
diff --git a/osu.Game/Screens/Charts/ChartListing.cs b/osu.Game/Screens/Charts/ChartListing.cs
deleted file mode 100644
index 18bba6433f..0000000000
--- a/osu.Game/Screens/Charts/ChartListing.cs
+++ /dev/null
@@ -1,16 +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 System;
-using System.Collections.Generic;
-
-namespace osu.Game.Screens.Charts
-{
-    public class ChartListing : ScreenWhiteBox
-    {
-        protected override IEnumerable<Type> PossibleChildren => new[]
-        {
-            typeof(ChartInfo)
-        };
-    }
-}
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index c70fbb67a4..af5db4ce8c 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -18,7 +18,6 @@ using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Dialog;
 using osu.Game.Screens.Backgrounds;
-using osu.Game.Screens.Charts;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Multi;
 using osu.Game.Screens.Select;
@@ -73,7 +72,7 @@ namespace osu.Game.Screens.Menu
         private SongTicker songTicker;
 
         [BackgroundDependencyLoader(true)]
-        private void load(DirectOverlay direct, SettingsOverlay settings, OsuConfigManager config, SessionStatics statics)
+        private void load(DirectOverlay direct, SettingsOverlay settings, RankingsOverlay rankings, OsuConfigManager config, SessionStatics statics)
         {
             holdDelay = config.GetBindable<float>(OsuSetting.UIHoldActivationDelay);
             loginDisplayed = statics.GetBindable<bool>(Static.LoginOverlayDisplayed);
@@ -101,7 +100,6 @@ namespace osu.Game.Screens.Menu
                     {
                         buttons = new ButtonSystem
                         {
-                            OnChart = delegate { this.Push(new ChartListing()); },
                             OnEdit = delegate { this.Push(new Editor()); },
                             OnSolo = onSolo,
                             OnMulti = delegate { this.Push(new Multiplayer()); },
@@ -136,6 +134,7 @@ namespace osu.Game.Screens.Menu
 
             buttons.OnSettings = () => settings?.ToggleVisibility();
             buttons.OnDirect = () => direct?.ToggleVisibility();
+            buttons.OnChart = () => rankings?.ToggleVisibility();
 
             LoadComponentAsync(background = new BackgroundScreenDefault());
             preloadSongSelect();

From a512226036b43be8bd7a8d04f8630848d2aca2d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 22 Feb 2020 13:47:42 +0100
Subject: [PATCH 0717/1142] Use attribute instead of CreateChildDependencies

---
 osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs
index ccd428fe68..cb08cded37 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs
@@ -15,6 +15,7 @@ using osuTK;
 
 namespace osu.Game.Tests.Visual.Online
 {
+    [Cached(typeof(IPreviewTrackOwner))]
     public class TestSceneDirectPanel : OsuTestScene, IPreviewTrackOwner
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
@@ -24,13 +25,6 @@ namespace osu.Game.Tests.Visual.Online
             typeof(IconPill)
         };
 
-        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
-        {
-            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-            dependencies.CacheAs<IPreviewTrackOwner>(this);
-            return dependencies;
-        }
-
         private BeatmapSetInfo getUndownloadableBeatmapSet() => new BeatmapSetInfo
         {
             OnlineBeatmapSetID = 123,

From ab3cc9ada49a6ff7ab63e6e8a13acef7d34fe0d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 22 Feb 2020 16:25:00 +0100
Subject: [PATCH 0718/1142] Add log file location to issue templates

---
 .github/ISSUE_TEMPLATE/01-bug-issues.md   | 5 ++++-
 .github/ISSUE_TEMPLATE/02-crash-issues.md | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/01-bug-issues.md b/.github/ISSUE_TEMPLATE/01-bug-issues.md
index c8c41e5a78..0aff276d03 100644
--- a/.github/ISSUE_TEMPLATE/01-bug-issues.md
+++ b/.github/ISSUE_TEMPLATE/01-bug-issues.md
@@ -8,4 +8,7 @@ about: Issues regarding encountered bugs.
 
 **osu!lazer version:** 
 
-**Logs:** 
+**Logs:**
+*please attach logs here, which are located at:*
+- `%AppData%/osu/logs` *(on Windows),*
+- `~/.local/share/osu/logs` *(on Linux & macOS).*
diff --git a/.github/ISSUE_TEMPLATE/02-crash-issues.md b/.github/ISSUE_TEMPLATE/02-crash-issues.md
index 8ad27e9e31..9c3ae33161 100644
--- a/.github/ISSUE_TEMPLATE/02-crash-issues.md
+++ b/.github/ISSUE_TEMPLATE/02-crash-issues.md
@@ -8,6 +8,9 @@ about: Issues regarding crashes or permanent freezes.
 
 **osu!lazer version:** 
 
-**Logs:** 
+**Logs:**
+*please attach logs here, which are located at:*
+- `%AppData%/osu/logs` *(on Windows),*
+- `~/.local/share/osu/logs` *(on Linux & macOS).*
 
 **Computer Specifications:** 

From f696724c1d0354dfa4724cdea7d96af43f0fb134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 22 Feb 2020 16:26:10 +0100
Subject: [PATCH 0719/1142] Mention issue templates in README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f61f118ea8..ae57b1d954 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Rhythm is just a *click* away. The future of [osu!](https://osu.ppy.sh) and the
 
 This project is under heavy development, but is in a stable state. Users are encouraged to try it out and keep it installed alongside the stable *osu!* client. It will continue to evolve to the point of eventually replacing the existing stable client as an update.
 
-We are accepting bug reports (please report with as much detail as possible). Feature requests are also welcome, but understand that our focus is on completing the game to feature parity before adding new features. A few resources are available as starting points to getting involved and understanding the project:
+We are accepting bug reports (please report with as much detail as possible and follow the existing issue templates). Feature requests are also welcome, but understand that our focus is on completing the game to feature parity before adding new features. A few resources are available as starting points to getting involved and understanding the project:
 
 - Detailed release changelogs are available on the [official osu! site](https://osu.ppy.sh/home/changelog/lazer).
 - You can learn more about our approach to [project management](https://github.com/ppy/osu/wiki/Project-management).

From b8aef4ad4b6ea7ca8ef10ddd24108fd3b395fd1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 22 Feb 2020 16:50:56 +0100
Subject: [PATCH 0720/1142] Remove mobile issue template

---
 .github/ISSUE_TEMPLATE/00-mobile-issues.md | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/00-mobile-issues.md

diff --git a/.github/ISSUE_TEMPLATE/00-mobile-issues.md b/.github/ISSUE_TEMPLATE/00-mobile-issues.md
deleted file mode 100644
index f171e80b8b..0000000000
--- a/.github/ISSUE_TEMPLATE/00-mobile-issues.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: Mobile Report
-about: ⚠ Due to current development priorities we are not accepting mobile reports at this time (unless you're willing to fix them yourself!)
----
-
-⚠ **PLEASE READ** ⚠: Due to prioritising finishing the client for desktop first we are not accepting reports related to mobile platforms for the time being, unless you're willing to fix them.
-If you'd like to report a problem or suggest a feature and then work on it, feel free to open an issue and highlight that you'd like to address it yourself in the issue body; mobile pull requests are also welcome.
-Otherwise, please check back in the future when the focus of development shifts towards mobile!

From 5aa5a1bbdd0aab61055ff5d4d9224b201e32e860 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 23 Feb 2020 03:36:15 +0900
Subject: [PATCH 0721/1142] Reduce transform time of judgement lines (visually
 looks almost the same)

---
 osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
index 208bdd17ad..d54d4abd14 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
@@ -228,7 +228,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 
         private class JudgementLine : CompositeDrawable
         {
-            private const int judgement_fade_duration = 10000;
+            private const int judgement_fade_duration = 5000;
 
             public JudgementLine()
             {
@@ -255,7 +255,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
                 Width = 0;
 
                 this.ResizeWidthTo(1, 200, Easing.OutElasticHalf);
-                this.FadeTo(0.8f, 150).Then().FadeOut(judgement_fade_duration, Easing.OutQuint).Expire();
+                this.FadeTo(0.8f, 150).Then().FadeOut(judgement_fade_duration).Expire();
             }
         }
     }

From 3daa49f1bd2eb6be3881995c337cb3c8a57fc22e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 23 Feb 2020 03:39:12 +0900
Subject: [PATCH 0722/1142] Clean up old judgement lines if too many are
 already present

---
 osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
index d54d4abd14..48c74886a1 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
@@ -207,11 +207,16 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
         private double floatingAverage;
         private Container colourBars;
 
+        private const int max_concurrent_judgements = 50;
+
         public override void OnNewJudgement(JudgementResult judgement)
         {
             if (!judgement.IsHit)
                 return;
 
+            if (judgementsContainer.Count >= max_concurrent_judgements)
+                judgementsContainer.FirstOrDefault(j => j.LifetimeEnd > Clock.CurrentTime + 100)?.FadeOut(100).Expire();
+
             judgementsContainer.Add(new JudgementLine
             {
                 Y = getRelativeJudgementPosition(judgement.TimeOffset),

From e8ebb315175c994c47e1c53f70ee2c93efd532a9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 23 Feb 2020 03:53:51 +0900
Subject: [PATCH 0723/1142] Expire old judgement lines if too many exist

---
 .../Visual/Gameplay/TestSceneHitErrorMeter.cs   | 17 +++++++++++++++++
 .../Play/HUD/HitErrorMeters/BarHitErrorMeter.cs | 12 +++++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
index 8904b54b0d..5f2200b049 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
@@ -9,6 +9,7 @@ using osu.Game.Rulesets.Judgements;
 using osu.Framework.Utils;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Threading;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Catch.Scoring;
 using osu.Game.Rulesets.Mania.Scoring;
@@ -43,6 +44,22 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddRepeatStep("New max negative", () => newJudgement(-hitWindows.WindowFor(HitResult.Meh)), 20);
             AddRepeatStep("New max positive", () => newJudgement(hitWindows.WindowFor(HitResult.Meh)), 20);
             AddStep("New fixed judgement (50ms)", () => newJudgement(50));
+
+            AddStep("Judgement barrage", () =>
+            {
+                int runCount = 0;
+
+                ScheduledDelegate del = null;
+
+                del = Scheduler.AddDelayed(() =>
+                {
+                    newJudgement(runCount++ / 10f);
+
+                    if (runCount == 500)
+                        // ReSharper disable once AccessToModifiedClosure
+                        del?.Cancel();
+                }, 10, true);
+            });
         }
 
         [Test]
diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
index 48c74886a1..c297ddc981 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
@@ -215,7 +215,17 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
                 return;
 
             if (judgementsContainer.Count >= max_concurrent_judgements)
-                judgementsContainer.FirstOrDefault(j => j.LifetimeEnd > Clock.CurrentTime + 100)?.FadeOut(100).Expire();
+            {
+                const double quick_fade_time = 100;
+
+                var old = judgementsContainer.FirstOrDefault(j => j.LifetimeEnd > Clock.CurrentTime + quick_fade_time);
+
+                if (old != null)
+                {
+                    old.ClearTransforms();
+                    old.FadeOut(quick_fade_time).Expire();
+                }
+            }
 
             judgementsContainer.Add(new JudgementLine
             {

From cb9a7ee0bb9366caf92e4994825d9554d73a8862 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 23 Feb 2020 04:05:37 +0900
Subject: [PATCH 0724/1142] Give FollowPointConnections a valid lifetime

---
 .../Connections/FollowPointConnection.cs      | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
index a5e89210f6..7165697022 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
@@ -20,6 +20,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
         private const int spacing = 32;
         private const double preempt = 800;
 
+        public override bool RemoveWhenNotAlive => false;
+
         /// <summary>
         /// The start time of <see cref="Start"/>.
         /// </summary>
@@ -79,27 +81,31 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
             drawableObject.HitObject.DefaultsApplied += scheduleRefresh;
         }
 
-        private void scheduleRefresh() => Scheduler.AddOnce(refresh);
+        private void scheduleRefresh()
+        {
+            Scheduler.AddOnce(refresh);
+        }
 
         private void refresh()
         {
             ClearInternal();
 
-            if (End == null)
-                return;
-
             OsuHitObject osuStart = Start.HitObject;
-            OsuHitObject osuEnd = End.HitObject;
+            double startTime = osuStart.GetEndTime();
 
-            if (osuEnd.NewCombo)
-                return;
+            LifetimeStart = startTime;
 
-            if (osuStart is Spinner || osuEnd is Spinner)
+            OsuHitObject osuEnd = End?.HitObject;
+
+            if (osuEnd == null || osuEnd.NewCombo || osuStart is Spinner || osuEnd is Spinner)
+            {
+                // ensure we always set a lifetime for full LifetimeManagementContainer benefits
+                LifetimeEnd = LifetimeStart;
                 return;
+            }
 
             Vector2 startPosition = osuStart.EndPosition;
             Vector2 endPosition = osuEnd.Position;
-            double startTime = osuStart.GetEndTime();
             double endTime = osuEnd.StartTime;
 
             Vector2 distanceVector = endPosition - startPosition;
@@ -107,6 +113,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
             float rotation = (float)(Math.Atan2(distanceVector.Y, distanceVector.X) * (180 / Math.PI));
             double duration = endTime - startTime;
 
+            double finalTransformEndTime = startTime;
+
             for (int d = (int)(spacing * 1.5); d < distance - spacing; d += spacing)
             {
                 float fraction = (float)d / distance;
@@ -131,10 +139,13 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
                     fp.ScaleTo(osuEnd.Scale, osuEnd.TimeFadeIn, Easing.Out);
                     fp.MoveTo(pointEndPosition, osuEnd.TimeFadeIn, Easing.Out);
                     fp.Delay(fadeOutTime - fadeInTime).FadeOut(osuEnd.TimeFadeIn);
-                }
 
-                fp.Expire(true);
+                    finalTransformEndTime = fadeOutTime + osuEnd.TimeFadeIn;
+                }
             }
+
+            LifetimeStart = startTime;
+            LifetimeEnd = finalTransformEndTime;
         }
     }
 }

From 090d9d93506a8a8e658b1e0bd990f6f9107eebc6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 23 Feb 2020 04:37:04 +0900
Subject: [PATCH 0725/1142] Make FollowPointRenderer a
 LifetimeManagementContainer

---
 .../Objects/Drawables/Connections/FollowPointRenderer.cs    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
index be192080f9..4d73e711bb 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
     /// <summary>
     /// Visualises connections between <see cref="DrawableOsuHitObject"/>s.
     /// </summary>
-    public class FollowPointRenderer : CompositeDrawable
+    public class FollowPointRenderer : LifetimeManagementContainer
     {
         /// <summary>
         /// All the <see cref="FollowPointConnection"/>s contained by this <see cref="FollowPointRenderer"/>.
@@ -45,8 +45,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
         /// <returns>The index of <paramref name="connection"/> in <see cref="connections"/>.</returns>
         private void addConnection(FollowPointConnection connection)
         {
-            AddInternal(connection);
-
             // Groups are sorted by their start time when added such that the index can be used to post-process other surrounding connections
             int index = connections.AddInPlace(connection, Comparer<FollowPointConnection>.Create((g1, g2) => g1.StartTime.Value.CompareTo(g2.StartTime.Value)));
 
@@ -74,6 +72,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
                 FollowPointConnection previousConnection = connections[index - 1];
                 previousConnection.End = connection.Start;
             }
+
+            AddInternal(connection);
         }
 
         /// <summary>

From 8dbcdebd287b5d1a9b73c4d6f499a481c0d47eeb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 23 Feb 2020 04:58:52 +0900
Subject: [PATCH 0726/1142] Use LoadingLayer at player loading screen

---
 osu.Game/Graphics/UserInterface/LoadingLayer.cs | 2 +-
 osu.Game/Screens/Play/BeatmapMetadataDisplay.cs | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/LoadingLayer.cs b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
index 25a62acaba..35b33c3d03 100644
--- a/osu.Game/Graphics/UserInterface/LoadingLayer.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Graphics.UserInterface
         protected override void Update()
         {
             base.Update();
-            MainContents.Size = new Vector2(Math.Min(100, Math.Min(DrawWidth, DrawHeight) * 0.25f));
+            MainContents.Size = new Vector2(Math.Clamp(Math.Min(DrawWidth, DrawHeight) * 0.25f, 30, 100));
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
index 77ee52f23e..a84a85ea47 100644
--- a/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
+++ b/osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
@@ -15,7 +15,6 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play.HUD;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Screens.Play
 {
@@ -63,15 +62,9 @@ namespace osu.Game.Screens.Play
             set
             {
                 if (value)
-                {
                     loading.Show();
-                    backgroundSprite.FadeColour(OsuColour.Gray(0.5f), 400, Easing.OutQuint);
-                }
                 else
-                {
                     loading.Hide();
-                    backgroundSprite.FadeColour(Color4.White, 400, Easing.OutQuint);
-                }
             }
         }
 
@@ -138,7 +131,7 @@ namespace osu.Game.Screens.Play
                                     Anchor = Anchor.Centre,
                                     FillMode = FillMode.Fill,
                                 },
-                                loading = new LoadingSpinner { Scale = new Vector2(1.3f) }
+                                loading = new LoadingLayer(backgroundSprite)
                             }
                         },
                         new OsuSpriteText

From aaa888a7c14b25aef453e4de785b835b73d26013 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 23 Feb 2020 05:00:38 +0900
Subject: [PATCH 0727/1142] Adjust spin duration to make rotation more variable

---
 osu.Game/Graphics/UserInterface/LoadingSpinner.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/UserInterface/LoadingSpinner.cs b/osu.Game/Graphics/UserInterface/LoadingSpinner.cs
index b5a235f9d8..36d429b8c1 100644
--- a/osu.Game/Graphics/UserInterface/LoadingSpinner.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingSpinner.cs
@@ -93,7 +93,7 @@ namespace osu.Game.Graphics.UserInterface
 
         private void rotate()
         {
-            spinner.Spin(spin_duration * 4, RotationDirection.Clockwise);
+            spinner.Spin(spin_duration * 3.5f, RotationDirection.Clockwise);
 
             MainContents.RotateTo(0).Then()
                         .RotateTo(90, spin_duration, Easing.InOutQuart).Then()

From beb18006dacb2ae2ba2cddbb078bd8ec6a0c0c12 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 19 Feb 2020 20:18:02 +0100
Subject: [PATCH 0728/1142] Show 0 pp if map is loved

---
 osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs               | 2 +-
 .../Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index f1250679c1..7baf6c7fcb 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -154,7 +154,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             {
                 new OsuSpriteText
                 {
-                    Text = $@"{score.PP:N0}",
+                    Text = $@"{score.PP ?? 0:N0}",
                     Font = OsuFont.GetFont(size: text_size)
                 },
                 new FillFlowContainer
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index a15dc57d23..0616871897 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -96,7 +96,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 totalScoreColumn.Text = $@"{value.TotalScore:N0}";
                 accuracyColumn.Text = value.DisplayAccuracy;
                 maxComboColumn.Text = $@"{value.MaxCombo:N0}x";
-                ppColumn.Text = $@"{value.PP:N0}";
+                ppColumn.Text = $@"{value.PP ?? 0:N0}";
 
                 statisticsColumns.ChildrenEnumerable = value.SortedStatistics.Select(kvp => createStatisticsColumn(kvp.Key, kvp.Value));
                 modsColumn.Mods = value.Mods;

From 560cf21b12af41a100aa276f1a589263b7baed75 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 23 Feb 2020 05:28:59 +0900
Subject: [PATCH 0729/1142] Add lenience to comparison

Noticed that they could still stack up on maps with hitcircles at the same point in time (centipede).
---
 osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
index c297ddc981..9edbddc0b1 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
@@ -214,11 +214,12 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
             if (!judgement.IsHit)
                 return;
 
-            if (judgementsContainer.Count >= max_concurrent_judgements)
+            if (judgementsContainer.Count > max_concurrent_judgements)
             {
                 const double quick_fade_time = 100;
 
-                var old = judgementsContainer.FirstOrDefault(j => j.LifetimeEnd > Clock.CurrentTime + quick_fade_time);
+                // check with a bit of lenience to avoid precision error in comparison.
+                var old = judgementsContainer.FirstOrDefault(j => j.LifetimeEnd > Clock.CurrentTime + quick_fade_time * 1.1);
 
                 if (old != null)
                 {

From 74c7e29108e9bc610ccd635c133211115d7a50c7 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 23 Feb 2020 01:22:37 +0300
Subject: [PATCH 0730/1142] Apply suggestions

---
 osu.Game/Overlays/Changelog/ChangelogBuild.cs    | 5 +++--
 osu.Game/Overlays/Changelog/UpdateStreamBadge.cs | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Changelog/ChangelogBuild.cs b/osu.Game/Overlays/Changelog/ChangelogBuild.cs
index 94bb8b5abe..8aee76cb08 100644
--- a/osu.Game/Overlays/Changelog/ChangelogBuild.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogBuild.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Overlays.Changelog
                                 Origin = Anchor.CentreRight,
                                 Size = new Vector2(10),
                                 Icon = entry.Type == ChangelogEntryType.Fix ? FontAwesome.Solid.Check : FontAwesome.Solid.Plus,
-                                Colour = entryColour.Darken(0.7f),
+                                Colour = entryColour.Opacity(0.5f),
                                 Margin = new MarginPadding { Right = 5 },
                             },
                             title = new LinkFlowContainer
@@ -123,10 +123,11 @@ namespace osu.Game.Overlays.Changelog
                         });
                     }
 
-                    title.AddText("  by ", t =>
+                    title.AddText("by ", t =>
                     {
                         t.Font = fontMedium.With(italics: true);
                         t.Colour = entryColour;
+                        t.Padding = new MarginPadding { Left = 10 };
                     });
 
                     if (entry.GithubUser.UserId != null)
diff --git a/osu.Game/Overlays/Changelog/UpdateStreamBadge.cs b/osu.Game/Overlays/Changelog/UpdateStreamBadge.cs
index 99929058e2..10aca31441 100644
--- a/osu.Game/Overlays/Changelog/UpdateStreamBadge.cs
+++ b/osu.Game/Overlays/Changelog/UpdateStreamBadge.cs
@@ -69,7 +69,7 @@ namespace osu.Game.Overlays.Changelog
                                 },
                                 new OsuSpriteText
                                 {
-                                    Text = stream.LatestBuild.Users > 0 ? $"{stream.LatestBuild.Users:N0} {"user".Pluralize(stream.LatestBuild.Users == 1)} online" : null,
+                                    Text = stream.LatestBuild.Users > 0 ? $"{"user".ToQuantity(stream.LatestBuild.Users, "N0")} online" : null,
                                     Font = OsuFont.GetFont(size: 10),
                                     Colour = colourProvider.Foreground1
                                 },

From ffc7eaa3f212d50a44bf1692b6111bd007f8eb72 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 23 Feb 2020 13:01:30 +0900
Subject: [PATCH 0731/1142] Fix hitobjects with unknown lifetimes by enforcing
 non-null judgement

We've seen multiple cases where DrawableHitObject are stuck in the lifetime management container
due to not implementing a judgement (meaning they are never "hit" or "missed"). To avoid this going forward
CreateJudgement() must be implemented and return a non-null judgement.

This fixes BananaShower and JuiceStreams in osu!catch.

This also makes HitObject abstract and cleans up convert HitObject implementations.
---
 .../Objects/BananaShower.cs                    |  3 +++
 osu.Game.Rulesets.Catch/Objects/JuiceStream.cs |  3 +++
 .../TestSceneDrawableJudgement.cs              |  2 +-
 .../Judgements/HoldNoteJudgement.cs            | 14 --------------
 osu.Game.Rulesets.Mania/Objects/BarLine.cs     |  3 +++
 osu.Game.Rulesets.Mania/Objects/HoldNote.cs    |  3 +--
 .../TestSceneDrawableJudgement.cs              |  2 +-
 .../Judgements/OsuSliderTailJudgement.cs       | 14 --------------
 .../Objects/SliderTailCircle.cs                |  3 +--
 .../TestSceneSwellJudgements.cs                |  3 +--
 .../TestSceneTaikoPlayfield.cs                 |  8 ++++----
 osu.Game.Rulesets.Taiko/Objects/SwellTick.cs   |  3 +--
 .../TestSceneDrainingHealthProcessor.cs        |  1 +
 .../Gameplay/TestSceneHitObjectAccentColour.cs |  2 +-
 .../Gameplay/TestSceneHitObjectContainer.cs    | 12 ++++++------
 .../TestSceneDrawableScrollingRuleset.cs       |  4 ++--
 .../Visual/Gameplay/TestSceneHitErrorMeter.cs  |  2 +-
 .../Gameplay/TestSceneScrollingHitObjects.cs   |  4 ++--
 .../Visual/Gameplay/TestSceneSongProgress.cs   |  4 ++--
 .../SongSelect/TestSceneBeatmapInfoWedge.cs    |  2 +-
 .../Rulesets/Judgements/IgnoreJudgement.cs     |  6 +++---
 osu.Game/Rulesets/Objects/ConvertHitObject.cs  | 18 ++++++++++++++++++
 osu.Game/Rulesets/Objects/HitObject.cs         | 11 ++++++-----
 .../Objects/Legacy/Catch/ConvertHit.cs         |  2 +-
 .../Objects/Legacy/Catch/ConvertSpinner.cs     |  2 +-
 .../Rulesets/Objects/Legacy/ConvertSlider.cs   |  2 +-
 .../Objects/Legacy/Mania/ConvertHit.cs         |  5 +----
 .../Objects/Legacy/Mania/ConvertHold.cs        |  5 +----
 .../Objects/Legacy/Mania/ConvertSlider.cs      |  3 ---
 .../Objects/Legacy/Mania/ConvertSpinner.cs     |  5 +----
 .../Rulesets/Objects/Legacy/Osu/ConvertHit.cs  |  5 +----
 .../Objects/Legacy/Osu/ConvertSlider.cs        |  3 ---
 .../Objects/Legacy/Osu/ConvertSpinner.cs       |  5 +----
 .../Objects/Legacy/Taiko/ConvertHit.cs         |  5 +----
 .../Objects/Legacy/Taiko/ConvertSlider.cs      |  3 ---
 .../Objects/Legacy/Taiko/ConvertSpinner.cs     |  5 +----
 36 files changed, 72 insertions(+), 105 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Mania/Judgements/HoldNoteJudgement.cs
 delete mode 100644 osu.Game.Rulesets.Osu/Judgements/OsuSliderTailJudgement.cs
 rename osu.Game.Rulesets.Taiko/Judgements/TaikoSwellTickJudgement.cs => osu.Game/Rulesets/Judgements/IgnoreJudgement.cs (63%)
 create mode 100644 osu.Game/Rulesets/Objects/ConvertHitObject.cs

diff --git a/osu.Game.Rulesets.Catch/Objects/BananaShower.cs b/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
index 0c754412e5..c3488aec11 100644
--- a/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
+++ b/osu.Game.Rulesets.Catch/Objects/BananaShower.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Rulesets.Catch.Objects
@@ -11,6 +12,8 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         public override bool LastInCombo => true;
 
+        public override Judgement CreateJudgement() => new IgnoreJudgement();
+
         protected override void CreateNestedHitObjects()
         {
             base.CreateNestedHitObjects();
diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index 11e2466275..642ff0246e 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -7,6 +7,7 @@ using osu.Game.Audio;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Catch.UI;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 
@@ -19,6 +20,8 @@ namespace osu.Game.Rulesets.Catch.Objects
         /// </summary>
         private const float base_scoring_distance = 100;
 
+        public override Judgement CreateJudgement() => new IgnoreJudgement();
+
         public int RepeatCount { get; set; }
 
         public double Velocity;
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableJudgement.cs
index 692d079c16..7b71f2feda 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableJudgement.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableJudgement.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             foreach (HitResult result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Skip(1))
             {
                 AddStep("Show " + result.GetDescription(), () => SetContents(() =>
-                    new DrawableManiaJudgement(new JudgementResult(new HitObject(), new Judgement()) { Type = result }, null)
+                    new DrawableManiaJudgement(new JudgementResult(new ConvertHitObject(), new Judgement()) { Type = result }, null)
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Mania/Judgements/HoldNoteJudgement.cs b/osu.Game.Rulesets.Mania/Judgements/HoldNoteJudgement.cs
deleted file mode 100644
index e8b48768a1..0000000000
--- a/osu.Game.Rulesets.Mania/Judgements/HoldNoteJudgement.cs
+++ /dev/null
@@ -1,14 +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.Game.Rulesets.Scoring;
-
-namespace osu.Game.Rulesets.Mania.Judgements
-{
-    public class HoldNoteJudgement : ManiaJudgement
-    {
-        public override bool AffectsCombo => false;
-
-        protected override int NumericResultFor(HitResult result) => 0;
-    }
-}
diff --git a/osu.Game.Rulesets.Mania/Objects/BarLine.cs b/osu.Game.Rulesets.Mania/Objects/BarLine.cs
index 0981b028b2..09a746042b 100644
--- a/osu.Game.Rulesets.Mania/Objects/BarLine.cs
+++ b/osu.Game.Rulesets.Mania/Objects/BarLine.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Rulesets.Mania.Objects
@@ -8,5 +9,7 @@ namespace osu.Game.Rulesets.Mania.Objects
     public class BarLine : ManiaHitObject, IBarLine
     {
         public bool Major { get; set; }
+
+        public override Judgement CreateJudgement() => new IgnoreJudgement();
     }
 }
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
index 86d3d2b2b0..049bf55f90 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
@@ -4,7 +4,6 @@
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Mania.Judgements;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Scoring;
 
@@ -103,7 +102,7 @@ namespace osu.Game.Rulesets.Mania.Objects
             }
         }
 
-        public override Judgement CreateJudgement() => new HoldNoteJudgement();
+        public override Judgement CreateJudgement() => new IgnoreJudgement();
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
index 02d4406809..8f72e2f60d 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             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)
+                    new DrawableOsuJudgement(new JudgementResult(new ConvertHitObject(), new Judgement()) { Type = result }, null)
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Osu/Judgements/OsuSliderTailJudgement.cs b/osu.Game.Rulesets.Osu/Judgements/OsuSliderTailJudgement.cs
deleted file mode 100644
index 5104d9494b..0000000000
--- a/osu.Game.Rulesets.Osu/Judgements/OsuSliderTailJudgement.cs
+++ /dev/null
@@ -1,14 +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.Game.Rulesets.Scoring;
-
-namespace osu.Game.Rulesets.Osu.Judgements
-{
-    public class OsuSliderTailJudgement : OsuJudgement
-    {
-        public override bool AffectsCombo => false;
-
-        protected override int NumericResultFor(HitResult result) => 0;
-    }
-}
diff --git a/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs b/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
index c17d2275b8..127c36fcc0 100644
--- a/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
@@ -4,7 +4,6 @@
 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
@@ -23,7 +22,7 @@ namespace osu.Game.Rulesets.Osu.Objects
             pathVersion.BindValueChanged(_ => Position = slider.EndPosition);
         }
 
-        public override Judgement CreateJudgement() => new OsuSliderTailJudgement();
+        public override Judgement CreateJudgement() => new IgnoreJudgement();
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneSwellJudgements.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneSwellJudgements.cs
index f27e329e8e..ccacc50de1 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneSwellJudgements.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneSwellJudgements.cs
@@ -8,7 +8,6 @@ using osu.Framework.Allocation;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Rulesets.Taiko.Judgements;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Screens.Play;
 using osu.Game.Tests.Visual;
@@ -28,7 +27,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
         public void TestZeroTickTimeOffsets()
         {
             AddUntilStep("gameplay finished", () => Player.ScoreProcessor.HasCompleted);
-            AddAssert("all tick offsets are 0", () => Player.Results.Where(r => r.Judgement is TaikoSwellTickJudgement).All(r => r.TimeOffset == 0));
+            AddAssert("all tick offsets are 0", () => Player.Results.Where(r => r.HitObject is SwellTick).All(r => r.TimeOffset == 0));
         }
 
         protected override bool Autoplay => true;
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayfield.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayfield.cs
index c01eef5252..c8c4d004d6 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayfield.cs
@@ -148,7 +148,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             var h = new DrawableTestHit(hit) { X = RNG.NextSingle(hitResult == HitResult.Good ? -0.1f : -0.05f, hitResult == HitResult.Good ? 0.1f : 0.05f) };
 
-            ((TaikoPlayfield)drawableRuleset.Playfield).OnNewResult(h, new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = hitResult });
+            ((TaikoPlayfield)drawableRuleset.Playfield).OnNewResult(h, new JudgementResult(new ConvertHitObject(), new TaikoJudgement()) { Type = hitResult });
         }
 
         private void addStrongHitJudgement(bool kiai)
@@ -163,13 +163,13 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             var h = new DrawableTestHit(hit) { X = RNG.NextSingle(hitResult == HitResult.Good ? -0.1f : -0.05f, hitResult == HitResult.Good ? 0.1f : 0.05f) };
 
-            ((TaikoPlayfield)drawableRuleset.Playfield).OnNewResult(h, new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = hitResult });
-            ((TaikoPlayfield)drawableRuleset.Playfield).OnNewResult(new TestStrongNestedHit(h), new JudgementResult(new HitObject(), new TaikoStrongJudgement()) { Type = HitResult.Great });
+            ((TaikoPlayfield)drawableRuleset.Playfield).OnNewResult(h, new JudgementResult(new ConvertHitObject(), new TaikoJudgement()) { Type = hitResult });
+            ((TaikoPlayfield)drawableRuleset.Playfield).OnNewResult(new TestStrongNestedHit(h), new JudgementResult(new ConvertHitObject(), new TaikoStrongJudgement()) { Type = HitResult.Great });
         }
 
         private void addMissJudgement()
         {
-            ((TaikoPlayfield)drawableRuleset.Playfield).OnNewResult(new DrawableTestHit(new Hit()), new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = HitResult.Miss });
+            ((TaikoPlayfield)drawableRuleset.Playfield).OnNewResult(new DrawableTestHit(new Hit()), new JudgementResult(new ConvertHitObject(), new TaikoJudgement()) { Type = HitResult.Miss });
         }
 
         private void addBarLine(bool major, double delay = scroll_time)
diff --git a/osu.Game.Rulesets.Taiko/Objects/SwellTick.cs b/osu.Game.Rulesets.Taiko/Objects/SwellTick.cs
index 91f4d3dbe7..bdc0478195 100644
--- a/osu.Game.Rulesets.Taiko/Objects/SwellTick.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/SwellTick.cs
@@ -3,13 +3,12 @@
 
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
-using osu.Game.Rulesets.Taiko.Judgements;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {
     public class SwellTick : TaikoHitObject
     {
-        public override Judgement CreateJudgement() => new TaikoSwellTickJudgement();
+        public override Judgement CreateJudgement() => new IgnoreJudgement();
 
         protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
diff --git a/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs b/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs
index 244e37f017..885abb61b5 100644
--- a/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneDrainingHealthProcessor.cs
@@ -154,6 +154,7 @@ namespace osu.Game.Tests.Gameplay
         private class JudgeableHitObject : HitObject
         {
             public override Judgement CreateJudgement() => new Judgement();
+            protected override HitWindows CreateHitWindows() => new HitWindows();
         }
     }
 }
diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
index 17dc27543d..e99a10524e 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Tests.Gameplay
             }
         }
 
-        private class TestHitObjectWithCombo : HitObject, IHasComboInformation
+        private class TestHitObjectWithCombo : ConvertHitObject, IHasComboInformation
         {
             public bool NewCombo { get; } = false;
             public int ComboOffset { get; } = 0;
diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectContainer.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectContainer.cs
index f2bfccb6de..6452857bad 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectContainer.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectContainer.cs
@@ -27,9 +27,9 @@ namespace osu.Game.Tests.Gameplay
         {
             DrawableHitObject hitObject = null;
 
-            AddStep("setup", () => container.Add(new TestDrawableHitObject(new HitObject { StartTime = 500 })));
+            AddStep("setup", () => container.Add(new TestDrawableHitObject(new ConvertHitObject { StartTime = 500 })));
 
-            AddStep("add late hitobject", () => container.Add(hitObject = new TestDrawableHitObject(new HitObject { StartTime = 1000 })));
+            AddStep("add late hitobject", () => container.Add(hitObject = new TestDrawableHitObject(new ConvertHitObject { StartTime = 1000 })));
 
             AddAssert("hitobject index is 0", () => container.IndexOf(hitObject) == 0);
         }
@@ -39,9 +39,9 @@ namespace osu.Game.Tests.Gameplay
         {
             DrawableHitObject hitObject = null;
 
-            AddStep("setup", () => container.Add(new TestDrawableHitObject(new HitObject { StartTime = 500 })));
+            AddStep("setup", () => container.Add(new TestDrawableHitObject(new ConvertHitObject { StartTime = 500 })));
 
-            AddStep("add early hitobject", () => container.Add(hitObject = new TestDrawableHitObject(new HitObject())));
+            AddStep("add early hitobject", () => container.Add(hitObject = new TestDrawableHitObject(new ConvertHitObject())));
 
             AddAssert("hitobject index is 0", () => container.IndexOf(hitObject) == 1);
         }
@@ -54,8 +54,8 @@ namespace osu.Game.Tests.Gameplay
 
             AddStep("setup", () =>
             {
-                container.Add(firstObject = new TestDrawableHitObject(new HitObject()));
-                container.Add(secondObject = new TestDrawableHitObject(new HitObject { StartTime = 1000 }));
+                container.Add(firstObject = new TestDrawableHitObject(new ConvertHitObject()));
+                container.Add(secondObject = new TestDrawableHitObject(new ConvertHitObject { StartTime = 1000 }));
             });
 
             AddStep("move first object after second", () => firstObject.HitObject.StartTime = 2000);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
index 46f62b9541..d350c3d58d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
@@ -163,7 +163,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             var beatmap = new Beatmap<HitObject> { BeatmapInfo = { Ruleset = new OsuRuleset().RulesetInfo } };
 
             for (int i = 0; i < 10; i++)
-                beatmap.HitObjects.Add(new HitObject { StartTime = i * time_range });
+                beatmap.HitObjects.Add(new ConvertHitObject { StartTime = i * time_range });
 
             return beatmap;
         }
@@ -289,7 +289,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         #region HitObject
 
-        private class TestHitObject : HitObject, IHasEndTime
+        private class TestHitObject : ConvertHitObject, IHasEndTime
         {
             public double EndTime { get; set; }
 
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
index 8904b54b0d..494611d414 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
@@ -124,7 +124,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void newJudgement(double offset = 0)
         {
-            var judgement = new JudgementResult(new HitObject(), new Judgement())
+            var judgement = new JudgementResult(new ConvertHitObject(), new Judgement())
             {
                 TimeOffset = offset == 0 ? RNG.Next(-150, 150) : offset,
                 Type = HitResult.Perfect,
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
index d03716db2e..c2a71eadae 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
@@ -224,7 +224,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private class TestDrawableControlPoint : DrawableHitObject<HitObject>
         {
             public TestDrawableControlPoint(ScrollingDirection direction, double time)
-                : base(new HitObject { StartTime = time })
+                : base(new ConvertHitObject { StartTime = time })
             {
                 Origin = Anchor.Centre;
 
@@ -255,7 +255,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private class TestDrawableHitObject : DrawableHitObject<HitObject>
         {
             public TestDrawableHitObject(double time)
-                : base(new HitObject { StartTime = time })
+                : base(new ConvertHitObject { StartTime = time })
             {
                 Origin = Anchor.Custom;
                 OriginPosition = new Vector2(75 / 4.0f);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
index b9b13d7bd8..6a60ae110b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
@@ -123,7 +123,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             var objects = new List<HitObject>();
             for (double i = 0; i < 5000; i += RNG.NextDouble() * 10 + i / 1000)
-                objects.Add(new HitObject { StartTime = i });
+                objects.Add(new ConvertHitObject { StartTime = i });
 
             replaceObjects(objects);
         }
@@ -132,7 +132,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             var objects = new List<HitObject>();
             for (double i = 0; i < 5000; i++)
-                objects.Add(new HitObject { StartTime = i });
+                objects.Add(new ConvertHitObject { StartTime = i });
 
             replaceObjects(objects);
         }
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index f49d7a14a6..5cac897200 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -194,7 +194,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             public new BufferedWedgeInfo Info => base.Info;
         }
 
-        private class TestHitObject : HitObject, IHasPosition
+        private class TestHitObject : ConvertHitObject, IHasPosition
         {
             public float X { get; } = 0;
             public float Y { get; } = 0;
diff --git a/osu.Game.Rulesets.Taiko/Judgements/TaikoSwellTickJudgement.cs b/osu.Game/Rulesets/Judgements/IgnoreJudgement.cs
similarity index 63%
rename from osu.Game.Rulesets.Taiko/Judgements/TaikoSwellTickJudgement.cs
rename to osu.Game/Rulesets/Judgements/IgnoreJudgement.cs
index b28b6a0d17..1871249c94 100644
--- a/osu.Game.Rulesets.Taiko/Judgements/TaikoSwellTickJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/IgnoreJudgement.cs
@@ -1,11 +1,11 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Scoring;
 
-namespace osu.Game.Rulesets.Taiko.Judgements
+namespace osu.Game.Rulesets.Judgements
 {
-    public class TaikoSwellTickJudgement : TaikoJudgement
+    public class IgnoreJudgement : Judgement
     {
         public override bool AffectsCombo => false;
 
diff --git a/osu.Game/Rulesets/Objects/ConvertHitObject.cs b/osu.Game/Rulesets/Objects/ConvertHitObject.cs
new file mode 100644
index 0000000000..81a88615a3
--- /dev/null
+++ b/osu.Game/Rulesets/Objects/ConvertHitObject.cs
@@ -0,0 +1,18 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Rulesets.Objects
+{
+    /// <summary>
+    /// A hit object only used for conversion, not actual gameplay.
+    /// </summary>
+    public class ConvertHitObject : HitObject
+    {
+        public override Judgement CreateJudgement() => new IgnoreJudgement();
+
+        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
+    }
+}
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index c09844e0c6..bef48f0ced 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Objects
     /// HitObjects may contain more properties for which you should be checking through the IHas* types.
     /// </para>
     /// </summary>
-    public class HitObject
+    public abstract class HitObject
     {
         /// <summary>
         /// A small adjustment to the start time of control points to account for rounding/precision errors.
@@ -83,7 +83,7 @@ namespace osu.Game.Rulesets.Objects
         [JsonIgnore]
         public IReadOnlyList<HitObject> NestedHitObjects => nestedHitObjects;
 
-        public HitObject()
+        protected HitObject()
         {
             StartTimeBindable.ValueChanged += time =>
             {
@@ -144,9 +144,10 @@ namespace osu.Game.Rulesets.Objects
 
         /// <summary>
         /// Creates the <see cref="Judgement"/> that represents the scoring information for this <see cref="HitObject"/>.
-        /// May be null.
+        /// Used to decide on drawable object lifetimes.
         /// </summary>
-        public virtual Judgement CreateJudgement() => null;
+        [NotNull]
+        public abstract Judgement CreateJudgement();
 
         /// <summary>
         /// Creates the <see cref="HitWindows"/> for this <see cref="HitObject"/>.
@@ -156,7 +157,7 @@ namespace osu.Game.Rulesets.Objects
         /// </para>
         /// </summary>
         [NotNull]
-        protected virtual HitWindows CreateHitWindows() => new HitWindows();
+        protected abstract HitWindows CreateHitWindows();
     }
 
     public static class HitObjectExtensions
diff --git a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHit.cs b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHit.cs
index febfd3696c..19722fb796 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHit.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHit.cs
@@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
     /// <summary>
     /// Legacy osu!catch Hit-type, used for parsing Beatmaps.
     /// </summary>
-    internal sealed class ConvertHit : HitObject, IHasCombo, IHasXPosition
+    internal sealed class ConvertHit : ConvertHitObject, IHasCombo, IHasXPosition
     {
         public float X { get; set; }
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSpinner.cs
index 0089d1eb88..9de311c9d7 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSpinner.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Catch/ConvertSpinner.cs
@@ -8,7 +8,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Catch
     /// <summary>
     /// Legacy osu!catch Spinner-type, used for parsing Beatmaps.
     /// </summary>
-    internal sealed class ConvertSpinner : HitObject, IHasEndTime, IHasXPosition, IHasCombo
+    internal sealed class ConvertSpinner : ConvertHitObject, IHasEndTime, IHasXPosition, IHasCombo
     {
         public double EndTime { get; set; }
 
diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
index 53cdf457c4..924182b265 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
@@ -9,7 +9,7 @@ using osu.Game.Beatmaps.ControlPoints;
 
 namespace osu.Game.Rulesets.Objects.Legacy
 {
-    internal abstract class ConvertSlider : HitObject, IHasCurve, IHasLegacyLastTickOffset
+    internal abstract class ConvertSlider : ConvertHitObject, IHasCurve, IHasLegacyLastTickOffset
     {
         /// <summary>
         /// Scoring distance with a speed-adjusted beat length of 1 second.
diff --git a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHit.cs b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHit.cs
index 883ef55df0..0b69817c13 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHit.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHit.cs
@@ -2,17 +2,14 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Objects.Types;
-using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Objects.Legacy.Mania
 {
     /// <summary>
     /// Legacy osu!mania Hit-type, used for parsing Beatmaps.
     /// </summary>
-    internal sealed class ConvertHit : HitObject, IHasXPosition
+    internal sealed class ConvertHit : ConvertHitObject, IHasXPosition
     {
         public float X { get; set; }
-
-        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs
index 69e6f8379d..1d92d638dd 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs
@@ -2,18 +2,15 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Objects.Types;
-using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Objects.Legacy.Mania
 {
-    internal sealed class ConvertHold : HitObject, IHasXPosition, IHasEndTime
+    internal sealed class ConvertHold : ConvertHitObject, IHasXPosition, IHasEndTime
     {
         public float X { get; set; }
 
         public double EndTime { get; set; }
 
         public double Duration => EndTime - StartTime;
-
-        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSlider.cs
index 4486c5d906..84cde5fa95 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSlider.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Objects.Types;
-using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Objects.Legacy.Mania
 {
@@ -12,7 +11,5 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
     internal sealed class ConvertSlider : Legacy.ConvertSlider, IHasXPosition
     {
         public float X { get; set; }
-
-        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs
index c6d1f1922c..7dc13e27cd 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs
@@ -2,21 +2,18 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Objects.Types;
-using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Objects.Legacy.Mania
 {
     /// <summary>
     /// Legacy osu!mania Spinner-type, used for parsing Beatmaps.
     /// </summary>
-    internal sealed class ConvertSpinner : HitObject, IHasEndTime, IHasXPosition
+    internal sealed class ConvertSpinner : ConvertHitObject, IHasEndTime, IHasXPosition
     {
         public double EndTime { get; set; }
 
         public double Duration => EndTime - StartTime;
 
         public float X { get; set; }
-
-        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHit.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHit.cs
index e40b5b4505..069366bad3 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHit.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHit.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Objects.Types;
-using osu.Game.Rulesets.Scoring;
 using osuTK;
 
 namespace osu.Game.Rulesets.Objects.Legacy.Osu
@@ -10,7 +9,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
     /// <summary>
     /// Legacy osu! Hit-type, used for parsing Beatmaps.
     /// </summary>
-    internal sealed class ConvertHit : HitObject, IHasPosition, IHasCombo
+    internal sealed class ConvertHit : ConvertHitObject, IHasPosition, IHasCombo
     {
         public Vector2 Position { get; set; }
 
@@ -21,7 +20,5 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
         public bool NewCombo { get; set; }
 
         public int ComboOffset { get; set; }
-
-        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs
index a163329d47..e947690668 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Objects.Types;
-using osu.Game.Rulesets.Scoring;
 using osuTK;
 
 namespace osu.Game.Rulesets.Objects.Legacy.Osu
@@ -21,7 +20,5 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
         public bool NewCombo { get; set; }
 
         public int ComboOffset { get; set; }
-
-        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs
index 5d96a61633..8b21aab411 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Objects.Types;
-using osu.Game.Rulesets.Scoring;
 using osuTK;
 
 namespace osu.Game.Rulesets.Objects.Legacy.Osu
@@ -10,7 +9,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
     /// <summary>
     /// Legacy osu! Spinner-type, used for parsing Beatmaps.
     /// </summary>
-    internal sealed class ConvertSpinner : HitObject, IHasEndTime, IHasPosition, IHasCombo
+    internal sealed class ConvertSpinner : ConvertHitObject, IHasEndTime, IHasPosition, IHasCombo
     {
         public double EndTime { get; set; }
 
@@ -22,8 +21,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
 
         public float Y => Position.Y;
 
-        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
-
         public bool NewCombo { get; set; }
 
         public int ComboOffset { get; set; }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHit.cs b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHit.cs
index efb9810927..cb5178ce48 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHit.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHit.cs
@@ -1,15 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Game.Rulesets.Scoring;
-
 namespace osu.Game.Rulesets.Objects.Legacy.Taiko
 {
     /// <summary>
     /// Legacy osu!taiko Hit-type, used for parsing Beatmaps.
     /// </summary>
-    internal sealed class ConvertHit : HitObject
+    internal sealed class ConvertHit : ConvertHitObject
     {
-        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSlider.cs b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSlider.cs
index b365fd34ae..821554f7ee 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSlider.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSlider.cs
@@ -1,8 +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 osu.Game.Rulesets.Scoring;
-
 namespace osu.Game.Rulesets.Objects.Legacy.Taiko
 {
     /// <summary>
@@ -10,6 +8,5 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
     /// </summary>
     internal sealed class ConvertSlider : Legacy.ConvertSlider
     {
-        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs
index 840ba51ac2..8e28487f2f 100644
--- a/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs
@@ -2,19 +2,16 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Game.Rulesets.Objects.Types;
-using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Objects.Legacy.Taiko
 {
     /// <summary>
     /// Legacy osu!taiko Spinner-type, used for parsing Beatmaps.
     /// </summary>
-    internal sealed class ConvertSpinner : HitObject, IHasEndTime
+    internal sealed class ConvertSpinner : ConvertHitObject, IHasEndTime
     {
         public double EndTime { get; set; }
 
         public double Duration => EndTime - StartTime;
-
-        protected override HitWindows CreateHitWindows() => HitWindows.Empty;
     }
 }

From 0e29d3c4a2173eecc9681b36d66985518dcd2cda Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 23 Feb 2020 13:50:05 +0900
Subject: [PATCH 0732/1142] Correctly expire bar lines in osu!taiko and
 osu!mania

---
 osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs | 4 +---
 osu.Game.Rulesets.Taiko/Objects/BarLine.cs                   | 3 +++
 osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs | 2 ++
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs     | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs
index 56bc797c7f..08b5b75f9c 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs
@@ -71,8 +71,6 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
         {
         }
 
-        protected override void UpdateStateTransforms(ArmedState state)
-        {
-        }
+        protected override void UpdateStateTransforms(ArmedState state) => this.FadeOut(150);
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/BarLine.cs b/osu.Game.Rulesets.Taiko/Objects/BarLine.cs
index 2afbbc737c..6306195704 100644
--- a/osu.Game.Rulesets.Taiko/Objects/BarLine.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/BarLine.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Rulesets.Taiko.Objects
@@ -8,5 +9,7 @@ namespace osu.Game.Rulesets.Taiko.Objects
     public class BarLine : TaikoHitObject, IBarLine
     {
         public bool Major { get; set; }
+
+        public override Judgement CreateJudgement() => new IgnoreJudgement();
     }
 }
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
index 1a5a797f28..e9caabbcc8 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableBarLine.cs
@@ -54,5 +54,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                 Alpha = 0.75f
             });
         }
+
+        protected override void UpdateStateTransforms(ArmedState state) => this.FadeOut(150);
     }
 }
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 67fe18e8dd..d8614c9d3d 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -265,7 +265,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
                     }
                 }
 
-                if (state.Value != ArmedState.Idle && LifetimeEnd == double.MaxValue)
+                if (state.Value != ArmedState.Idle && LifetimeEnd == double.MaxValue || HitObject.HitWindows == null)
                     Expire();
             }
             else

From 401bf1c92811158cf752aac264953324d3b2f761 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 23 Feb 2020 14:30:08 +0900
Subject: [PATCH 0733/1142] Remove unnecessary checks on NotNull attributes

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 9 +++------
 osu.Game/Rulesets/Scoring/JudgementProcessor.cs          | 2 --
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 67fe18e8dd..369bda3fc2 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -99,12 +99,9 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
             var judgement = HitObject.CreateJudgement();
 
-            if (judgement != null)
-            {
-                Result = CreateResult(judgement);
-                if (Result == null)
-                    throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
-            }
+            Result = CreateResult(judgement);
+            if (Result == null)
+                throw new InvalidOperationException($"{GetType().ReadableName()} must provide a {nameof(JudgementResult)} through {nameof(CreateResult)}.");
 
             loadSamples();
         }
diff --git a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
index 3016007f98..334b95f808 100644
--- a/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/JudgementProcessor.cs
@@ -125,8 +125,6 @@ namespace osu.Game.Rulesets.Scoring
                     simulate(nested);
 
                 var judgement = obj.CreateJudgement();
-                if (judgement == null)
-                    return;
 
                 var result = CreateResult(obj, judgement);
                 if (result == null)

From 575946d92367f6d98fd198d1e3ddfa236718eca7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 23 Feb 2020 20:47:14 +0900
Subject: [PATCH 0734/1142] Expose save and export options in editor to
 non-dekstop platforms

---
 osu.Game/Screens/Edit/Editor.cs | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 3bec4b8f6f..d84151f5af 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -20,8 +20,6 @@ using osu.Game.Screens.Edit.Components;
 using osu.Game.Screens.Edit.Components.Menus;
 using osu.Game.Screens.Edit.Design;
 using osuTK.Input;
-using System.Collections.Generic;
-using osu.Framework;
 using osu.Framework.Input.Bindings;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Cursor;
@@ -93,17 +91,6 @@ namespace osu.Game.Screens.Edit
 
             EditorMenuBar menuBar;
 
-            var fileMenuItems = new List<MenuItem>();
-
-            if (RuntimeInfo.IsDesktop)
-            {
-                fileMenuItems.Add(new EditorMenuItem("Save", MenuItemType.Standard, saveBeatmap));
-                fileMenuItems.Add(new EditorMenuItem("Export package", MenuItemType.Standard, exportBeatmap));
-                fileMenuItems.Add(new EditorMenuItemSpacer());
-            }
-
-            fileMenuItems.Add(new EditorMenuItem("Exit", MenuItemType.Standard, this.Exit));
-
             AddInternal(new OsuContextMenuContainer
             {
                 RelativeSizeAxes = Axes.Both,
@@ -134,7 +121,13 @@ namespace osu.Game.Screens.Edit
                             {
                                 new MenuItem("File")
                                 {
-                                    Items = fileMenuItems
+                                    Items = new[]
+                                    {
+                                        new EditorMenuItem("Save", MenuItemType.Standard, saveBeatmap),
+                                        new EditorMenuItem("Export package", MenuItemType.Standard, exportBeatmap),
+                                        new EditorMenuItemSpacer(),
+                                        new EditorMenuItem("Exit", MenuItemType.Standard, this.Exit),
+                                    }
                                 }
                             }
                         }

From 71c34a36edd568f4140f71d21788df9fe4197905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 23 Feb 2020 14:46:42 +0100
Subject: [PATCH 0735/1142] Use pattern matching instead of .(Has)?Value

---
 osu.Game/Overlays/BeatmapSetOverlay.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSetOverlay.cs b/osu.Game/Overlays/BeatmapSetOverlay.cs
index efa9e27f5c..0d16c4842d 100644
--- a/osu.Game/Overlays/BeatmapSetOverlay.cs
+++ b/osu.Game/Overlays/BeatmapSetOverlay.cs
@@ -163,14 +163,14 @@ namespace osu.Game.Overlays
 
                 BeatmapSet.BindValueChanged(beatmapSet =>
                 {
-                    if (beatmapSet.NewValue?.OnlineBeatmapSetID.HasValue != true)
+                    if (beatmapSet.NewValue?.OnlineBeatmapSetID is int onlineBeatmapSetID)
                     {
-                        Hide();
+                        Show();
+                        comments.ShowComments(CommentableType.Beatmapset, onlineBeatmapSetID);
                     }
                     else
                     {
-                        Show();
-                        comments.ShowComments(CommentableType.Beatmapset, beatmapSet.NewValue.OnlineBeatmapSetID.Value);
+                        Hide();
                     }
                 }, true);
             }

From 0cfe1ac823e2e9414637405e97024f5cbd57f2ec Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 24 Feb 2020 05:47:21 +0300
Subject: [PATCH 0736/1142] Implement UserSortTabControl component

---
 .../TestSceneUserSortTabControl.cs            | 41 +++++++++++++++++++
 osu.Game/Overlays/Comments/CommentsHeader.cs  |  3 ++
 .../Home/Friends/UserSortTabControl.cs        | 19 +++++++++
 osu.Game/Overlays/OverlaySortTabControl.cs    |  4 +-
 4 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneUserSortTabControl.cs
 create mode 100644 osu.Game/Overlays/Home/Friends/UserSortTabControl.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUserSortTabControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUserSortTabControl.cs
new file mode 100644
index 0000000000..de7a78d355
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUserSortTabControl.cs
@@ -0,0 +1,41 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Home.Friends;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneUserSortTabControl : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(UserSortTabControl),
+            typeof(OverlaySortTabControl<>),
+        };
+
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
+
+        public TestSceneUserSortTabControl()
+        {
+            UserSortTabControl control;
+            OsuSpriteText current;
+
+            Add(control = new UserSortTabControl
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            });
+
+            Add(current = new OsuSpriteText());
+
+            control.Current.BindValueChanged(criteria => current.Text = $"Criteria: {criteria.NewValue}", true);
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Comments/CommentsHeader.cs b/osu.Game/Overlays/Comments/CommentsHeader.cs
index 1aa40201f1..ff5602e289 100644
--- a/osu.Game/Overlays/Comments/CommentsHeader.cs
+++ b/osu.Game/Overlays/Comments/CommentsHeader.cs
@@ -11,6 +11,8 @@ using osu.Framework.Graphics.Sprites;
 using osuTK;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics.Sprites;
+using System.ComponentModel;
+using Container = osu.Framework.Graphics.Containers.Container;
 
 namespace osu.Game.Overlays.Comments
 {
@@ -109,6 +111,7 @@ namespace osu.Game.Overlays.Comments
 
     public enum CommentsSortCriteria
     {
+        [Description(@"Recent")]
         New,
         Old,
         Top
diff --git a/osu.Game/Overlays/Home/Friends/UserSortTabControl.cs b/osu.Game/Overlays/Home/Friends/UserSortTabControl.cs
new file mode 100644
index 0000000000..2479fa4638
--- /dev/null
+++ b/osu.Game/Overlays/Home/Friends/UserSortTabControl.cs
@@ -0,0 +1,19 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.ComponentModel;
+
+namespace osu.Game.Overlays.Home.Friends
+{
+    public class UserSortTabControl : OverlaySortTabControl<UserSortCriteria>
+    {
+    }
+
+    public enum UserSortCriteria
+    {
+        [Description(@"Recently Active")]
+        LastVisit,
+        Rank,
+        Username
+    }
+}
diff --git a/osu.Game/Overlays/OverlaySortTabControl.cs b/osu.Game/Overlays/OverlaySortTabControl.cs
index 5a713ab08e..395f3aec4c 100644
--- a/osu.Game/Overlays/OverlaySortTabControl.cs
+++ b/osu.Game/Overlays/OverlaySortTabControl.cs
@@ -15,6 +15,8 @@ using osu.Game.Graphics.Sprites;
 using osuTK.Graphics;
 using osu.Game.Overlays.Comments;
 using JetBrains.Annotations;
+using System;
+using osu.Framework.Extensions;
 
 namespace osu.Game.Overlays
 {
@@ -132,7 +134,7 @@ namespace osu.Game.Overlays
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                             Font = OsuFont.GetFont(size: 12),
-                            Text = value.ToString()
+                            Text = (value as Enum)?.GetDescription() ?? value.ToString()
                         }
                     }
                 });

From b0b52146eafd10c442c6809d1f4d9f6cb0e1ee56 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 24 Feb 2020 05:53:33 +0300
Subject: [PATCH 0737/1142] Fix crash when clicking on ShowMore button

---
 osu.Game/Overlays/Comments/CommentsPage.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Comments/CommentsPage.cs b/osu.Game/Overlays/Comments/CommentsPage.cs
index 4f82ee5a19..591400f741 100644
--- a/osu.Game/Overlays/Comments/CommentsPage.cs
+++ b/osu.Game/Overlays/Comments/CommentsPage.cs
@@ -96,12 +96,17 @@ namespace osu.Game.Overlays.Comments
         {
             var orphaned = new List<Comment>();
 
+            // Exclude possible duplicated comments.
             foreach (var topLevel in bundle.Comments)
+            {
+                if (commentDictionary.ContainsKey(topLevel.Id))
+                    continue;
+
                 addNewComment(topLevel);
+            }
 
             foreach (var child in bundle.IncludedComments)
             {
-                // Included comments can contain the parent comment, which already exists in the hierarchy.
                 if (commentDictionary.ContainsKey(child.Id))
                     continue;
 

From e6cfafffe9966aee9fc9cb68b4b6d8a373c143fe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 24 Feb 2020 12:24:15 +0900
Subject: [PATCH 0738/1142] Fix incorrect LifetimeStart and add todo regarding
 Expire usage

---
 .../Objects/Drawables/Connections/FollowPointConnection.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
index 7165697022..921b23cb13 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
@@ -113,6 +113,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
             float rotation = (float)(Math.Atan2(distanceVector.Y, distanceVector.X) * (180 / Math.PI));
             double duration = endTime - startTime;
 
+            double? firstTransformStartTime = null;
             double finalTransformEndTime = startTime;
 
             for (int d = (int)(spacing * 1.5); d < distance - spacing; d += spacing)
@@ -133,6 +134,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
                     Scale = new Vector2(1.5f * osuEnd.Scale),
                 });
 
+                if (firstTransformStartTime == null)
+                    firstTransformStartTime = fadeInTime;
+
                 using (fp.BeginAbsoluteSequence(fadeInTime))
                 {
                     fp.FadeIn(osuEnd.TimeFadeIn);
@@ -144,7 +148,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
                 }
             }
 
-            LifetimeStart = startTime;
+            // todo: use Expire() on FollowPoints and take lifetime from them when https://github.com/ppy/osu-framework/issues/3300 is fixed.
+            LifetimeStart = firstTransformStartTime ?? startTime;
             LifetimeEnd = finalTransformEndTime;
         }
     }

From 7bc9a9b3d8b9e00b7fa09e7710c47fe42ea01d46 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 24 Feb 2020 07:28:33 +0300
Subject: [PATCH 0739/1142] Implement OverlayPanelDisplayStyleControl and
 UserListToolbar components

---
 .../UserInterface/TestSceneUserListToolbar.cs | 57 +++++++++++
 .../TestSceneUserSortTabControl.cs            | 41 --------
 .../Overlays/Home/Friends/UserListToolbar.cs  | 45 +++++++++
 .../OverlayPanelDisplayStyleControl.cs        | 97 +++++++++++++++++++
 4 files changed, 199 insertions(+), 41 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneUserListToolbar.cs
 delete mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneUserSortTabControl.cs
 create mode 100644 osu.Game/Overlays/Home/Friends/UserListToolbar.cs
 create mode 100644 osu.Game/Overlays/OverlayPanelDisplayStyleControl.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUserListToolbar.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUserListToolbar.cs
new file mode 100644
index 0000000000..02b8839922
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUserListToolbar.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 System;
+using System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Home.Friends;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneUserListToolbar : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(UserSortTabControl),
+            typeof(OverlaySortTabControl<>),
+            typeof(OverlayPanelDisplayStyleControl),
+            typeof(UserListToolbar),
+        };
+
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
+
+        public TestSceneUserListToolbar()
+        {
+            UserListToolbar toolbar;
+            OsuSpriteText sort;
+            OsuSpriteText displayStyle;
+
+            Add(toolbar = new UserListToolbar
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            });
+
+            Add(new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 5),
+                Children = new Drawable[]
+                {
+                    sort = new OsuSpriteText(),
+                    displayStyle = new OsuSpriteText()
+                }
+            });
+
+            toolbar.SortCriteria.BindValueChanged(criteria => sort.Text = $"Criteria: {criteria.NewValue}", true);
+            toolbar.DisplayStyle.BindValueChanged(style => displayStyle.Text = $"Style: {style.NewValue}", true);
+        }
+    }
+}
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUserSortTabControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUserSortTabControl.cs
deleted file mode 100644
index de7a78d355..0000000000
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneUserSortTabControl.cs
+++ /dev/null
@@ -1,41 +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 System;
-using System.Collections.Generic;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Overlays;
-using osu.Game.Overlays.Home.Friends;
-
-namespace osu.Game.Tests.Visual.UserInterface
-{
-    public class TestSceneUserSortTabControl : OsuTestScene
-    {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(UserSortTabControl),
-            typeof(OverlaySortTabControl<>),
-        };
-
-        [Cached]
-        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
-
-        public TestSceneUserSortTabControl()
-        {
-            UserSortTabControl control;
-            OsuSpriteText current;
-
-            Add(control = new UserSortTabControl
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-            });
-
-            Add(current = new OsuSpriteText());
-
-            control.Current.BindValueChanged(criteria => current.Text = $"Criteria: {criteria.NewValue}", true);
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Home/Friends/UserListToolbar.cs b/osu.Game/Overlays/Home/Friends/UserListToolbar.cs
new file mode 100644
index 0000000000..f7c5e9f4fd
--- /dev/null
+++ b/osu.Game/Overlays/Home/Friends/UserListToolbar.cs
@@ -0,0 +1,45 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osuTK;
+using osu.Framework.Bindables;
+
+namespace osu.Game.Overlays.Home.Friends
+{
+    public class UserListToolbar : CompositeDrawable
+    {
+        public Bindable<UserSortCriteria> SortCriteria => sortControl.Current;
+
+        public Bindable<OverlayPanelDisplayStyle> DisplayStyle => styleControl.Current;
+
+        private readonly UserSortTabControl sortControl;
+        private readonly OverlayPanelDisplayStyleControl styleControl;
+
+        public UserListToolbar()
+        {
+            AutoSizeAxes = Axes.Both;
+
+            AddInternal(new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Horizontal,
+                Spacing = new Vector2(10, 0),
+                Children = new Drawable[]
+                {
+                    sortControl = new UserSortTabControl
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    },
+                    styleControl = new OverlayPanelDisplayStyleControl
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    }
+                }
+            });
+        }
+    }
+}
diff --git a/osu.Game/Overlays/OverlayPanelDisplayStyleControl.cs b/osu.Game/Overlays/OverlayPanelDisplayStyleControl.cs
new file mode 100644
index 0000000000..952b277cac
--- /dev/null
+++ b/osu.Game/Overlays/OverlayPanelDisplayStyleControl.cs
@@ -0,0 +1,97 @@
+// 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.Sprites;
+using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osuTK;
+using osu.Framework.Input.Events;
+using osu.Game.Graphics.UserInterface;
+using osu.Framework.Allocation;
+using osuTK.Graphics;
+using osu.Framework.Graphics.Cursor;
+
+namespace osu.Game.Overlays
+{
+    public class OverlayPanelDisplayStyleControl : OsuTabControl<OverlayPanelDisplayStyle>
+    {
+        protected override Dropdown<OverlayPanelDisplayStyle> CreateDropdown() => null;
+
+        protected override TabItem<OverlayPanelDisplayStyle> CreateTabItem(OverlayPanelDisplayStyle value) => new PanelDisplayTabItem(value);
+
+        protected override bool AddEnumEntriesAutomatically => false;
+
+        public OverlayPanelDisplayStyleControl()
+        {
+            AutoSizeAxes = Axes.Both;
+
+            AddTabItem(new PanelDisplayTabItem(OverlayPanelDisplayStyle.Card)
+            {
+                Icon = FontAwesome.Solid.Square
+            });
+            AddTabItem(new PanelDisplayTabItem(OverlayPanelDisplayStyle.List)
+            {
+                Icon = FontAwesome.Solid.Bars
+            });
+        }
+
+        protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
+        {
+            AutoSizeAxes = Axes.Both,
+            Direction = FillDirection.Horizontal
+        };
+
+        private class PanelDisplayTabItem : TabItem<OverlayPanelDisplayStyle>, IHasTooltip
+        {
+            public IconUsage Icon
+            {
+                set => icon.Icon = value;
+            }
+
+            [Resolved]
+            private OverlayColourProvider colourProvider { get; set; }
+
+            public string TooltipText => $@"{Value} view";
+
+            private readonly SpriteIcon icon;
+
+            public PanelDisplayTabItem(OverlayPanelDisplayStyle value)
+                : base(value)
+            {
+                Size = new Vector2(11);
+                Add(icon = new SpriteIcon
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    FillMode = FillMode.Fit
+                });
+            }
+
+            protected override void OnActivated() => updateState();
+
+            protected override void OnDeactivated() => updateState();
+
+            protected override bool OnHover(HoverEvent e)
+            {
+                updateState();
+                return base.OnHover(e);
+            }
+
+            protected override void OnHoverLost(HoverLostEvent e)
+            {
+                updateState();
+                base.OnHoverLost(e);
+            }
+
+            private void updateState() => icon.Colour = Active.Value || IsHovered ? colourProvider.Light1 : Color4.White;
+        }
+    }
+
+    public enum OverlayPanelDisplayStyle
+    {
+        Card,
+        List
+    }
+}

From 6c28fd21c7bb7b61676c21c9ec11c8a84ef9e629 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 24 Feb 2020 20:52:15 +0900
Subject: [PATCH 0740/1142] osu-side changes

---
 .../Mods/ManiaModFlashlight.cs                   | 14 +++-----------
 .../Objects/Drawables/Pieces/BodyPiece.cs        | 14 ++++----------
 osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs   | 14 ++++----------
 .../Mods/TaikoModFlashlight.cs                   | 16 ++++------------
 osu.Game/Graphics/UserInterface/LineGraph.cs     | 14 ++++----------
 .../UI/Scrolling/ScrollingHitObjectContainer.cs  | 13 ++++---------
 .../Edit/Compose/Components/DistanceSnapGrid.cs  | 14 ++++----------
 osu.Game/Screens/Play/SquareGraph.cs             | 16 +++++++---------
 8 files changed, 34 insertions(+), 81 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModFlashlight.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModFlashlight.cs
index 6893e1e73b..86a00271e9 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModFlashlight.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModFlashlight.cs
@@ -3,8 +3,8 @@
 
 using System;
 using osu.Framework.Bindables;
-using osu.Framework.Caching;
 using osu.Framework.Graphics;
+using osu.Framework.Layout;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Mods;
 using osuTK;
@@ -22,21 +22,13 @@ namespace osu.Game.Rulesets.Mania.Mods
 
         private class ManiaFlashlight : Flashlight
         {
-            private readonly Cached flashlightProperties = new Cached();
+            private readonly LayoutValue flashlightProperties = new LayoutValue(Invalidation.DrawSize);
 
             public ManiaFlashlight()
             {
                 FlashlightSize = new Vector2(0, default_flashlight_size);
-            }
 
-            public override bool Invalidate(Invalidation invalidation = Invalidation.All, Drawable source = null, bool shallPropagate = true)
-            {
-                if ((invalidation & Invalidation.DrawSize) > 0)
-                {
-                    flashlightProperties.Invalidate();
-                }
-
-                return base.Invalidate(invalidation, source, shallPropagate);
+                AddLayout(flashlightProperties);
             }
 
             protected override void Update()
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/BodyPiece.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/BodyPiece.cs
index 31a4857805..43f9ae2783 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/BodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/BodyPiece.cs
@@ -2,13 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using osu.Framework.Caching;
 using osuTK.Graphics;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Layout;
 using osu.Game.Graphics;
 
 namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
@@ -65,6 +65,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
                     }
                 }
             };
+
+            AddLayout(subtractionCache);
         }
 
         protected override void LoadComplete()
@@ -100,15 +102,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
             }
         }
 
-        private readonly Cached subtractionCache = new Cached();
-
-        public override bool Invalidate(Invalidation invalidation = Invalidation.All, Drawable source = null, bool shallPropagate = true)
-        {
-            if ((invalidation & Invalidation.DrawSize) > 0)
-                subtractionCache.Invalidate();
-
-            return base.Invalidate(invalidation, source, shallPropagate);
-        }
+        private readonly LayoutValue subtractionCache = new LayoutValue(Invalidation.DrawSize);
 
         protected override void Update()
         {
diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
index 4e86662ec6..9a23a2be30 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
@@ -5,7 +5,6 @@ using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using osu.Framework.Allocation;
-using osu.Framework.Caching;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Batches;
 using osu.Framework.Graphics.OpenGL.Vertices;
@@ -14,6 +13,7 @@ using osu.Framework.Graphics.Shaders;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input;
 using osu.Framework.Input.Events;
+using osu.Framework.Layout;
 using osu.Framework.Timing;
 using osuTK;
 using osuTK.Graphics;
@@ -43,6 +43,8 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                 // -1 signals that the part is unusable, and should not be drawn
                 parts[i].InvalidationID = -1;
             }
+
+            AddLayout(partSizeCache);
         }
 
         [BackgroundDependencyLoader]
@@ -72,20 +74,12 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             }
         }
 
-        private readonly Cached<Vector2> partSizeCache = new Cached<Vector2>();
+        private readonly LayoutValue<Vector2> partSizeCache = new LayoutValue<Vector2>(Invalidation.DrawInfo | Invalidation.RequiredParentSizeToFit | Invalidation.Presence);
 
         private Vector2 partSize => partSizeCache.IsValid
             ? partSizeCache.Value
             : (partSizeCache.Value = new Vector2(Texture.DisplayWidth, Texture.DisplayHeight) * DrawInfo.Matrix.ExtractScale().Xy);
 
-        public override bool Invalidate(Invalidation invalidation = Invalidation.All, Drawable source = null, bool shallPropagate = true)
-        {
-            if ((invalidation & (Invalidation.DrawInfo | Invalidation.RequiredParentSizeToFit | Invalidation.Presence)) > 0)
-                partSizeCache.Invalidate();
-
-            return base.Invalidate(invalidation, source, shallPropagate);
-        }
-
         /// <summary>
         /// The amount of time to fade the cursor trail pieces.
         /// </summary>
diff --git a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs
index b7db3307ad..1253b7c8ae 100644
--- a/osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs
+++ b/osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs
@@ -2,8 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
-using osu.Framework.Caching;
 using osu.Framework.Graphics;
+using osu.Framework.Layout;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.UI;
@@ -30,13 +30,15 @@ namespace osu.Game.Rulesets.Taiko.Mods
 
         private class TaikoFlashlight : Flashlight
         {
-            private readonly Cached flashlightProperties = new Cached();
+            private readonly LayoutValue flashlightProperties = new LayoutValue(Invalidation.DrawSize);
             private readonly TaikoPlayfield taikoPlayfield;
 
             public TaikoFlashlight(TaikoPlayfield taikoPlayfield)
             {
                 this.taikoPlayfield = taikoPlayfield;
                 FlashlightSize = new Vector2(0, getSizeFor(0));
+
+                AddLayout(flashlightProperties);
             }
 
             private float getSizeFor(int combo)
@@ -56,16 +58,6 @@ namespace osu.Game.Rulesets.Taiko.Mods
 
             protected override string FragmentShader => "CircularFlashlight";
 
-            public override bool Invalidate(Invalidation invalidation = Invalidation.All, Drawable source = null, bool shallPropagate = true)
-            {
-                if ((invalidation & Invalidation.DrawSize) > 0)
-                {
-                    flashlightProperties.Invalidate();
-                }
-
-                return base.Invalidate(invalidation, source, shallPropagate);
-            }
-
             protected override void Update()
             {
                 base.Update();
diff --git a/osu.Game/Graphics/UserInterface/LineGraph.cs b/osu.Game/Graphics/UserInterface/LineGraph.cs
index 6d65b77cbf..42b523fc5c 100644
--- a/osu.Game/Graphics/UserInterface/LineGraph.cs
+++ b/osu.Game/Graphics/UserInterface/LineGraph.cs
@@ -4,11 +4,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Caching;
 using osuTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Lines;
+using osu.Framework.Layout;
 using osuTK.Graphics;
 
 namespace osu.Game.Graphics.UserInterface
@@ -83,17 +83,11 @@ namespace osu.Game.Graphics.UserInterface
                     PathRadius = 1
                 }
             });
+
+            AddLayout(pathCached);
         }
 
-        public override bool Invalidate(Invalidation invalidation = Invalidation.All, Drawable source = null, bool shallPropagate = true)
-        {
-            if ((invalidation & Invalidation.DrawSize) > 0)
-                pathCached.Invalidate();
-
-            return base.Invalidate(invalidation, source, shallPropagate);
-        }
-
-        private readonly Cached pathCached = new Cached();
+        private readonly LayoutValue pathCached = new LayoutValue(Invalidation.DrawSize);
 
         protected override void Update()
         {
diff --git a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
index 83a7f7289f..108f98d5fc 100644
--- a/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
+++ b/osu.Game/Rulesets/UI/Scrolling/ScrollingHitObjectContainer.cs
@@ -6,6 +6,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Caching;
 using osu.Framework.Graphics;
+using osu.Framework.Layout;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 
@@ -19,11 +20,13 @@ namespace osu.Game.Rulesets.UI.Scrolling
         [Resolved]
         private IScrollingInfo scrollingInfo { get; set; }
 
-        private readonly Cached initialStateCache = new Cached();
+        private readonly LayoutValue initialStateCache = new LayoutValue(Invalidation.RequiredParentSizeToFit | Invalidation.DrawInfo);
 
         public ScrollingHitObjectContainer()
         {
             RelativeSizeAxes = Axes.Both;
+
+            AddLayout(initialStateCache);
         }
 
         [BackgroundDependencyLoader]
@@ -55,14 +58,6 @@ namespace osu.Game.Rulesets.UI.Scrolling
             return result;
         }
 
-        public override bool Invalidate(Invalidation invalidation = Invalidation.All, Drawable source = null, bool shallPropagate = true)
-        {
-            if ((invalidation & (Invalidation.RequiredParentSizeToFit | Invalidation.DrawInfo)) > 0)
-                initialStateCache.Invalidate();
-
-            return base.Invalidate(invalidation, source, shallPropagate);
-        }
-
         private float scrollLength;
 
         protected override void Update()
diff --git a/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs b/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
index 479de64eab..3a42938fc1 100644
--- a/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/DistanceSnapGrid.cs
@@ -3,10 +3,10 @@
 
 using System;
 using osu.Framework.Allocation;
-using osu.Framework.Caching;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Layout;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
 using osuTK;
@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
         [Resolved]
         private BindableBeatDivisor beatDivisor { get; set; }
 
-        private readonly Cached gridCache = new Cached();
+        private readonly LayoutValue gridCache = new LayoutValue(Invalidation.RequiredParentSizeToFit);
         private readonly double? endTime;
 
         /// <summary>
@@ -67,6 +67,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
             StartTime = startTime;
 
             RelativeSizeAxes = Axes.Both;
+
+            AddLayout(gridCache);
         }
 
         protected override void LoadComplete()
@@ -92,14 +94,6 @@ namespace osu.Game.Screens.Edit.Compose.Components
             gridCache.Invalidate();
         }
 
-        public override bool Invalidate(Invalidation invalidation = Invalidation.All, Drawable source = null, bool shallPropagate = true)
-        {
-            if ((invalidation & Invalidation.RequiredParentSizeToFit) > 0)
-                gridCache.Invalidate();
-
-            return base.Invalidate(invalidation, source, shallPropagate);
-        }
-
         protected override void Update()
         {
             base.Update();
diff --git a/osu.Game/Screens/Play/SquareGraph.cs b/osu.Game/Screens/Play/SquareGraph.cs
index a667466965..36ce131411 100644
--- a/osu.Game/Screens/Play/SquareGraph.cs
+++ b/osu.Game/Screens/Play/SquareGraph.cs
@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using osu.Framework;
-using osu.Framework.Caching;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -14,6 +13,7 @@ using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Allocation;
+using osu.Framework.Layout;
 using osu.Framework.Threading;
 
 namespace osu.Game.Screens.Play
@@ -22,6 +22,11 @@ namespace osu.Game.Screens.Play
     {
         private BufferedContainer<Column> columns;
 
+        public SquareGraph()
+        {
+            AddLayout(layout);
+        }
+
         public int ColumnCount => columns?.Children.Count ?? 0;
 
         private int progress;
@@ -68,14 +73,7 @@ namespace osu.Game.Screens.Play
             }
         }
 
-        public override bool Invalidate(Invalidation invalidation = Invalidation.All, Drawable source = null, bool shallPropagate = true)
-        {
-            if ((invalidation & Invalidation.DrawSize) > 0)
-                layout.Invalidate();
-            return base.Invalidate(invalidation, source, shallPropagate);
-        }
-
-        private readonly Cached layout = new Cached();
+        private readonly LayoutValue layout = new LayoutValue(Invalidation.DrawSize);
         private ScheduledDelegate scheduledCreate;
 
         protected override void Update()

From fe1f2858c19e8e5bf7726abe121b61c8fc9d13ca Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 24 Feb 2020 23:10:37 +0300
Subject: [PATCH 0741/1142] Refactor to avoid duplicated code

---
 osu.Game/Overlays/Comments/CommentsPage.cs | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentsPage.cs b/osu.Game/Overlays/Comments/CommentsPage.cs
index 591400f741..1fb6032924 100644
--- a/osu.Game/Overlays/Comments/CommentsPage.cs
+++ b/osu.Game/Overlays/Comments/CommentsPage.cs
@@ -97,20 +97,12 @@ namespace osu.Game.Overlays.Comments
             var orphaned = new List<Comment>();
 
             // Exclude possible duplicated comments.
-            foreach (var topLevel in bundle.Comments)
+            foreach (var comment in bundle.Comments.Concat(bundle.IncludedComments))
             {
-                if (commentDictionary.ContainsKey(topLevel.Id))
+                if (commentDictionary.ContainsKey(comment.Id))
                     continue;
 
-                addNewComment(topLevel);
-            }
-
-            foreach (var child in bundle.IncludedComments)
-            {
-                if (commentDictionary.ContainsKey(child.Id))
-                    continue;
-
-                addNewComment(child);
+                addNewComment(comment);
             }
 
             // Comments whose parents were seen later than themselves can now be added.

From 4cbb2a2f591f07f6a748aa57434bf78554a9c4ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 24 Feb 2020 21:30:27 +0100
Subject: [PATCH 0742/1142] Move comment to more pertinent place

---
 osu.Game/Overlays/Comments/CommentsPage.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Comments/CommentsPage.cs b/osu.Game/Overlays/Comments/CommentsPage.cs
index 1fb6032924..f3a774908c 100644
--- a/osu.Game/Overlays/Comments/CommentsPage.cs
+++ b/osu.Game/Overlays/Comments/CommentsPage.cs
@@ -96,9 +96,9 @@ namespace osu.Game.Overlays.Comments
         {
             var orphaned = new List<Comment>();
 
-            // Exclude possible duplicated comments.
             foreach (var comment in bundle.Comments.Concat(bundle.IncludedComments))
             {
+                // Exclude possible duplicated comments.
                 if (commentDictionary.ContainsKey(comment.Id))
                     continue;
 

From a020566b1e69c0aca51d3a30df5fa191b760d607 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 24 Feb 2020 23:37:46 +0300
Subject: [PATCH 0743/1142] Add HoverClickSounds

---
 .../Overlays/OverlayPanelDisplayStyleControl.cs    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/OverlayPanelDisplayStyleControl.cs b/osu.Game/Overlays/OverlayPanelDisplayStyleControl.cs
index 952b277cac..7269007b41 100644
--- a/osu.Game/Overlays/OverlayPanelDisplayStyleControl.cs
+++ b/osu.Game/Overlays/OverlayPanelDisplayStyleControl.cs
@@ -60,12 +60,16 @@ namespace osu.Game.Overlays
                 : base(value)
             {
                 Size = new Vector2(11);
-                Add(icon = new SpriteIcon
+                AddRange(new Drawable[]
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    RelativeSizeAxes = Axes.Both,
-                    FillMode = FillMode.Fit
+                    icon = new SpriteIcon
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Both,
+                        FillMode = FillMode.Fit
+                    },
+                    new HoverClickSounds()
                 });
             }
 

From d8413c558bac3aa767ed51f3e1b60be446219374 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 24 Feb 2020 23:41:34 +0300
Subject: [PATCH 0744/1142] Use fully qualified name for enum item description
 in CommentsHeader

---
 osu.Game/Overlays/Comments/CommentsHeader.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentsHeader.cs b/osu.Game/Overlays/Comments/CommentsHeader.cs
index ff5602e289..83f44ccd80 100644
--- a/osu.Game/Overlays/Comments/CommentsHeader.cs
+++ b/osu.Game/Overlays/Comments/CommentsHeader.cs
@@ -11,8 +11,6 @@ using osu.Framework.Graphics.Sprites;
 using osuTK;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics.Sprites;
-using System.ComponentModel;
-using Container = osu.Framework.Graphics.Containers.Container;
 
 namespace osu.Game.Overlays.Comments
 {
@@ -111,7 +109,7 @@ namespace osu.Game.Overlays.Comments
 
     public enum CommentsSortCriteria
     {
-        [Description(@"Recent")]
+        [System.ComponentModel.Description(@"Recent")]
         New,
         Old,
         Top

From f71c45cb1bb82b5f606e4465d2b514b6c02bda62 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 25 Feb 2020 11:30:33 +0900
Subject: [PATCH 0745/1142] Remove shallPropagate

---
 osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs | 2 +-
 osu.Game/Graphics/Backgrounds/Triangles.cs     | 2 +-
 osu.Game/Screens/Menu/LogoVisualisation.cs     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
index 9a23a2be30..37df5ec540 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
         {
             base.Update();
 
-            Invalidate(Invalidation.DrawNode, shallPropagate: false);
+            Invalidate(Invalidation.DrawNode);
 
             const int fade_clock_reset_threshold = 1000000;
 
diff --git a/osu.Game/Graphics/Backgrounds/Triangles.cs b/osu.Game/Graphics/Backgrounds/Triangles.cs
index b9c7b26e3e..590e4b2a5c 100644
--- a/osu.Game/Graphics/Backgrounds/Triangles.cs
+++ b/osu.Game/Graphics/Backgrounds/Triangles.cs
@@ -129,7 +129,7 @@ namespace osu.Game.Graphics.Backgrounds
         {
             base.Update();
 
-            Invalidate(Invalidation.DrawNode, shallPropagate: false);
+            Invalidate(Invalidation.DrawNode);
 
             if (CreateNewTriangles)
                 addTriangles(false);
diff --git a/osu.Game/Screens/Menu/LogoVisualisation.cs b/osu.Game/Screens/Menu/LogoVisualisation.cs
index dcc68296f6..67537fa9df 100644
--- a/osu.Game/Screens/Menu/LogoVisualisation.cs
+++ b/osu.Game/Screens/Menu/LogoVisualisation.cs
@@ -150,7 +150,7 @@ namespace osu.Game.Screens.Menu
                     frequencyAmplitudes[i] = 0;
             }
 
-            Invalidate(Invalidation.DrawNode, shallPropagate: false);
+            Invalidate(Invalidation.DrawNode);
         }
 
         protected override DrawNode CreateDrawNode() => new VisualisationDrawNode(this);

From c1455be85592c3ccf8c0ab95b27c23830927ca53 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 25 Feb 2020 10:29:03 +0300
Subject: [PATCH 0746/1142] Add tests

---
 .../Visual/Online/TestSceneCommentsPage.cs    | 52 +++++++++++++++++--
 osu.Game/Overlays/Comments/CommentsPage.cs    | 16 +++---
 2 files changed, 57 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsPage.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsPage.cs
index 0ed8864860..a28a0107a1 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsPage.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsPage.cs
@@ -13,6 +13,8 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
 using osuTK;
+using JetBrains.Annotations;
+using NUnit.Framework;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -30,6 +32,8 @@ namespace osu.Game.Tests.Visual.Online
         private readonly BindableBool showDeleted = new BindableBool();
         private readonly Container content;
 
+        private TestCommentsPage commentsPage;
+
         public TestSceneCommentsPage()
         {
             Add(new FillFlowContainer
@@ -57,15 +61,29 @@ namespace osu.Game.Tests.Visual.Online
                     }
                 }
             });
+        }
 
-            AddStep("load comments", () => createPage(getCommentBundle()));
-            AddStep("load empty comments", () => createPage(getEmptyCommentBundle()));
+        [Test]
+        public void TestAppendDuplicatedComment()
+        {
+            AddStep("Create page", () => createPage(getCommentBundle()));
+            AddAssert("Dictionary length is 10", () => commentsPage?.DictionaryLength == 10);
+            AddStep("Append existing comment", () => commentsPage?.AppendComments(getCommentSubBundle()));
+            AddAssert("Dictionary length is 10", () => commentsPage?.DictionaryLength == 10);
+        }
+
+        [Test]
+        public void TestEmptyBundle()
+        {
+            AddStep("Create page", () => createPage(getEmptyCommentBundle()));
+            AddAssert("Dictionary length is 0", () => commentsPage?.DictionaryLength == 0);
         }
 
         private void createPage(CommentBundle commentBundle)
         {
+            commentsPage = null;
             content.Clear();
-            content.Add(new CommentsPage(commentBundle)
+            content.Add(commentsPage = new TestCommentsPage(commentBundle)
             {
                 ShowDeleted = { BindTarget = showDeleted }
             });
@@ -182,5 +200,33 @@ namespace osu.Game.Tests.Visual.Online
                 }
             },
         };
+
+        private CommentBundle getCommentSubBundle() => new CommentBundle
+        {
+            Comments = new List<Comment>
+            {
+                new Comment
+                {
+                    Id = 1,
+                    Message = "Simple test comment",
+                    LegacyName = "TestUser1",
+                    CreatedAt = DateTimeOffset.Now,
+                    VotesCount = 5
+                },
+            },
+            IncludedComments = new List<Comment>(),
+        };
+
+        private class TestCommentsPage : CommentsPage
+        {
+            public TestCommentsPage(CommentBundle commentBundle)
+                : base(commentBundle)
+            {
+            }
+
+            public new void AppendComments([NotNull] CommentBundle bundle) => base.AppendComments(bundle);
+
+            public int DictionaryLength => CommentDictionary.Count;
+        }
     }
 }
diff --git a/osu.Game/Overlays/Comments/CommentsPage.cs b/osu.Game/Overlays/Comments/CommentsPage.cs
index f3a774908c..9b146b0a7d 100644
--- a/osu.Game/Overlays/Comments/CommentsPage.cs
+++ b/osu.Game/Overlays/Comments/CommentsPage.cs
@@ -61,15 +61,15 @@ namespace osu.Game.Overlays.Comments
                 return;
             }
 
-            appendComments(commentBundle);
+            AppendComments(commentBundle);
         }
 
         private DrawableComment getDrawableComment(Comment comment)
         {
-            if (commentDictionary.TryGetValue(comment.Id, out var existing))
+            if (CommentDictionary.TryGetValue(comment.Id, out var existing))
                 return existing;
 
-            return commentDictionary[comment.Id] = new DrawableComment(comment)
+            return CommentDictionary[comment.Id] = new DrawableComment(comment)
             {
                 ShowDeleted = { BindTarget = ShowDeleted },
                 Sort = { BindTarget = Sort },
@@ -81,25 +81,25 @@ namespace osu.Game.Overlays.Comments
         {
             var request = new GetCommentsRequest(CommentableId.Value, Type.Value, Sort.Value, page, drawableComment.Comment.Id);
 
-            request.Success += response => Schedule(() => appendComments(response));
+            request.Success += response => Schedule(() => AppendComments(response));
 
             api.PerformAsync(request);
         }
 
-        private readonly Dictionary<long, DrawableComment> commentDictionary = new Dictionary<long, DrawableComment>();
+        protected readonly Dictionary<long, DrawableComment> CommentDictionary = new Dictionary<long, DrawableComment>();
 
         /// <summary>
         /// Appends retrieved comments to the subtree rooted of comments in this page.
         /// </summary>
         /// <param name="bundle">The bundle of comments to add.</param>
-        private void appendComments([NotNull] CommentBundle bundle)
+        protected void AppendComments([NotNull] CommentBundle bundle)
         {
             var orphaned = new List<Comment>();
 
             foreach (var comment in bundle.Comments.Concat(bundle.IncludedComments))
             {
                 // Exclude possible duplicated comments.
-                if (commentDictionary.ContainsKey(comment.Id))
+                if (CommentDictionary.ContainsKey(comment.Id))
                     continue;
 
                 addNewComment(comment);
@@ -118,7 +118,7 @@ namespace osu.Game.Overlays.Comments
                     // Comments that have no parent are added as top-level comments to the flow.
                     flow.Add(drawableComment);
                 }
-                else if (commentDictionary.TryGetValue(comment.ParentId.Value, out var parentDrawable))
+                else if (CommentDictionary.TryGetValue(comment.ParentId.Value, out var parentDrawable))
                 {
                     // The comment's parent has already been seen, so the parent<-> child links can be added.
                     comment.ParentComment = parentDrawable.Comment;

From d6046abe700722023b2325ea1c6ba19664a2e8ac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Feb 2020 18:59:16 +0900
Subject: [PATCH 0747/1142] Only expose save for now

---
 osu.Game/Screens/Edit/Editor.cs | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index d84151f5af..8d3b8849bc 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -20,6 +20,8 @@ using osu.Game.Screens.Edit.Components;
 using osu.Game.Screens.Edit.Components.Menus;
 using osu.Game.Screens.Edit.Design;
 using osuTK.Input;
+using System.Collections.Generic;
+using osu.Framework;
 using osu.Framework.Input.Bindings;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Cursor;
@@ -91,6 +93,16 @@ namespace osu.Game.Screens.Edit
 
             EditorMenuBar menuBar;
 
+            var fileMenuItems = new List<MenuItem>();
+
+            fileMenuItems.Add(new EditorMenuItem("Save", MenuItemType.Standard, saveBeatmap));
+
+            if (RuntimeInfo.IsDesktop)
+                fileMenuItems.Add(new EditorMenuItem("Export package", MenuItemType.Standard, exportBeatmap));
+
+            fileMenuItems.Add(new EditorMenuItemSpacer());
+            fileMenuItems.Add(new EditorMenuItem("Exit", MenuItemType.Standard, this.Exit));
+
             AddInternal(new OsuContextMenuContainer
             {
                 RelativeSizeAxes = Axes.Both,
@@ -121,13 +133,7 @@ namespace osu.Game.Screens.Edit
                             {
                                 new MenuItem("File")
                                 {
-                                    Items = new[]
-                                    {
-                                        new EditorMenuItem("Save", MenuItemType.Standard, saveBeatmap),
-                                        new EditorMenuItem("Export package", MenuItemType.Standard, exportBeatmap),
-                                        new EditorMenuItemSpacer(),
-                                        new EditorMenuItem("Exit", MenuItemType.Standard, this.Exit),
-                                    }
+                                    Items = fileMenuItems
                                 }
                             }
                         }

From a0474563545ed534f1fd6e15172be38662993705 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Feb 2020 19:07:15 +0900
Subject: [PATCH 0748/1142] Revert changes to make HitObject abstract

---
 .../TestSceneDrawableJudgement.cs                    |  2 +-
 .../TestSceneDrawableJudgement.cs                    |  2 +-
 .../TestSceneTaikoPlayfield.cs                       |  8 ++++----
 .../Gameplay/TestSceneHitObjectAccentColour.cs       |  2 +-
 .../Gameplay/TestSceneHitObjectContainer.cs          | 12 ++++++------
 .../Gameplay/TestSceneDrawableScrollingRuleset.cs    |  3 ++-
 .../Visual/Gameplay/TestSceneHitErrorMeter.cs        |  4 ++--
 .../Visual/Gameplay/TestSceneScrollingHitObjects.cs  |  4 ++--
 .../Visual/Gameplay/TestSceneSongProgress.cs         |  4 ++--
 .../Visual/SongSelect/TestSceneBeatmapInfoWedge.cs   |  1 +
 osu.Game/Rulesets/Objects/HitObject.cs               |  8 ++++----
 .../Objects/{ => Legacy}/ConvertHitObject.cs         |  4 ++--
 12 files changed, 28 insertions(+), 26 deletions(-)
 rename osu.Game/Rulesets/Objects/{ => Legacy}/ConvertHitObject.cs (83%)

diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableJudgement.cs
index 7b71f2feda..692d079c16 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableJudgement.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneDrawableJudgement.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Mania.Tests
             foreach (HitResult result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Skip(1))
             {
                 AddStep("Show " + result.GetDescription(), () => SetContents(() =>
-                    new DrawableManiaJudgement(new JudgementResult(new ConvertHitObject(), new Judgement()) { Type = result }, null)
+                    new DrawableManiaJudgement(new JudgementResult(new HitObject(), new Judgement()) { Type = result }, null)
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
index 8f72e2f60d..02d4406809 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneDrawableJudgement.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             foreach (HitResult result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Skip(1))
             {
                 AddStep("Show " + result.GetDescription(), () => SetContents(() =>
-                    new DrawableOsuJudgement(new JudgementResult(new ConvertHitObject(), new Judgement()) { Type = result }, null)
+                    new DrawableOsuJudgement(new JudgementResult(new HitObject(), new Judgement()) { Type = result }, null)
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayfield.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayfield.cs
index c8c4d004d6..c01eef5252 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoPlayfield.cs
@@ -148,7 +148,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             var h = new DrawableTestHit(hit) { X = RNG.NextSingle(hitResult == HitResult.Good ? -0.1f : -0.05f, hitResult == HitResult.Good ? 0.1f : 0.05f) };
 
-            ((TaikoPlayfield)drawableRuleset.Playfield).OnNewResult(h, new JudgementResult(new ConvertHitObject(), new TaikoJudgement()) { Type = hitResult });
+            ((TaikoPlayfield)drawableRuleset.Playfield).OnNewResult(h, new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = hitResult });
         }
 
         private void addStrongHitJudgement(bool kiai)
@@ -163,13 +163,13 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             var h = new DrawableTestHit(hit) { X = RNG.NextSingle(hitResult == HitResult.Good ? -0.1f : -0.05f, hitResult == HitResult.Good ? 0.1f : 0.05f) };
 
-            ((TaikoPlayfield)drawableRuleset.Playfield).OnNewResult(h, new JudgementResult(new ConvertHitObject(), new TaikoJudgement()) { Type = hitResult });
-            ((TaikoPlayfield)drawableRuleset.Playfield).OnNewResult(new TestStrongNestedHit(h), new JudgementResult(new ConvertHitObject(), new TaikoStrongJudgement()) { Type = HitResult.Great });
+            ((TaikoPlayfield)drawableRuleset.Playfield).OnNewResult(h, new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = hitResult });
+            ((TaikoPlayfield)drawableRuleset.Playfield).OnNewResult(new TestStrongNestedHit(h), new JudgementResult(new HitObject(), new TaikoStrongJudgement()) { Type = HitResult.Great });
         }
 
         private void addMissJudgement()
         {
-            ((TaikoPlayfield)drawableRuleset.Playfield).OnNewResult(new DrawableTestHit(new Hit()), new JudgementResult(new ConvertHitObject(), new TaikoJudgement()) { Type = HitResult.Miss });
+            ((TaikoPlayfield)drawableRuleset.Playfield).OnNewResult(new DrawableTestHit(new Hit()), new JudgementResult(new HitObject(), new TaikoJudgement()) { Type = HitResult.Miss });
         }
 
         private void addBarLine(bool major, double delay = scroll_time)
diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
index e99a10524e..7a89642e11 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectAccentColour.cs
@@ -11,8 +11,8 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Testing;
 using osu.Game.Audio;
-using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Skinning;
 using osu.Game.Tests.Visual;
diff --git a/osu.Game.Tests/Gameplay/TestSceneHitObjectContainer.cs b/osu.Game.Tests/Gameplay/TestSceneHitObjectContainer.cs
index 6452857bad..f2bfccb6de 100644
--- a/osu.Game.Tests/Gameplay/TestSceneHitObjectContainer.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneHitObjectContainer.cs
@@ -27,9 +27,9 @@ namespace osu.Game.Tests.Gameplay
         {
             DrawableHitObject hitObject = null;
 
-            AddStep("setup", () => container.Add(new TestDrawableHitObject(new ConvertHitObject { StartTime = 500 })));
+            AddStep("setup", () => container.Add(new TestDrawableHitObject(new HitObject { StartTime = 500 })));
 
-            AddStep("add late hitobject", () => container.Add(hitObject = new TestDrawableHitObject(new ConvertHitObject { StartTime = 1000 })));
+            AddStep("add late hitobject", () => container.Add(hitObject = new TestDrawableHitObject(new HitObject { StartTime = 1000 })));
 
             AddAssert("hitobject index is 0", () => container.IndexOf(hitObject) == 0);
         }
@@ -39,9 +39,9 @@ namespace osu.Game.Tests.Gameplay
         {
             DrawableHitObject hitObject = null;
 
-            AddStep("setup", () => container.Add(new TestDrawableHitObject(new ConvertHitObject { StartTime = 500 })));
+            AddStep("setup", () => container.Add(new TestDrawableHitObject(new HitObject { StartTime = 500 })));
 
-            AddStep("add early hitobject", () => container.Add(hitObject = new TestDrawableHitObject(new ConvertHitObject())));
+            AddStep("add early hitobject", () => container.Add(hitObject = new TestDrawableHitObject(new HitObject())));
 
             AddAssert("hitobject index is 0", () => container.IndexOf(hitObject) == 1);
         }
@@ -54,8 +54,8 @@ namespace osu.Game.Tests.Gameplay
 
             AddStep("setup", () =>
             {
-                container.Add(firstObject = new TestDrawableHitObject(new ConvertHitObject()));
-                container.Add(secondObject = new TestDrawableHitObject(new ConvertHitObject { StartTime = 1000 }));
+                container.Add(firstObject = new TestDrawableHitObject(new HitObject()));
+                container.Add(secondObject = new TestDrawableHitObject(new HitObject { StartTime = 1000 }));
             });
 
             AddStep("move first object after second", () => firstObject.HitObject.StartTime = 2000);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
index d350c3d58d..b25b81c9af 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneDrawableScrollingRuleset.cs
@@ -20,6 +20,7 @@ using osu.Game.Rulesets.Difficulty;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.UI;
@@ -163,7 +164,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             var beatmap = new Beatmap<HitObject> { BeatmapInfo = { Ruleset = new OsuRuleset().RulesetInfo } };
 
             for (int i = 0; i < 10; i++)
-                beatmap.HitObjects.Add(new ConvertHitObject { StartTime = i * time_range });
+                beatmap.HitObjects.Add(new HitObject { StartTime = i * time_range });
 
             return beatmap;
         }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
index 494611d414..ddad337c66 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
-using osu.Game.Rulesets.Objects;
 using System;
 using System.Collections.Generic;
 using osu.Game.Rulesets.Judgements;
@@ -12,6 +11,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Catch.Scoring;
 using osu.Game.Rulesets.Mania.Scoring;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Scoring;
@@ -124,7 +124,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private void newJudgement(double offset = 0)
         {
-            var judgement = new JudgementResult(new ConvertHitObject(), new Judgement())
+            var judgement = new JudgementResult(new HitObject(), new Judgement())
             {
                 TimeOffset = offset == 0 ? RNG.Next(-150, 150) : offset,
                 Type = HitResult.Perfect,
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
index c2a71eadae..d03716db2e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs
@@ -224,7 +224,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private class TestDrawableControlPoint : DrawableHitObject<HitObject>
         {
             public TestDrawableControlPoint(ScrollingDirection direction, double time)
-                : base(new ConvertHitObject { StartTime = time })
+                : base(new HitObject { StartTime = time })
             {
                 Origin = Anchor.Centre;
 
@@ -255,7 +255,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private class TestDrawableHitObject : DrawableHitObject<HitObject>
         {
             public TestDrawableHitObject(double time)
-                : base(new ConvertHitObject { StartTime = time })
+                : base(new HitObject { StartTime = time })
             {
                 Origin = Anchor.Custom;
                 OriginPosition = new Vector2(75 / 4.0f);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
index 6a60ae110b..b9b13d7bd8 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
@@ -123,7 +123,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             var objects = new List<HitObject>();
             for (double i = 0; i < 5000; i += RNG.NextDouble() * 10 + i / 1000)
-                objects.Add(new ConvertHitObject { StartTime = i });
+                objects.Add(new HitObject { StartTime = i });
 
             replaceObjects(objects);
         }
@@ -132,7 +132,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             var objects = new List<HitObject>();
             for (double i = 0; i < 5000; i++)
-                objects.Add(new ConvertHitObject { StartTime = i });
+                objects.Add(new HitObject { StartTime = i });
 
             replaceObjects(objects);
         }
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
index 5cac897200..e02ebf3be1 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs
@@ -13,6 +13,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Catch;
 using osu.Game.Rulesets.Mania;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Legacy;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Taiko;
diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index bef48f0ced..477d025253 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Objects
     /// HitObjects may contain more properties for which you should be checking through the IHas* types.
     /// </para>
     /// </summary>
-    public abstract class HitObject
+    public class HitObject
     {
         /// <summary>
         /// A small adjustment to the start time of control points to account for rounding/precision errors.
@@ -83,7 +83,7 @@ namespace osu.Game.Rulesets.Objects
         [JsonIgnore]
         public IReadOnlyList<HitObject> NestedHitObjects => nestedHitObjects;
 
-        protected HitObject()
+        public HitObject()
         {
             StartTimeBindable.ValueChanged += time =>
             {
@@ -147,7 +147,7 @@ namespace osu.Game.Rulesets.Objects
         /// Used to decide on drawable object lifetimes.
         /// </summary>
         [NotNull]
-        public abstract Judgement CreateJudgement();
+        public virtual Judgement CreateJudgement() => new Judgement();
 
         /// <summary>
         /// Creates the <see cref="HitWindows"/> for this <see cref="HitObject"/>.
@@ -157,7 +157,7 @@ namespace osu.Game.Rulesets.Objects
         /// </para>
         /// </summary>
         [NotNull]
-        protected abstract HitWindows CreateHitWindows();
+        protected virtual HitWindows CreateHitWindows() => new HitWindows();
     }
 
     public static class HitObjectExtensions
diff --git a/osu.Game/Rulesets/Objects/ConvertHitObject.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObject.cs
similarity index 83%
rename from osu.Game/Rulesets/Objects/ConvertHitObject.cs
rename to osu.Game/Rulesets/Objects/Legacy/ConvertHitObject.cs
index 81a88615a3..e3b0d8a498 100644
--- a/osu.Game/Rulesets/Objects/ConvertHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObject.cs
@@ -4,12 +4,12 @@
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
 
-namespace osu.Game.Rulesets.Objects
+namespace osu.Game.Rulesets.Objects.Legacy
 {
     /// <summary>
     /// A hit object only used for conversion, not actual gameplay.
     /// </summary>
-    public class ConvertHitObject : HitObject
+    internal abstract class ConvertHitObject : HitObject
     {
         public override Judgement CreateJudgement() => new IgnoreJudgement();
 

From 36079236e6d96ea1c3a688e662cee9de4e6e0fe4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Feb 2020 19:22:51 +0900
Subject: [PATCH 0749/1142] Remove pointless comment

Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>
---
 osu.Game/Rulesets/Objects/HitObject.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/HitObject.cs b/osu.Game/Rulesets/Objects/HitObject.cs
index 477d025253..9a8efdde84 100644
--- a/osu.Game/Rulesets/Objects/HitObject.cs
+++ b/osu.Game/Rulesets/Objects/HitObject.cs
@@ -144,7 +144,6 @@ namespace osu.Game.Rulesets.Objects
 
         /// <summary>
         /// Creates the <see cref="Judgement"/> that represents the scoring information for this <see cref="HitObject"/>.
-        /// Used to decide on drawable object lifetimes.
         /// </summary>
         [NotNull]
         public virtual Judgement CreateJudgement() => new Judgement();

From b872f782e7eae6fe381c2c9f32666626326e4d49 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Feb 2020 20:04:39 +0900
Subject: [PATCH 0750/1142] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 939d179b1d..24afbb86fb 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -54,6 +54,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.221.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.221.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.225.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 24ee25c4de..c5ebf0f712 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.221.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.221.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.225.0" />
     <PackageReference Include="Sentry" Version="2.0.3" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 3743138c1a..9574b8cba9 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -74,7 +74,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.221.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.221.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.225.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
@@ -82,7 +82,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.221.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.225.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 9557a2cd9659fdc565fa95510d7f6b49c71337d3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 25 Feb 2020 20:52:33 +0900
Subject: [PATCH 0751/1142] Use object initialiser

---
 osu.Game/Screens/Edit/Editor.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 8d3b8849bc..3a6f02f811 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -93,9 +93,10 @@ namespace osu.Game.Screens.Edit
 
             EditorMenuBar menuBar;
 
-            var fileMenuItems = new List<MenuItem>();
-
-            fileMenuItems.Add(new EditorMenuItem("Save", MenuItemType.Standard, saveBeatmap));
+            var fileMenuItems = new List<MenuItem>
+            {
+                new EditorMenuItem("Save", MenuItemType.Standard, saveBeatmap)
+            };
 
             if (RuntimeInfo.IsDesktop)
                 fileMenuItems.Add(new EditorMenuItem("Export package", MenuItemType.Standard, exportBeatmap));

From 535a7989d613538564df1ed650968bf56d49d965 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Tue, 25 Feb 2020 20:57:15 +0100
Subject: [PATCH 0752/1142] Open rankings overlay on spotlights page.

---
 osu.Game/Overlays/RankingsOverlay.cs | 6 ++++++
 osu.Game/Screens/Menu/MainMenu.cs    | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/RankingsOverlay.cs b/osu.Game/Overlays/RankingsOverlay.cs
index 3304c6ebec..afb23883ac 100644
--- a/osu.Game/Overlays/RankingsOverlay.cs
+++ b/osu.Game/Overlays/RankingsOverlay.cs
@@ -138,6 +138,12 @@ namespace osu.Game.Overlays
             Country.Value = requested;
         }
 
+        public void ShowSpotlights()
+        {
+            Scope.Value = RankingsScope.Spotlights;
+            Show();
+        }
+
         private void loadNewContent()
         {
             loading.Show();
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index af5db4ce8c..127270f521 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Screens.Menu
 
             buttons.OnSettings = () => settings?.ToggleVisibility();
             buttons.OnDirect = () => direct?.ToggleVisibility();
-            buttons.OnChart = () => rankings?.ToggleVisibility();
+            buttons.OnChart = () => rankings?.ShowSpotlights();
 
             LoadComponentAsync(background = new BackgroundScreenDefault());
             preloadSongSelect();

From 88ec31c262e7d8fefe84d90babb7358a9ebd13c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 25 Feb 2020 22:39:20 +0100
Subject: [PATCH 0753/1142] Add tests demonstrating crash

---
 .../TestSceneBananaShower.cs                  |  8 ++-
 .../TestSceneJuiceStream.cs                   | 56 +++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs
index 56e378d19e..20911b8d06 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs
@@ -29,6 +29,12 @@ namespace osu.Game.Rulesets.Catch.Tests
         {
         }
 
+        [Test]
+        public void TestBananaShower()
+        {
+            AddUntilStep("player is done", () => !Player.ValidForResume);
+        }
+
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {
             var beatmap = new Beatmap
@@ -40,7 +46,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                 }
             };
 
-            beatmap.HitObjects.Add(new BananaShower { StartTime = 200, Duration = 5000, NewCombo = true });
+            beatmap.HitObjects.Add(new BananaShower { StartTime = 200, Duration = 3000, NewCombo = true });
 
             return beatmap;
         }
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
new file mode 100644
index 0000000000..cbc87459e1
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs
@@ -0,0 +1,56 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using NUnit.Framework;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Tests.Visual;
+using osuTK;
+
+namespace osu.Game.Rulesets.Catch.Tests
+{
+    public class TestSceneJuiceStream : PlayerTestScene
+    {
+        public TestSceneJuiceStream()
+            : base(new CatchRuleset())
+        {
+        }
+
+        [Test]
+        public void TestJuiceStreamEndingCombo()
+        {
+            AddUntilStep("player is done", () => !Player.ValidForResume);
+        }
+
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new Beatmap
+        {
+            BeatmapInfo = new BeatmapInfo
+            {
+                BaseDifficulty = new BeatmapDifficulty { CircleSize = 5, SliderMultiplier = 2 },
+                Ruleset = ruleset
+            },
+            HitObjects = new List<HitObject>
+            {
+                new JuiceStream
+                {
+                    X = 0.5f,
+                    Path = new SliderPath(PathType.Linear, new[]
+                    {
+                        Vector2.Zero,
+                        new Vector2(0, 100)
+                    }),
+                    StartTime = 200
+                },
+                new Banana
+                {
+                    X = 0.5f,
+                    StartTime = 1000,
+                    NewCombo = true
+                }
+            }
+        };
+    }
+}

From bf36dc10a561b02bad1399a6c3a0991572173a8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 25 Feb 2020 23:13:32 +0100
Subject: [PATCH 0754/1142] Fix invalid cast

Since introduction of IgnoreJudgement and its usage in JuiceStream
and BananaShower the hard cast in CatcherArea that was used to check
if the drawable hit object should cause the fruits on the plate explode
at the end of combo caused a hard crash instead, since IgnoreJudgement
was no longer deriving from CatchJudgement.

Replace the hard cast with a soft pattern-matched cast.
---
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index ff2471f8bf..0b3809150a 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
             if (fruit.HitObject.LastInCombo)
             {
-                if (((CatchJudgement)result.Judgement).ShouldExplodeFor(result))
+                if (result.Judgement is CatchJudgement catchJudgement && catchJudgement.ShouldExplodeFor(result))
                     runAfterLoaded(() => MovableCatcher.Explode());
                 else
                     MovableCatcher.Drop();

From fab49fb1ba593f6a1c7da84afae5605871e77f53 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 26 Feb 2020 12:18:46 +0900
Subject: [PATCH 0755/1142] Slightly increase HP awarded for 100s

---
 osu.Game/Rulesets/Judgements/Judgement.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Judgements/Judgement.cs b/osu.Game/Rulesets/Judgements/Judgement.cs
index 599135ba54..9105b920ca 100644
--- a/osu.Game/Rulesets/Judgements/Judgement.cs
+++ b/osu.Game/Rulesets/Judgements/Judgement.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Rulesets.Judgements
                     return -DEFAULT_MAX_HEALTH_INCREASE * 0.01;
 
                 case HitResult.Good:
-                    return DEFAULT_MAX_HEALTH_INCREASE * 0.3;
+                    return DEFAULT_MAX_HEALTH_INCREASE * 0.5;
 
                 case HitResult.Great:
                     return DEFAULT_MAX_HEALTH_INCREASE;

From 334ec7bbd48ea58c524ba24f0ad4108db9d33dce Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 26 Feb 2020 15:06:30 +0900
Subject: [PATCH 0756/1142] Apply further framework changes

---
 osu.Game/Graphics/Containers/SectionsContainer.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index 9d886c457f..07a50c39e1 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Layout;
 
 namespace osu.Game.Graphics.Containers
 {
@@ -142,15 +143,17 @@ namespace osu.Game.Graphics.Containers
 
         public void ScrollToTop() => scrollContainer.ScrollTo(0);
 
-        public override void InvalidateFromChild(Invalidation invalidation, Drawable source = null)
+        protected override bool OnInvalidate(Invalidation invalidation, InvalidationSource source)
         {
-            base.InvalidateFromChild(invalidation, source);
+            var result = base.OnInvalidate(invalidation, source);
 
-            if ((invalidation & Invalidation.DrawSize) != 0)
+            if (source == InvalidationSource.Child && (invalidation & Invalidation.DrawSize) != 0)
             {
-                if (source == ExpandableHeader) //We need to recalculate the positions if the ExpandableHeader changed its size
-                    lastKnownScroll = -1;
+                lastKnownScroll = -1;
+                result = true;
             }
+
+            return result;
         }
 
         private float lastKnownScroll;

From 015a39abc76eaebe0b69ff3b1bf6eef6b4c0a761 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Feb 2020 18:45:06 +0900
Subject: [PATCH 0757/1142] Fix hyperdash fruit not visible on default skin

---
 .../Objects/Drawables/FruitPiece.cs           | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
index 0f5044eda7..5797588ded 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/FruitPiece.cs
@@ -7,9 +7,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Rulesets.Catch.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Objects.Drawables;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
@@ -64,15 +62,24 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
             if (hitObject.HyperDash)
             {
-                AddInternal(new Pulp
+                AddInternal(new Circle
                 {
-                    RelativePositionAxes = Axes.Both,
+                    RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    AccentColour = { Value = Color4.Red },
-                    Blending = BlendingParameters.Additive,
-                    Alpha = 0.5f,
-                    Scale = new Vector2(1.333f)
+                    BorderColour = Color4.Red,
+                    BorderThickness = 12f * RADIUS_ADJUST,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            AlwaysPresent = true,
+                            Alpha = 0.3f,
+                            Blending = BlendingParameters.Additive,
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = Color4.Red,
+                        }
+                    }
                 });
             }
         }

From 83495eb64804e1089cb8712a992f20e64996d1de Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Feb 2020 19:22:09 +0900
Subject: [PATCH 0758/1142] Add testing support for hyperdash fruits

---
 .../TestSceneFruitObjects.cs                          | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
index 7bade41e6c..82d5aa936f 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs
@@ -42,6 +42,9 @@ namespace osu.Game.Rulesets.Catch.Tests
             AddStep("show droplet", () => SetContents(createDrawableDroplet));
 
             AddStep("show tiny droplet", () => SetContents(createDrawableTinyDroplet));
+
+            foreach (FruitVisualRepresentation rep in Enum.GetValues(typeof(FruitVisualRepresentation)))
+                AddStep($"show hyperdash {rep}", () => SetContents(() => createDrawable(rep, true)));
         }
 
         private Drawable createDrawableTinyDroplet()
@@ -82,9 +85,13 @@ namespace osu.Game.Rulesets.Catch.Tests
             };
         }
 
-        private Drawable createDrawable(FruitVisualRepresentation rep)
+        private Drawable createDrawable(FruitVisualRepresentation rep, bool hyperdash = false)
         {
-            Fruit fruit = new TestCatchFruit(rep) { Scale = 1.5f };
+            Fruit fruit = new TestCatchFruit(rep)
+            {
+                Scale = 1.5f,
+                HyperDashTarget = hyperdash ? new Banana() : null
+            };
 
             return new DrawableFruit(fruit)
             {

From e5927447fc5664c00f0092a48b1ab24913610dee Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Feb 2020 19:22:46 +0900
Subject: [PATCH 0759/1142] Fix hyperdash fruit not visible on custom skins

---
 .../Skinning/LegacyFruitPiece.cs               | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
index 2631fe5487..25ee0811d0 100644
--- a/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/LegacyFruitPiece.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Skinning;
+using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Skinning
@@ -49,6 +50,23 @@ namespace osu.Game.Rulesets.Catch.Skinning
                     Origin = Anchor.Centre,
                 },
             };
+
+            if (drawableCatchObject.HitObject.HyperDash)
+            {
+                var hyperDash = new Sprite
+                {
+                    Texture = skin.GetTexture(lookupName),
+                    Colour = Color4.Red,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Blending = BlendingParameters.Additive,
+                    Depth = 1,
+                    Alpha = 0.7f,
+                    Scale = new Vector2(1.2f)
+                };
+
+                AddInternal(hyperDash);
+            }
         }
 
         protected override void LoadComplete()

From 2aa649e073d75b0d7b9df8880096f510135d279e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Feb 2020 19:31:49 +0900
Subject: [PATCH 0760/1142] Fix catcher dropping juice streams due to it
 considering ignored judgements

---
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 0b3809150a..b977d46611 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -50,6 +50,9 @@ namespace osu.Game.Rulesets.Catch.UI
 
         public void OnResult(DrawableCatchHitObject fruit, JudgementResult result)
         {
+            if (result.Judgement is IgnoreJudgement)
+                return;
+
             void runAfterLoaded(Action action)
             {
                 if (lastPlateableFruit == null)

From ed2bdd7106da3abb8bf04bf9bbb47bbc20ef2b96 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Feb 2020 20:45:57 +0900
Subject: [PATCH 0761/1142] Fix stutter when showing game HUD after being
 hidden for a while

---
 osu.Game/Screens/Play/HUD/HealthDisplay.cs        |  7 -------
 .../Screens/Play/HUD/StandardHealthDisplay.cs     | 15 ++++++++++++++-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HealthDisplay.cs b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
index acd8656fb2..37038ad58c 100644
--- a/osu.Game/Screens/Play/HUD/HealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/HealthDisplay.cs
@@ -13,12 +13,5 @@ namespace osu.Game.Screens.Play.HUD
             MinValue = 0,
             MaxValue = 1
         };
-
-        protected HealthDisplay()
-        {
-            Current.ValueChanged += health => SetHealth((float)health.NewValue);
-        }
-
-        protected abstract void SetHealth(float value);
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs b/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs
index 315bc27a79..7736541c92 100644
--- a/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs
@@ -12,6 +12,7 @@ using osu.Game.Rulesets.Judgements;
 using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Screens.Play.HUD
@@ -108,11 +109,23 @@ namespace osu.Game.Screens.Play.HUD
             if (result.Type == HitResult.Miss)
                 return;
 
+            Scheduler.AddOnce(flash);
+        }
+
+        private void flash()
+        {
             fill.FadeEdgeEffectTo(Math.Min(1, fill.EdgeEffect.Colour.Linear.A + (1f - base_glow_opacity) / glow_max_hits), 50, Easing.OutQuint)
                 .Delay(glow_fade_delay)
                 .FadeEdgeEffectTo(base_glow_opacity, glow_fade_time, Easing.OutQuint);
         }
 
-        protected override void SetHealth(float value) => fill.ResizeTo(new Vector2(value, 1), 200, Easing.OutQuint);
+        protected override void Update()
+        {
+            base.Update();
+
+            fill.Width = Interpolation.ValueAt(
+                Math.Clamp(Clock.ElapsedFrameTime, 0, 200),
+                fill.Width, (float)Current.Value, 0, 200, Easing.OutQuint);
+        }
     }
 }

From 54d83eff94dc357a4ffb1d2443f42f170023f022 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 26 Feb 2020 19:35:20 +0300
Subject: [PATCH 0762/1142] Use OverlayColourProfider for VotePill component

---
 osu.Game.Tests/Visual/Online/TestSceneVotePill.cs | 5 +++++
 osu.Game/Overlays/Comments/VotePill.cs            | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs b/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
index 8197cf72de..770cef8f1b 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneVotePill.cs
@@ -7,6 +7,8 @@ using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Game.Overlays.Comments;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Framework.Allocation;
+using osu.Game.Overlays;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -18,6 +20,9 @@ namespace osu.Game.Tests.Visual.Online
             typeof(VotePill)
         };
 
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+
         private VotePill votePill;
 
         [Test]
diff --git a/osu.Game/Overlays/Comments/VotePill.cs b/osu.Game/Overlays/Comments/VotePill.cs
index 978846549e..aa9723ea85 100644
--- a/osu.Game/Overlays/Comments/VotePill.cs
+++ b/osu.Game/Overlays/Comments/VotePill.cs
@@ -33,6 +33,9 @@ namespace osu.Game.Overlays.Comments
         [Resolved]
         private IAPIProvider api { get; set; }
 
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; }
+
         private readonly Comment comment;
         private Box background;
         private Box hoverLayer;
@@ -68,7 +71,7 @@ namespace osu.Game.Overlays.Comments
             base.LoadComplete();
             isVoted.Value = comment.IsVoted;
             votesCount.Value = comment.VotesCount;
-            isVoted.BindValueChanged(voted => background.Colour = voted.NewValue ? AccentColour : OsuColour.Gray(0.05f), true);
+            isVoted.BindValueChanged(voted => background.Colour = voted.NewValue ? AccentColour : colourProvider.Background6, true);
             votesCount.BindValueChanged(count => votesCounter.Text = $"+{count.NewValue}", true);
         }
 

From 397e35d0a0128adf174a7539f13a2a70da153762 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 26 Feb 2020 21:36:52 +0100
Subject: [PATCH 0763/1142] Hide pp column if map is loved or qualified

---
 .../Overlays/BeatmapSet/Scores/ScoreTable.cs  | 36 +++++++++----------
 .../Scores/TopScoreStatisticsSection.cs       |  3 +-
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 7baf6c7fcb..c9008adc85 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -88,11 +88,10 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
 
             columns.Add(new TableColumn(score.SortedStatistics.LastOrDefault().Key.GetDescription(), Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed, minSize: 45, maxSize: 95)));
 
-            columns.AddRange(new[]
-            {
-                new TableColumn("pp", Anchor.CentreLeft, new Dimension(GridSizeMode.Absolute, 30)),
-                new TableColumn("mods", Anchor.CentreLeft, new Dimension(GridSizeMode.AutoSize)),
-            });
+            if (score.PP.HasValue)
+                columns.Add(new TableColumn("pp", Anchor.CentreLeft, new Dimension(GridSizeMode.Absolute, 30)));
+
+            columns.Add(new TableColumn("mods", Anchor.CentreLeft, new Dimension(GridSizeMode.AutoSize)));
 
             return columns.ToArray();
         }
@@ -150,24 +149,25 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 });
             }
 
-            content.AddRange(new Drawable[]
+            if (score.PP.HasValue)
             {
-                new OsuSpriteText
+                content.Add(new OsuSpriteText
                 {
-                    Text = $@"{score.PP ?? 0:N0}",
+                    Text = $@"{score.PP:N0}",
                     Font = OsuFont.GetFont(size: text_size)
-                },
-                new FillFlowContainer
+                });
+            }
+
+            content.Add(new FillFlowContainer
+            {
+                Direction = FillDirection.Horizontal,
+                AutoSizeAxes = Axes.Both,
+                Spacing = new Vector2(1),
+                ChildrenEnumerable = score.Mods.Select(m => new ModIcon(m)
                 {
-                    Direction = FillDirection.Horizontal,
                     AutoSizeAxes = Axes.Both,
-                    Spacing = new Vector2(1),
-                    ChildrenEnumerable = score.Mods.Select(m => new ModIcon(m)
-                    {
-                        AutoSizeAxes = Axes.Both,
-                        Scale = new Vector2(0.3f)
-                    })
-                },
+                    Scale = new Vector2(0.3f)
+                })
             });
 
             return content.ToArray();
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index 0616871897..12ad014f61 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -96,7 +96,8 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 totalScoreColumn.Text = $@"{value.TotalScore:N0}";
                 accuracyColumn.Text = value.DisplayAccuracy;
                 maxComboColumn.Text = $@"{value.MaxCombo:N0}x";
-                ppColumn.Text = $@"{value.PP ?? 0:N0}";
+                ppColumn.Alpha = value.PP.HasValue ? 1 : 0;
+                ppColumn.Text = $@"{value.PP:N0}";
 
                 statisticsColumns.ChildrenEnumerable = value.SortedStatistics.Select(kvp => createStatisticsColumn(kvp.Key, kvp.Value));
                 modsColumn.Mods = value.Mods;

From a4edd3b8a18a7a197f39d3db98ae1997f5e02a74 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 27 Feb 2020 09:24:45 +0900
Subject: [PATCH 0764/1142] Fix iOS/Android lockups by disabling LLVM

---
 osu.Android.props              | 2 --
 osu.Android/osu.Android.csproj | 3 ++-
 osu.iOS.props                  | 3 ---
 osu.iOS/osu.iOS.csproj         | 3 ++-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 24afbb86fb..28fbdb3367 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -25,7 +25,6 @@
     <DebugType>portable</DebugType>
     <Optimize>False</Optimize>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <EnableLLVM>false</EnableLLVM>
     <AndroidManagedSymbols>false</AndroidManagedSymbols>
     <AndroidUseSharedRuntime>true</AndroidUseSharedRuntime>
     <EmbedAssembliesIntoApk>false</EmbedAssembliesIntoApk>
@@ -34,7 +33,6 @@
     <DebugSymbols>false</DebugSymbols>
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
-    <EnableLLVM>true</EnableLLVM>
     <AndroidManagedSymbols>false</AndroidManagedSymbols>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
diff --git a/osu.Android/osu.Android.csproj b/osu.Android/osu.Android.csproj
index ac3905a372..0598a50530 100644
--- a/osu.Android/osu.Android.csproj
+++ b/osu.Android/osu.Android.csproj
@@ -13,6 +13,7 @@
     <AssemblyName>osu.Android</AssemblyName>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a</AndroidSupportedAbis>
+    <EnableLLVM>false</EnableLLVM> <!-- This currently causes random lockups during gameplay. https://github.com/mono/mono/issues/18973 -->
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <MandroidI18n>cjk;mideast;other;rare;west</MandroidI18n>
@@ -52,4 +53,4 @@
     <AndroidResource Include="Resources\drawable\lazer.png" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/osu.iOS.props b/osu.iOS.props
index 9574b8cba9..abd562dc81 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -49,9 +49,6 @@
     <DeviceSpecificBuild>true</DeviceSpecificBuild>
     <IOSDebuggerPort>28126</IOSDebuggerPort>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
-    <MtouchUseLlvm>true</MtouchUseLlvm>
-  </PropertyGroup>
   <ItemGroup>
     <NativeReference Include="$(OutputPath)\libbass.a;$(OutputPath)\libbass_fx.a">
       <Kind>Static</Kind>
diff --git a/osu.iOS/osu.iOS.csproj b/osu.iOS/osu.iOS.csproj
index d60a3475e7..1e9a21865d 100644
--- a/osu.iOS/osu.iOS.csproj
+++ b/osu.iOS/osu.iOS.csproj
@@ -7,6 +7,7 @@
     <ProjectGuid>{3F082D0B-A964-43D7-BDF7-C256D76A50D0}</ProjectGuid>
     <RootNamespace>osu.iOS</RootNamespace>
     <AssemblyName>osu.iOS</AssemblyName>
+    <MtouchUseLlvm>false</MtouchUseLlvm> <!-- This currently causes random lockups during gameplay. https://github.com/mono/mono/issues/18973 -->
   </PropertyGroup>
   <Import Project="..\osu.iOS.props" />
   <ItemGroup>
@@ -116,4 +117,4 @@
     </ImageAsset>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>

From c06db5a54acbb72d90c1a208f35b3e8b289c1fd5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 27 Feb 2020 11:28:29 +0900
Subject: [PATCH 0765/1142] Remove legacy DrawableHitObject state management

---
 .../Objects/Drawables/DrawableHitObject.cs    | 69 +++++--------------
 1 file changed, 17 insertions(+), 52 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 9a5e25c8ac..aa29e42fac 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -221,18 +221,6 @@ namespace osu.Game.Rulesets.Objects.Drawables
         /// </summary>
         public event Action<DrawableHitObject, ArmedState> ApplyCustomUpdateState;
 
-#pragma warning disable 618 // (legacy state management) - can be removed 20200227
-
-        /// <summary>
-        /// Enables automatic transform management of this hitobject. Implementation of transforms should be done in <see cref="UpdateInitialTransforms"/> and <see cref="UpdateStateTransforms"/> only. Rewinding and removing previous states is done automatically.
-        /// </summary>
-        /// <remarks>
-        /// Going forward, this is the preferred way of implementing <see cref="DrawableHitObject"/>s. Previous functionality
-        /// is offered as a compatibility layer until all rulesets have been migrated across.
-        /// </remarks>
-        [Obsolete("Use UpdateInitialTransforms()/UpdateStateTransforms() instead")] // can be removed 20200227
-        protected virtual bool UseTransformStateManagement => true;
-
         protected override void ClearInternal(bool disposeChildren = true) => throw new InvalidOperationException($"Should never clear a {nameof(DrawableHitObject)}");
 
         private void updateState(ArmedState newState, bool force = false)
@@ -240,35 +228,28 @@ namespace osu.Game.Rulesets.Objects.Drawables
             if (State.Value == newState && !force)
                 return;
 
-            if (UseTransformStateManagement)
+            LifetimeEnd = double.MaxValue;
+
+            double transformTime = HitObject.StartTime - InitialLifetimeOffset;
+
+            base.ApplyTransformsAt(double.MinValue, true);
+            base.ClearTransformsAfter(double.MinValue, true);
+
+            using (BeginAbsoluteSequence(transformTime, true))
             {
-                LifetimeEnd = double.MaxValue;
+                UpdateInitialTransforms();
 
-                double transformTime = HitObject.StartTime - InitialLifetimeOffset;
+                var judgementOffset = Result?.TimeOffset ?? 0;
 
-                base.ApplyTransformsAt(double.MinValue, true);
-                base.ClearTransformsAfter(double.MinValue, true);
-
-                using (BeginAbsoluteSequence(transformTime, true))
+                using (BeginDelayedSequence(InitialLifetimeOffset + judgementOffset, true))
                 {
-                    UpdateInitialTransforms();
-
-                    var judgementOffset = Result?.TimeOffset ?? 0;
-
-                    using (BeginDelayedSequence(InitialLifetimeOffset + judgementOffset, true))
-                    {
-                        UpdateStateTransforms(newState);
-                        state.Value = newState;
-                    }
+                    UpdateStateTransforms(newState);
+                    state.Value = newState;
                 }
-
-                if (state.Value != ArmedState.Idle && LifetimeEnd == double.MaxValue || HitObject.HitWindows == null)
-                    Expire();
             }
-            else
-                state.Value = newState;
 
-            UpdateState(newState);
+            if (state.Value != ArmedState.Idle && LifetimeEnd == double.MaxValue || HitObject.HitWindows == null)
+                Expire();
 
             // apply any custom state overrides
             ApplyCustomUpdateState?.Invoke(this, newState);
@@ -303,30 +284,14 @@ namespace osu.Game.Rulesets.Objects.Drawables
 
         public override void ClearTransformsAfter(double time, bool propagateChildren = false, string targetMember = null)
         {
-            // When we are using automatic state management, parent calls to this should be blocked for safety.
-            if (!UseTransformStateManagement)
-                base.ClearTransformsAfter(time, propagateChildren, targetMember);
+            // Parent calls to this should be blocked for safety, as we are manually handling this in updateState.
         }
 
         public override void ApplyTransformsAt(double time, bool propagateChildren = false)
         {
-            // When we are using automatic state management, parent calls to this should be blocked for safety.
-            if (!UseTransformStateManagement)
-                base.ApplyTransformsAt(time, propagateChildren);
+            // Parent calls to this should be blocked for safety, as we are manually handling this in updateState.
         }
 
-        /// <summary>
-        /// Legacy method to handle state changes.
-        /// Should generally not be used when <see cref="UseTransformStateManagement"/> is true; use <see cref="UpdateStateTransforms"/> instead.
-        /// </summary>
-        /// <param name="state">The new armed state.</param>
-        [Obsolete("Use UpdateInitialTransforms()/UpdateStateTransforms() instead")] // can be removed 20200227
-        protected virtual void UpdateState(ArmedState state)
-        {
-        }
-
-#pragma warning restore 618
-
         #endregion
 
         protected sealed override void SkinChanged(ISkinSource skin, bool allowFallback)

From 7ad6ad0bb01fbc023a02080fd6b373571455a4e9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 27 Feb 2020 13:32:23 +0900
Subject: [PATCH 0766/1142] Remove hacks that bypassed layout shortcomings

---
 osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs    | 10 ++--------
 .../Select/Carousel/DrawableCarouselBeatmapSet.cs     | 11 ++---------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
index a7ed1f5846..6cd1aa912f 100644
--- a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
@@ -246,10 +246,11 @@ namespace osu.Game.Screens.Multi
                         FillMode = FillMode.Fill,
                         Beatmap = { BindTarget = Beatmap }
                     },
-                    new Container
+                    new FillFlowContainer
                     {
                         Depth = -1,
                         RelativeSizeAxes = Axes.Both,
+                        Direction = FillDirection.Horizontal,
                         // This makes the gradient not be perfectly horizontal, but diagonal at a ~40° angle
                         Shear = new Vector2(0.8f, 0),
                         Alpha = 0.5f,
@@ -259,7 +260,6 @@ namespace osu.Game.Screens.Multi
                             new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                RelativePositionAxes = Axes.Both,
                                 Colour = Color4.Black,
                                 Width = 0.4f,
                             },
@@ -267,26 +267,20 @@ namespace osu.Game.Screens.Multi
                             new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                RelativePositionAxes = Axes.Both,
                                 Colour = ColourInfo.GradientHorizontal(Color4.Black, new Color4(0f, 0f, 0f, 0.9f)),
                                 Width = 0.05f,
-                                X = 0.4f,
                             },
                             new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                RelativePositionAxes = Axes.Both,
                                 Colour = ColourInfo.GradientHorizontal(new Color4(0f, 0f, 0f, 0.9f), new Color4(0f, 0f, 0f, 0.1f)),
                                 Width = 0.2f,
-                                X = 0.45f,
                             },
                             new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                RelativePositionAxes = Axes.Both,
                                 Colour = ColourInfo.GradientHorizontal(new Color4(0f, 0f, 0f, 0.1f), new Color4(0, 0, 0, 0)),
                                 Width = 0.05f,
-                                X = 0.65f,
                             },
                         }
                     }
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 1672131949..6cd145cfef 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -159,11 +159,11 @@ namespace osu.Game.Screens.Select.Carousel
                         Origin = Anchor.Centre,
                         FillMode = FillMode.Fill,
                     },
-                    // Todo: This should be a fill flow, but has invalidation issues (see https://github.com/ppy/osu-framework/issues/223)
-                    new Container
+                    new FillFlowContainer
                     {
                         Depth = -1,
                         RelativeSizeAxes = Axes.Both,
+                        Direction = FillDirection.Horizontal,
                         // This makes the gradient not be perfectly horizontal, but diagonal at a ~40° angle
                         Shear = new Vector2(0.8f, 0),
                         Alpha = 0.5f,
@@ -173,7 +173,6 @@ namespace osu.Game.Screens.Select.Carousel
                             new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                RelativePositionAxes = Axes.Both,
                                 Colour = Color4.Black,
                                 Width = 0.4f,
                             },
@@ -181,26 +180,20 @@ namespace osu.Game.Screens.Select.Carousel
                             new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                RelativePositionAxes = Axes.Both,
                                 Colour = ColourInfo.GradientHorizontal(Color4.Black, new Color4(0f, 0f, 0f, 0.9f)),
                                 Width = 0.05f,
-                                X = 0.4f,
                             },
                             new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                RelativePositionAxes = Axes.Both,
                                 Colour = ColourInfo.GradientHorizontal(new Color4(0f, 0f, 0f, 0.9f), new Color4(0f, 0f, 0f, 0.1f)),
                                 Width = 0.2f,
-                                X = 0.45f,
                             },
                             new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                RelativePositionAxes = Axes.Both,
                                 Colour = ColourInfo.GradientHorizontal(new Color4(0f, 0f, 0f, 0.1f), new Color4(0, 0, 0, 0)),
                                 Width = 0.05f,
-                                X = 0.65f,
                             },
                         }
                     },

From 101a5876419b52fe97028b8f86620c8d04b78afe Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 27 Feb 2020 15:51:55 +0900
Subject: [PATCH 0767/1142] Disable triangles in triangles intro

---
 osu.Game/Screens/Menu/IntroTriangles.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index 29f32406e8..4e51ff939a 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -54,8 +54,6 @@ namespace osu.Game.Screens.Menu
         {
             base.LogoArriving(logo, resuming);
 
-            logo.Triangles = true;
-
             if (!resuming)
             {
                 PrepareMenuLoad();

From 3f5c4633bc235a6ed0add44b72295be71833c7a9 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 27 Feb 2020 16:40:56 +0900
Subject: [PATCH 0768/1142] Remove workarounds for CreateRoomRequest
 shortcomings

---
 osu.Game/Online/Multiplayer/PlaylistItem.cs | 4 +---
 osu.Game/Online/Multiplayer/Room.cs         | 9 ---------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/PlaylistItem.cs b/osu.Game/Online/Multiplayer/PlaylistItem.cs
index 11e4854174..9d6e8eb8e3 100644
--- a/osu.Game/Online/Multiplayer/PlaylistItem.cs
+++ b/osu.Game/Online/Multiplayer/PlaylistItem.cs
@@ -65,9 +65,7 @@ namespace osu.Game.Online.Multiplayer
 
         public void MapObjects(BeatmapManager beatmaps, RulesetStore rulesets)
         {
-            // If we don't have an api beatmap, the request occurred as a result of room creation, so we can query the local beatmap instead
-            // Todo: Is this a bug? Room creation only returns the beatmap ID
-            Beatmap.Value = apiBeatmap == null ? beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == BeatmapID) : apiBeatmap.ToBeatmap(rulesets);
+            Beatmap.Value = apiBeatmap.ToBeatmap(rulesets);
             Ruleset.Value = rulesets.GetRuleset(RulesetID);
 
             Ruleset rulesetInstance = Ruleset.Value.CreateInstance();
diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs
index 2bfcc019fa..c55822c407 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Multiplayer/Room.cs
@@ -118,15 +118,6 @@ namespace osu.Game.Online.Multiplayer
             if (DateTimeOffset.Now >= EndDate.Value)
                 Status.Value = new RoomStatusEnded();
 
-            // transfer local beatmaps across to ensure we have Metadata available (CreateRoomRequest does not give us metadata as expected)
-            foreach (var item in other.Playlist)
-            {
-                var localItem = Playlist.FirstOrDefault(i => i.BeatmapID == item.BeatmapID);
-
-                if (localItem != null)
-                    item.Beatmap.Value.Metadata = localItem.Beatmap.Value.Metadata;
-            }
-
             if (!Playlist.SequenceEqual(other.Playlist))
             {
                 Playlist.Clear();

From ffa8a50c6bcddfd643c6a5abd3c213b4fb750e2e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 27 Feb 2020 19:21:59 +0900
Subject: [PATCH 0769/1142] Make User IEquatable

---
 osu.Game/Users/User.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index c573fdd089..d25c552160 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -9,7 +9,7 @@ using osu.Framework.Bindables;
 
 namespace osu.Game.Users
 {
-    public class User
+    public class User : IEquatable<User>
     {
         [JsonProperty(@"id")]
         public long Id = 1;
@@ -244,5 +244,13 @@ namespace osu.Game.Users
             [Description("Touch Screen")]
             Touch,
         }
+
+        public bool Equals(User other)
+        {
+            if (ReferenceEquals(null, other)) return false;
+            if (ReferenceEquals(this, other)) return true;
+
+            return Id == other.Id;
+        }
     }
 }

From 99442ec9c322f66c450b059698d41e696a64e102 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 27 Feb 2020 19:23:21 +0900
Subject: [PATCH 0770/1142] Implement single-room multiplayer room polling

---
 .../Online/API/Requests/GetRoomRequest.cs     |  19 ++
 .../Multi/Lounge/Components/RoomsContainer.cs |   4 +-
 .../Screens/Multi/Lounge/LoungeSubScreen.cs   |   8 +-
 osu.Game/Screens/Multi/Multiplayer.cs         |  37 ++-
 osu.Game/Screens/Multi/RoomManager.cs         | 211 ++++++++++++++----
 5 files changed, 223 insertions(+), 56 deletions(-)
 create mode 100644 osu.Game/Online/API/Requests/GetRoomRequest.cs

diff --git a/osu.Game/Online/API/Requests/GetRoomRequest.cs b/osu.Game/Online/API/Requests/GetRoomRequest.cs
new file mode 100644
index 0000000000..531e1857de
--- /dev/null
+++ b/osu.Game/Online/API/Requests/GetRoomRequest.cs
@@ -0,0 +1,19 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Online.Multiplayer;
+
+namespace osu.Game.Online.API.Requests
+{
+    public class GetRoomRequest : APIRequest<Room>
+    {
+        private readonly int roomId;
+
+        public GetRoomRequest(int roomId)
+        {
+            this.roomId = roomId;
+        }
+
+        protected override string Target => $"rooms/{roomId}";
+    }
+}
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
index 64618a1d85..f14aa5fd8c 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
         private Bindable<FilterCriteria> filter { get; set; }
 
         [Resolved]
-        private Bindable<Room> currentRoom { get; set; }
+        private Bindable<Room> selectedRoom { get; set; }
 
         [Resolved]
         private IRoomManager roomManager { get; set; }
@@ -122,7 +122,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
             else
                 roomFlow.Children.ForEach(r => r.State = r.Room == room ? SelectionState.Selected : SelectionState.NotSelected);
 
-            currentRoom.Value = room;
+            selectedRoom.Value = room;
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
index e2e5b1b549..7c10f0f975 100644
--- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
+++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Screens.Multi.Lounge
         private readonly LoadingLayer loadingLayer;
 
         [Resolved]
-        private Bindable<Room> currentRoom { get; set; }
+        private Bindable<Room> selectedRoom { get; set; }
 
         public LoungeSubScreen()
         {
@@ -101,8 +101,8 @@ namespace osu.Game.Screens.Multi.Lounge
         {
             base.OnResuming(last);
 
-            if (currentRoom.Value?.RoomID.Value == null)
-                currentRoom.Value = new Room();
+            if (selectedRoom.Value?.RoomID.Value == null)
+                selectedRoom.Value = new Room();
 
             onReturning();
         }
@@ -143,7 +143,7 @@ namespace osu.Game.Screens.Multi.Lounge
             if (!this.IsCurrentScreen())
                 return;
 
-            currentRoom.Value = room;
+            selectedRoom.Value = room;
 
             this.Push(new MatchSubScreen(room));
         }
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 1219919425..20b1f860a9 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Screens.Multi
         private readonly IBindable<bool> isIdle = new BindableBool();
 
         [Cached]
-        private readonly Bindable<Room> currentRoom = new Bindable<Room>();
+        private readonly Bindable<Room> selectedRoom = new Bindable<Room>();
 
         [Cached]
         private readonly Bindable<FilterCriteria> currentFilter = new Bindable<FilterCriteria>(new FilterCriteria());
@@ -163,14 +163,39 @@ namespace osu.Game.Screens.Multi
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
             var dependencies = new CachedModelDependencyContainer<Room>(base.CreateChildDependencies(parent));
-            dependencies.Model.BindTo(currentRoom);
+            dependencies.Model.BindTo(selectedRoom);
             return dependencies;
         }
 
         private void updatePollingRate(bool idle)
         {
-            roomManager.TimeBetweenPolls = !this.IsCurrentScreen() || !(screenStack.CurrentScreen is LoungeSubScreen) ? 0 : (idle ? 120000 : 15000);
-            Logger.Log($"Polling adjusted to {roomManager.TimeBetweenPolls}");
+            if (!this.IsCurrentScreen())
+            {
+                roomManager.TimeBetweenListingPolls = 0;
+                roomManager.TimeBetweenSelectionPolls = 0;
+            }
+            else
+            {
+                switch (screenStack.CurrentScreen)
+                {
+                    case LoungeSubScreen _:
+                        roomManager.TimeBetweenListingPolls = idle ? 120000 : 15000;
+                        roomManager.TimeBetweenSelectionPolls = idle ? 30000 : 5000;
+                        break;
+
+                    case MatchSubScreen _:
+                        roomManager.TimeBetweenListingPolls = 0;
+                        roomManager.TimeBetweenSelectionPolls = idle ? 30000 : 5000;
+                        break;
+
+                    default:
+                        roomManager.TimeBetweenListingPolls = 0;
+                        roomManager.TimeBetweenSelectionPolls = 0;
+                        break;
+                }
+            }
+
+            Logger.Log($"Polling adjusted (listing: {roomManager.TimeBetweenListingPolls}, selection: {roomManager.TimeBetweenSelectionPolls})");
         }
 
         /// <summary>
@@ -222,6 +247,8 @@ namespace osu.Game.Screens.Multi
             base.OnResuming(last);
 
             beginHandlingTrack();
+
+            updatePollingRate(isIdle.Value);
         }
 
         public override void OnSuspending(IScreen next)
@@ -231,7 +258,7 @@ namespace osu.Game.Screens.Multi
 
             endHandlingTrack();
 
-            roomManager.TimeBetweenPolls = 0;
+            updatePollingRate(isIdle.Value);
         }
 
         public override bool OnExiting(IScreen next)
diff --git a/osu.Game/Screens/Multi/RoomManager.cs b/osu.Game/Screens/Multi/RoomManager.cs
index cdaba85b9e..ef1e50d2ac 100644
--- a/osu.Game/Screens/Multi/RoomManager.cs
+++ b/osu.Game/Screens/Multi/RoomManager.cs
@@ -2,10 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Online;
@@ -17,20 +20,24 @@ using osu.Game.Screens.Multi.Lounge.Components;
 
 namespace osu.Game.Screens.Multi
 {
-    public class RoomManager : PollingComponent, IRoomManager
+    public class RoomManager : CompositeDrawable, IRoomManager
     {
         public event Action RoomsUpdated;
 
         private readonly BindableList<Room> rooms = new BindableList<Room>();
         public IBindableList<Room> Rooms => rooms;
 
-        private Room joinedRoom;
+        public double TimeBetweenListingPolls
+        {
+            get => listingPollingComponent.TimeBetweenPolls;
+            set => listingPollingComponent.TimeBetweenPolls = value;
+        }
 
-        [Resolved]
-        private Bindable<FilterCriteria> currentFilter { get; set; }
-
-        [Resolved]
-        private IAPIProvider api { get; set; }
+        public double TimeBetweenSelectionPolls
+        {
+            get => selectionPollingComponent.TimeBetweenPolls;
+            set => selectionPollingComponent.TimeBetweenPolls = value;
+        }
 
         [Resolved]
         private RulesetStore rulesets { get; set; }
@@ -38,14 +45,26 @@ namespace osu.Game.Screens.Multi
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        [Resolved]
+        private IAPIProvider api { get; set; }
+
+        [Resolved]
+        private Bindable<Room> selectedRoom { get; set; }
+
+        private readonly ListingPollingComponent listingPollingComponent;
+        private readonly SelectionPollingComponent selectionPollingComponent;
+
+        private Room joinedRoom;
+
+        public RoomManager()
         {
-            currentFilter.BindValueChanged(_ =>
+            RelativeSizeAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
             {
-                if (IsLoaded)
-                    PollImmediately();
-            });
+                listingPollingComponent = new ListingPollingComponent { RoomsReceived = onRoomsReceived },
+                selectionPollingComponent = new SelectionPollingComponent { RoomReceived = onRoomReceived }
+            };
         }
 
         protected override void Dispose(bool isDisposing)
@@ -116,45 +135,52 @@ namespace osu.Game.Screens.Multi
             joinedRoom = null;
         }
 
-        private GetRoomsRequest pollReq;
-
-        protected override Task Poll()
+        /// <summary>
+        /// Invoked when the listing of all <see cref="Room"/>s is received from the server.
+        /// </summary>
+        /// <param name="listing">The listing.</param>
+        private void onRoomsReceived(List<Room> listing)
         {
-            if (!api.IsLoggedIn)
-                return base.Poll();
-
-            var tcs = new TaskCompletionSource<bool>();
-
-            pollReq?.Cancel();
-            pollReq = new GetRoomsRequest(currentFilter.Value.PrimaryFilter);
-
-            pollReq.Success += result =>
+            // Remove past matches
+            foreach (var r in rooms.ToList())
             {
-                // Remove past matches
-                foreach (var r in rooms.ToList())
+                if (listing.All(e => e.RoomID.Value != r.RoomID.Value))
+                    rooms.Remove(r);
+            }
+
+            for (int i = 0; i < listing.Count; i++)
+            {
+                if (selectedRoom.Value?.RoomID?.Value == listing[i].RoomID.Value)
                 {
-                    if (result.All(e => e.RoomID.Value != r.RoomID.Value))
-                        rooms.Remove(r);
+                    // The listing request contains less data than the selection request, so data from the selection request is always preferred while the room is selected.
+                    continue;
                 }
 
-                for (int i = 0; i < result.Count; i++)
+                var r = listing[i];
+                r.Position.Value = i;
+
+                update(r, r);
+                addRoom(r);
+            }
+
+            RoomsUpdated?.Invoke();
+        }
+
+        /// <summary>
+        /// Invoked when a <see cref="Room"/> is received from the server.
+        /// </summary>
+        /// <param name="toUpdate">The received <see cref="Room"/>.</param>
+        private void onRoomReceived(Room toUpdate)
+        {
+            foreach (var room in rooms)
+            {
+                if (room.RoomID.Value == toUpdate.RoomID.Value)
                 {
-                    var r = result[i];
-                    r.Position.Value = i;
-
-                    update(r, r);
-                    addRoom(r);
+                    toUpdate.Position.Value = room.Position.Value;
+                    update(room, toUpdate);
+                    break;
                 }
-
-                RoomsUpdated?.Invoke();
-                tcs.SetResult(true);
-            };
-
-            pollReq.Failure += _ => tcs.SetResult(false);
-
-            api.Queue(pollReq);
-
-            return tcs.Task;
+            }
         }
 
         /// <summary>
@@ -182,5 +208,100 @@ namespace osu.Game.Screens.Multi
             else
                 existing.CopyFrom(room);
         }
+
+        private class SelectionPollingComponent : PollingComponent
+        {
+            public Action<Room> RoomReceived;
+
+            [Resolved]
+            private IAPIProvider api { get; set; }
+
+            [Resolved]
+            private Bindable<Room> selectedRoom { get; set; }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                selectedRoom.BindValueChanged(_ =>
+                {
+                    if (IsLoaded)
+                        PollImmediately();
+                });
+            }
+
+            private GetRoomRequest pollReq;
+
+            protected override Task Poll()
+            {
+                if (!api.IsLoggedIn)
+                    return base.Poll();
+
+                if (selectedRoom.Value?.RoomID.Value == null)
+                    return base.Poll();
+
+                var tcs = new TaskCompletionSource<bool>();
+
+                pollReq?.Cancel();
+                pollReq = new GetRoomRequest(selectedRoom.Value.RoomID.Value.Value);
+
+                pollReq.Success += result =>
+                {
+                    RoomReceived?.Invoke(result);
+                    tcs.SetResult(true);
+                };
+
+                pollReq.Failure += _ => tcs.SetResult(false);
+
+                api.Queue(pollReq);
+
+                return tcs.Task;
+            }
+        }
+
+        private class ListingPollingComponent : PollingComponent
+        {
+            public Action<List<Room>> RoomsReceived;
+
+            [Resolved]
+            private IAPIProvider api { get; set; }
+
+            [Resolved]
+            private Bindable<FilterCriteria> currentFilter { get; set; }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                currentFilter.BindValueChanged(_ =>
+                {
+                    if (IsLoaded)
+                        PollImmediately();
+                });
+            }
+
+            private GetRoomsRequest pollReq;
+
+            protected override Task Poll()
+            {
+                if (!api.IsLoggedIn)
+                    return base.Poll();
+
+                var tcs = new TaskCompletionSource<bool>();
+
+                pollReq?.Cancel();
+                pollReq = new GetRoomsRequest(currentFilter.Value.PrimaryFilter);
+
+                pollReq.Success += result =>
+                {
+                    RoomsReceived?.Invoke(result);
+                    tcs.SetResult(true);
+                };
+
+                pollReq.Failure += _ => tcs.SetResult(false);
+
+                api.Queue(pollReq);
+
+                return tcs.Task;
+            }
+        }
     }
 }

From 97c07281d8a1f1b1ba647340425b7ed3bfda6b35 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 27 Feb 2020 19:24:13 +0900
Subject: [PATCH 0771/1142] Make ParticipantsList use the new participants
 property

---
 osu.Game/Online/Multiplayer/Room.cs           |  2 +-
 .../Multi/Components/ParticipantsList.cs      | 91 +++++++++----------
 2 files changed, 42 insertions(+), 51 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs
index 2bfcc019fa..327f2c75da 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Multiplayer/Room.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Online.Multiplayer
         public Bindable<int?> MaxParticipants { get; private set; } = new Bindable<int?>();
 
         [Cached]
-        [JsonIgnore]
+        [JsonProperty("recent_participants")]
         public BindableList<User> Participants { get; private set; } = new BindableList<User>();
 
         [Cached]
diff --git a/osu.Game/Screens/Multi/Components/ParticipantsList.cs b/osu.Game/Screens/Multi/Components/ParticipantsList.cs
index e383e0414b..16ab905322 100644
--- a/osu.Game/Screens/Multi/Components/ParticipantsList.cs
+++ b/osu.Game/Screens/Multi/Components/ParticipantsList.cs
@@ -7,9 +7,8 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Threading;
 using osu.Game.Graphics;
-using osu.Game.Online.API;
-using osu.Game.Online.API.Requests;
 using osu.Game.Users;
 using osu.Game.Users.Drawables;
 using osuTK;
@@ -46,73 +45,69 @@ namespace osu.Game.Screens.Multi.Components
             set => fill.Direction = value;
         }
 
-        private readonly FillFlowContainer fill;
+        private readonly FillFlowContainer<UserTile> fill;
 
         public ParticipantsList()
         {
-            InternalChild = fill = new FillFlowContainer { Spacing = new Vector2(10) };
+            InternalChild = fill = new FillFlowContainer<UserTile> { Spacing = new Vector2(10) };
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            RoomID.BindValueChanged(_ => updateParticipants(), true);
+            Participants.CollectionChanged += (_, __) => updateParticipants();
+            updateParticipants();
         }
 
-        [Resolved]
-        private IAPIProvider api { get; set; }
-
-        private GetRoomScoresRequest request;
+        private ScheduledDelegate scheduledUpdate;
 
         private void updateParticipants()
         {
-            var roomId = RoomID.Value ?? 0;
-
-            request?.Cancel();
-
-            // nice little progressive fade
-            int time = 500;
-
-            foreach (var c in fill.Children)
+            scheduledUpdate?.Cancel();
+            scheduledUpdate = Schedule(() =>
             {
-                c.Delay(500 - time).FadeOut(time, Easing.Out);
-                time = Math.Max(20, time - 20);
-                c.Expire();
-            }
+                // Remove all extra tiles with a nice, progressive fade
+                int time = 500;
 
-            if (roomId == 0) return;
+                for (int i = Participants.Count; i < fill.Count; i++)
+                {
+                    var tile = fill[i];
 
-            request = new GetRoomScoresRequest(roomId);
-            request.Success += scores => Schedule(() =>
-            {
-                if (roomId != RoomID.Value)
-                    return;
+                    tile.Delay(500 - time).FadeOut(time, Easing.Out);
+                    time = Math.Max(20, time - 20);
+                    tile.Expire();
+                }
 
-                fill.Clear();
-                foreach (var s in scores)
-                    fill.Add(new UserTile(s.User));
+                // Add new tiles for all new players
+                for (int i = fill.Count; i < Participants.Count; i++)
+                {
+                    var tile = new UserTile();
+                    fill.Add(tile);
 
-                fill.FadeInFromZero(1000, Easing.OutQuint);
+                    tile.ClearTransforms();
+                    tile.LifetimeEnd = double.MaxValue;
+                    tile.FadeInFromZero(250, Easing.OutQuint);
+                }
+
+                for (int i = 0; i < Participants.Count; i++)
+                    fill[i].User = Participants[i];
             });
-
-            api.Queue(request);
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            request?.Cancel();
-            base.Dispose(isDisposing);
         }
 
         private class UserTile : CompositeDrawable, IHasTooltip
         {
-            private readonly User user;
-
-            public string TooltipText => user.Username;
-
-            public UserTile(User user)
+            public User User
+            {
+                get => avatar.User;
+                set => avatar.User = value;
+            }
+
+            public string TooltipText => User?.Username ?? string.Empty;
+
+            private readonly UpdateableAvatar avatar;
+
+            public UserTile()
             {
-                this.user = user;
                 Size = new Vector2(TILE_SIZE);
                 CornerRadius = 5f;
                 Masking = true;
@@ -124,11 +119,7 @@ namespace osu.Game.Screens.Multi.Components
                         RelativeSizeAxes = Axes.Both,
                         Colour = OsuColour.FromHex(@"27252d"),
                     },
-                    new UpdateableAvatar
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        User = user,
-                    },
+                    avatar = new UpdateableAvatar { RelativeSizeAxes = Axes.Both },
                 };
             }
         }

From fe10a64137ec868a5e97fa087b79f2787d5553de Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 27 Feb 2020 19:37:04 +0900
Subject: [PATCH 0772/1142] Improve participants list transforms

---
 .../Multi/Components/ParticipantsList.cs      | 61 +++++++++----------
 1 file changed, 29 insertions(+), 32 deletions(-)

diff --git a/osu.Game/Screens/Multi/Components/ParticipantsList.cs b/osu.Game/Screens/Multi/Components/ParticipantsList.cs
index 16ab905322..13de0202e1 100644
--- a/osu.Game/Screens/Multi/Components/ParticipantsList.cs
+++ b/osu.Game/Screens/Multi/Components/ParticipantsList.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.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -25,7 +24,9 @@ namespace osu.Game.Screens.Multi.Components
             set
             {
                 base.RelativeSizeAxes = value;
-                fill.RelativeSizeAxes = value;
+
+                if (tiles != null)
+                    tiles.RelativeSizeAxes = value;
             }
         }
 
@@ -35,21 +36,24 @@ namespace osu.Game.Screens.Multi.Components
             set
             {
                 base.AutoSizeAxes = value;
-                fill.AutoSizeAxes = value;
+
+                if (tiles != null)
+                    tiles.AutoSizeAxes = value;
             }
         }
 
+        private FillDirection direction = FillDirection.Full;
+
         public FillDirection Direction
         {
-            get => fill.Direction;
-            set => fill.Direction = value;
-        }
+            get => direction;
+            set
+            {
+                direction = value;
 
-        private readonly FillFlowContainer<UserTile> fill;
-
-        public ParticipantsList()
-        {
-            InternalChild = fill = new FillFlowContainer<UserTile> { Spacing = new Vector2(10) };
+                if (tiles != null)
+                    tiles.Direction = value;
+            }
         }
 
         [BackgroundDependencyLoader]
@@ -60,37 +64,30 @@ namespace osu.Game.Screens.Multi.Components
         }
 
         private ScheduledDelegate scheduledUpdate;
+        private FillFlowContainer<UserTile> tiles;
 
         private void updateParticipants()
         {
             scheduledUpdate?.Cancel();
             scheduledUpdate = Schedule(() =>
             {
-                // Remove all extra tiles with a nice, progressive fade
-                int time = 500;
+                tiles?.FadeOut(250, Easing.Out).Expire();
 
-                for (int i = Participants.Count; i < fill.Count; i++)
+                tiles = new FillFlowContainer<UserTile>
                 {
-                    var tile = fill[i];
-
-                    tile.Delay(500 - time).FadeOut(time, Easing.Out);
-                    time = Math.Max(20, time - 20);
-                    tile.Expire();
-                }
-
-                // Add new tiles for all new players
-                for (int i = fill.Count; i < Participants.Count; i++)
-                {
-                    var tile = new UserTile();
-                    fill.Add(tile);
-
-                    tile.ClearTransforms();
-                    tile.LifetimeEnd = double.MaxValue;
-                    tile.FadeInFromZero(250, Easing.OutQuint);
-                }
+                    Alpha = 0,
+                    Direction = Direction,
+                    AutoSizeAxes = AutoSizeAxes,
+                    RelativeSizeAxes = RelativeSizeAxes,
+                    Spacing = new Vector2(10)
+                };
 
                 for (int i = 0; i < Participants.Count; i++)
-                    fill[i].User = Participants[i];
+                    tiles.Add(new UserTile { User = Participants[i] });
+
+                AddInternal(tiles);
+
+                tiles.Delay(250).FadeIn(250, Easing.OutQuint);
             });
         }
 

From 22862256c1fc519bc5ae5150501b5edcdeca1446 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 27 Feb 2020 19:42:19 +0900
Subject: [PATCH 0773/1142] Increase time between polls

---
 osu.Game/Screens/Multi/Multiplayer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index 20b1f860a9..b0d773869a 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -180,7 +180,7 @@ namespace osu.Game.Screens.Multi
                 {
                     case LoungeSubScreen _:
                         roomManager.TimeBetweenListingPolls = idle ? 120000 : 15000;
-                        roomManager.TimeBetweenSelectionPolls = idle ? 30000 : 5000;
+                        roomManager.TimeBetweenSelectionPolls = idle ? 120000 : 15000;
                         break;
 
                     case MatchSubScreen _:

From 085968dd7fe8b96d71d0c55b6dbebc932d94e63b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 27 Feb 2020 19:42:28 +0900
Subject: [PATCH 0774/1142] Rename recent participants

---
 osu.Game/Online/Multiplayer/Room.cs                       | 8 ++++----
 .../Screens/Multi/Components/OverlinedParticipants.cs     | 2 +-
 osu.Game/Screens/Multi/Components/ParticipantsList.cs     | 6 +++---
 osu.Game/Screens/Multi/MultiplayerComposite.cs            | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Online/Multiplayer/Room.cs b/osu.Game/Online/Multiplayer/Room.cs
index 327f2c75da..fd700bff0b 100644
--- a/osu.Game/Online/Multiplayer/Room.cs
+++ b/osu.Game/Online/Multiplayer/Room.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Online.Multiplayer
 
         [Cached]
         [JsonProperty("recent_participants")]
-        public BindableList<User> Participants { get; private set; } = new BindableList<User>();
+        public BindableList<User> RecentParticipants { get; private set; } = new BindableList<User>();
 
         [Cached]
         public Bindable<int> ParticipantCount { get; private set; } = new Bindable<int>();
@@ -133,10 +133,10 @@ namespace osu.Game.Online.Multiplayer
                 Playlist.AddRange(other.Playlist);
             }
 
-            if (!Participants.SequenceEqual(other.Participants))
+            if (!RecentParticipants.SequenceEqual(other.RecentParticipants))
             {
-                Participants.Clear();
-                Participants.AddRange(other.Participants);
+                RecentParticipants.Clear();
+                RecentParticipants.AddRange(other.RecentParticipants);
             }
 
             Position = other.Position;
diff --git a/osu.Game/Screens/Multi/Components/OverlinedParticipants.cs b/osu.Game/Screens/Multi/Components/OverlinedParticipants.cs
index a709c6a57a..eb1782d147 100644
--- a/osu.Game/Screens/Multi/Components/OverlinedParticipants.cs
+++ b/osu.Game/Screens/Multi/Components/OverlinedParticipants.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.Multi.Components
         }
 
         public OverlinedParticipants(Direction direction)
-            : base("Participants")
+            : base("Recent participants")
         {
             OsuScrollContainer scroll;
             ParticipantsList list;
diff --git a/osu.Game/Screens/Multi/Components/ParticipantsList.cs b/osu.Game/Screens/Multi/Components/ParticipantsList.cs
index 13de0202e1..5a2dc19b66 100644
--- a/osu.Game/Screens/Multi/Components/ParticipantsList.cs
+++ b/osu.Game/Screens/Multi/Components/ParticipantsList.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Screens.Multi.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            Participants.CollectionChanged += (_, __) => updateParticipants();
+            RecentParticipants.CollectionChanged += (_, __) => updateParticipants();
             updateParticipants();
         }
 
@@ -82,8 +82,8 @@ namespace osu.Game.Screens.Multi.Components
                     Spacing = new Vector2(10)
                 };
 
-                for (int i = 0; i < Participants.Count; i++)
-                    tiles.Add(new UserTile { User = Participants[i] });
+                for (int i = 0; i < RecentParticipants.Count; i++)
+                    tiles.Add(new UserTile { User = RecentParticipants[i] });
 
                 AddInternal(tiles);
 
diff --git a/osu.Game/Screens/Multi/MultiplayerComposite.cs b/osu.Game/Screens/Multi/MultiplayerComposite.cs
index 3f048eceab..e612e77748 100644
--- a/osu.Game/Screens/Multi/MultiplayerComposite.cs
+++ b/osu.Game/Screens/Multi/MultiplayerComposite.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Screens.Multi
         protected BindableList<PlaylistItem> Playlist { get; private set; }
 
         [Resolved(typeof(Room))]
-        protected BindableList<User> Participants { get; private set; }
+        protected BindableList<User> RecentParticipants { get; private set; }
 
         [Resolved(typeof(Room))]
         protected Bindable<int> ParticipantCount { get; private set; }

From dd2bd5c19dd5ab57c01953cfdc029ce713e28678 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 27 Feb 2020 20:01:23 +0900
Subject: [PATCH 0775/1142] Add delay for loading multiplayer beatmap covers

---
 .../Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
index 30346a8a96..eb05cbaf85 100644
--- a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
+++ b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
@@ -16,6 +16,8 @@ namespace osu.Game.Beatmaps.Drawables
     {
         public readonly Bindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
 
+        protected override double LoadDelay => 500;
+
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 

From b3220476d73db0798f1d583048c18481c7f1d8df Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 27 Feb 2020 20:05:12 +0900
Subject: [PATCH 0776/1142] Rename methods

---
 osu.Game/Screens/Multi/RoomManager.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Multi/RoomManager.cs b/osu.Game/Screens/Multi/RoomManager.cs
index ef1e50d2ac..ad461af57f 100644
--- a/osu.Game/Screens/Multi/RoomManager.cs
+++ b/osu.Game/Screens/Multi/RoomManager.cs
@@ -62,8 +62,8 @@ namespace osu.Game.Screens.Multi
 
             InternalChildren = new Drawable[]
             {
-                listingPollingComponent = new ListingPollingComponent { RoomsReceived = onRoomsReceived },
-                selectionPollingComponent = new SelectionPollingComponent { RoomReceived = onRoomReceived }
+                listingPollingComponent = new ListingPollingComponent { RoomsReceived = onListingReceived },
+                selectionPollingComponent = new SelectionPollingComponent { RoomReceived = onSelectedRoomReceived }
             };
         }
 
@@ -139,7 +139,7 @@ namespace osu.Game.Screens.Multi
         /// Invoked when the listing of all <see cref="Room"/>s is received from the server.
         /// </summary>
         /// <param name="listing">The listing.</param>
-        private void onRoomsReceived(List<Room> listing)
+        private void onListingReceived(List<Room> listing)
         {
             // Remove past matches
             foreach (var r in rooms.ToList())
@@ -170,7 +170,7 @@ namespace osu.Game.Screens.Multi
         /// Invoked when a <see cref="Room"/> is received from the server.
         /// </summary>
         /// <param name="toUpdate">The received <see cref="Room"/>.</param>
-        private void onRoomReceived(Room toUpdate)
+        private void onSelectedRoomReceived(Room toUpdate)
         {
             foreach (var room in rooms)
             {

From 32dc4501c189bf10e3f22bd86aa31ab2fbaa751e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 27 Feb 2020 14:16:35 +0300
Subject: [PATCH 0777/1142] Fix incorrect RepliesButton presentation

---
 osu.Game/Overlays/Comments/DrawableComment.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index cb9e32f1ad..46f600615a 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -384,7 +384,7 @@ namespace osu.Game.Overlays.Comments
 
             protected override void OnExpandedChanged(ValueChangedEvent<bool> expanded)
             {
-                text.Text = $@"{(expanded.NewValue ? "[+]" : "[-]")} replies ({count})";
+                text.Text = $@"{(expanded.NewValue ? "[-]" : "[+]")} replies ({count})";
             }
         }
 

From d92e93ed3168502ef5e449343e40a4d4f5510054 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 27 Feb 2020 14:39:10 +0300
Subject: [PATCH 0778/1142] Move background creation out from
 UpdateStreamBadgeArea

---
 osu.Game/Overlays/Changelog/ChangelogHeader.cs     | 14 ++++++++++++++
 .../Overlays/Changelog/UpdateStreamBadgeArea.cs    | 11 +----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Overlays/Changelog/ChangelogHeader.cs b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
index 8663ec586b..09bcd62021 100644
--- a/osu.Game/Overlays/Changelog/ChangelogHeader.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
@@ -4,9 +4,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+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.UserInterface;
 using osu.Game.Online.API.Requests.Responses;
 
@@ -22,6 +24,8 @@ namespace osu.Game.Overlays.Changelog
 
         private const string listing_string = "listing";
 
+        private Box streamsBackground;
+
         public ChangelogHeader()
         {
             TabControl.AddItem(listing_string);
@@ -40,6 +44,12 @@ namespace osu.Game.Overlays.Changelog
             };
         }
 
+        [BackgroundDependencyLoader]
+        private void load(OverlayColourProvider colourProvider)
+        {
+            streamsBackground.Colour = colourProvider.Background5;
+        }
+
         private ChangelogHeaderTitle title;
 
         private void showBuild(ValueChangedEvent<APIChangelogBuild> e)
@@ -72,6 +82,10 @@ namespace osu.Game.Overlays.Changelog
             AutoSizeAxes = Axes.Y,
             Children = new Drawable[]
             {
+                streamsBackground = new Box
+                {
+                    RelativeSizeAxes = Axes.Both
+                },
                 Streams = new UpdateStreamBadgeArea(),
             }
         };
diff --git a/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs b/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs
index 639c0d9780..faff7381c9 100644
--- a/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs
+++ b/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs
@@ -6,25 +6,16 @@ using osu.Framework.Input.Events;
 using osu.Game.Online.API.Requests.Responses;
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Allocation;
 
 namespace osu.Game.Overlays.Changelog
 {
     public class UpdateStreamBadgeArea : TabControl<APIUpdateStream>
     {
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        public UpdateStreamBadgeArea()
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
-
-            AddInternal(new Box
-            {
-                RelativeSizeAxes = Axes.Both,
-                Colour = colourProvider.Background5,
-            });
         }
 
         public void Populate(List<APIUpdateStream> streams)

From a8c31c31add957afa4dd5f5c916115baeed094c2 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 27 Feb 2020 14:47:31 +0300
Subject: [PATCH 0779/1142] Move padding outside of the UpdateStreamBadgeArea

---
 .../Overlays/Changelog/ChangelogHeader.cs     | 12 +++++++++++-
 .../Changelog/UpdateStreamBadgeArea.cs        | 19 +++++--------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Overlays/Changelog/ChangelogHeader.cs b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
index 09bcd62021..f5b10ef0f2 100644
--- a/osu.Game/Overlays/Changelog/ChangelogHeader.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
@@ -86,7 +86,17 @@ namespace osu.Game.Overlays.Changelog
                 {
                     RelativeSizeAxes = Axes.Both
                 },
-                Streams = new UpdateStreamBadgeArea(),
+                new Container
+                {
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Padding = new MarginPadding
+                    {
+                        Horizontal = 85,
+                        Vertical = 20
+                    },
+                    Child = Streams = new UpdateStreamBadgeArea()
+                }
             }
         };
 
diff --git a/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs b/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs
index faff7381c9..d937bf775a 100644
--- a/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs
+++ b/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs
@@ -40,21 +40,12 @@ namespace osu.Game.Overlays.Changelog
             base.OnHoverLost(e);
         }
 
-        protected override TabFillFlowContainer CreateTabFlow()
+        protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
         {
-            var flow = base.CreateTabFlow();
-
-            flow.RelativeSizeAxes = Axes.X;
-            flow.AutoSizeAxes = Axes.Y;
-            flow.AllowMultiline = true;
-            flow.Padding = new MarginPadding
-            {
-                Vertical = 20,
-                Horizontal = 85,
-            };
-
-            return flow;
-        }
+            RelativeSizeAxes = Axes.X,
+            AutoSizeAxes = Axes.Y,
+            AllowMultiline = true,
+        };
 
         protected override Dropdown<APIUpdateStream> CreateDropdown() => null;
 

From f9aa6b9c07a99d5272302d8835b9a797c2277d0a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 27 Feb 2020 15:33:01 +0300
Subject: [PATCH 0780/1142] Remove fadeContainer and adjust fade condition

---
 .../Overlays/Changelog/UpdateStreamBadge.cs   | 69 +++++++++----------
 1 file changed, 31 insertions(+), 38 deletions(-)

diff --git a/osu.Game/Overlays/Changelog/UpdateStreamBadge.cs b/osu.Game/Overlays/Changelog/UpdateStreamBadge.cs
index 10aca31441..dc9d3ccaed 100644
--- a/osu.Game/Overlays/Changelog/UpdateStreamBadge.cs
+++ b/osu.Game/Overlays/Changelog/UpdateStreamBadge.cs
@@ -26,7 +26,6 @@ namespace osu.Game.Overlays.Changelog
 
         private readonly APIUpdateStream stream;
 
-        private Container fadeContainer;
         private FillFlowContainer<SpriteText> text;
         private ExpandingBar expandingBar;
 
@@ -44,47 +43,39 @@ namespace osu.Game.Overlays.Changelog
 
             AddRange(new Drawable[]
             {
-                fadeContainer = new Container
+                text = new FillFlowContainer<SpriteText>
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    Children = new Drawable[]
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Vertical,
+                    Margin = new MarginPadding { Top = 6 },
+                    Children = new[]
                     {
-                        text = new FillFlowContainer<SpriteText>
+                        new OsuSpriteText
                         {
-                            AutoSizeAxes = Axes.X,
-                            RelativeSizeAxes = Axes.Y,
-                            Direction = FillDirection.Vertical,
-                            Margin = new MarginPadding { Top = 6 },
-                            Children = new[]
-                            {
-                                new OsuSpriteText
-                                {
-                                    Text = stream.DisplayName,
-                                    Font = OsuFont.GetFont(size: 12, weight: FontWeight.Black),
-                                },
-                                new OsuSpriteText
-                                {
-                                    Text = stream.LatestBuild.DisplayVersion,
-                                    Font = OsuFont.GetFont(size: 16, weight: FontWeight.Regular),
-                                },
-                                new OsuSpriteText
-                                {
-                                    Text = stream.LatestBuild.Users > 0 ? $"{"user".ToQuantity(stream.LatestBuild.Users, "N0")} online" : null,
-                                    Font = OsuFont.GetFont(size: 10),
-                                    Colour = colourProvider.Foreground1
-                                },
-                            }
+                            Text = stream.DisplayName,
+                            Font = OsuFont.GetFont(size: 12, weight: FontWeight.Black),
                         },
-                        expandingBar = new ExpandingBar
+                        new OsuSpriteText
                         {
-                            Anchor = Anchor.TopCentre,
-                            Colour = stream.Colour,
-                            ExpandedSize = 4,
-                            CollapsedSize = 2,
-                            IsCollapsed = true
+                            Text = stream.LatestBuild.DisplayVersion,
+                            Font = OsuFont.GetFont(size: 16, weight: FontWeight.Regular),
+                        },
+                        new OsuSpriteText
+                        {
+                            Text = stream.LatestBuild.Users > 0 ? $"{"user".ToQuantity(stream.LatestBuild.Users, "N0")} online" : null,
+                            Font = OsuFont.GetFont(size: 10),
+                            Colour = colourProvider.Foreground1
                         },
                     }
                 },
+                expandingBar = new ExpandingBar
+                {
+                    Anchor = Anchor.TopCentre,
+                    Colour = stream.Colour,
+                    ExpandedSize = 4,
+                    CollapsedSize = 2,
+                    IsCollapsed = true
+                },
                 new HoverClickSounds()
             });
 
@@ -112,21 +103,23 @@ namespace osu.Game.Overlays.Changelog
             // Expand based on the local state
             bool shouldExpand = Active.Value || IsHovered;
 
+            bool allHighlighted = SelectedTab.Value == null && !externalDimRequested;
+
             // Expand based on whether no build is selected and the badge area is hovered
-            shouldExpand |= SelectedTab.Value == null && !externalDimRequested;
+            shouldExpand |= allHighlighted;
 
             if (shouldExpand)
             {
                 expandingBar.Expand();
-                fadeContainer.FadeTo(1, transition_duration);
+                expandingBar.FadeTo(1, transition_duration, Easing.OutQuint);
             }
             else
             {
                 expandingBar.Collapse();
-                fadeContainer.FadeTo(0.5f, transition_duration);
+                expandingBar.FadeTo(0.5f, transition_duration, Easing.OutQuint);
             }
 
-            text.FadeTo(externalDimRequested && !IsHovered ? 0.5f : 1, transition_duration);
+            text.FadeTo(IsHovered || (Active.Value && !externalDimRequested) || allHighlighted ? 1 : 0.5f, transition_duration, Easing.OutQuint);
         }
 
         private bool externalDimRequested;

From f486db48de22a4638c1eb1d00c1cb3d5ae27caaf Mon Sep 17 00:00:00 2001
From: voidedWarranties <wong.zhao@voidedxd.xyz>
Date: Thu, 27 Feb 2020 17:30:06 -0800
Subject: [PATCH 0781/1142] Add labels and fix dropdown bindable values

---
 osu.Game/Configuration/SettingSourceAttribute.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Configuration/SettingSourceAttribute.cs b/osu.Game/Configuration/SettingSourceAttribute.cs
index 4bdbb5fc24..fe487cb1d0 100644
--- a/osu.Game/Configuration/SettingSourceAttribute.cs
+++ b/osu.Game/Configuration/SettingSourceAttribute.cs
@@ -8,7 +8,6 @@ using System.Reflection;
 using JetBrains.Annotations;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.UserInterface;
 using osu.Game.Overlays.Settings;
 
 namespace osu.Game.Configuration
@@ -105,7 +104,8 @@ namespace osu.Game.Configuration
                         var dropdownType = typeof(SettingsEnumDropdown<>).MakeGenericType(bindable.GetType().GetGenericArguments()[0]);
                         var dropdown = (Drawable)Activator.CreateInstance(dropdownType);
 
-                        dropdown.GetType().GetProperty(nameof(IHasCurrentValue<object>.Current))?.SetValue(dropdown, obj);
+                        dropdownType.GetProperty(nameof(SettingsDropdown<object>.LabelText))?.SetValue(dropdown, attr.Label);
+                        dropdownType.GetProperty(nameof(SettingsDropdown<object>.Bindable))?.SetValue(dropdown, bindable);
 
                         yield return dropdown;
 

From 377ae3e685466fa1dd4c2519f102a29a8f7336fc Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 28 Feb 2020 12:48:06 +0300
Subject: [PATCH 0782/1142] Make a separate if section for all highlighted case

---
 .../Overlays/Changelog/UpdateStreamBadge.cs   | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Overlays/Changelog/UpdateStreamBadge.cs b/osu.Game/Overlays/Changelog/UpdateStreamBadge.cs
index dc9d3ccaed..5e10410f37 100644
--- a/osu.Game/Overlays/Changelog/UpdateStreamBadge.cs
+++ b/osu.Game/Overlays/Changelog/UpdateStreamBadge.cs
@@ -100,26 +100,20 @@ namespace osu.Game.Overlays.Changelog
 
         private void updateState()
         {
-            // Expand based on the local state
-            bool shouldExpand = Active.Value || IsHovered;
-
-            bool allHighlighted = SelectedTab.Value == null && !externalDimRequested;
-
-            // Expand based on whether no build is selected and the badge area is hovered
-            shouldExpand |= allHighlighted;
-
-            if (shouldExpand)
+            if (SelectedTab.Value == null && !externalDimRequested)
             {
                 expandingBar.Expand();
                 expandingBar.FadeTo(1, transition_duration, Easing.OutQuint);
-            }
-            else
-            {
-                expandingBar.Collapse();
-                expandingBar.FadeTo(0.5f, transition_duration, Easing.OutQuint);
+                text.FadeTo(1, transition_duration, Easing.OutQuint);
+                return;
             }
 
-            text.FadeTo(IsHovered || (Active.Value && !externalDimRequested) || allHighlighted ? 1 : 0.5f, transition_duration, Easing.OutQuint);
+            var shouldExpand = Active.Value || IsHovered;
+
+            expandingBar.IsCollapsed = !shouldExpand;
+            expandingBar.FadeTo(shouldExpand ? 1 : 0.5f, transition_duration, Easing.OutQuint);
+
+            text.FadeTo(IsHovered || (Active.Value && !externalDimRequested) ? 1 : 0.5f, transition_duration, Easing.OutQuint);
         }
 
         private bool externalDimRequested;

From 7b9937b851bebad05ba6f9b06cee7759f24f48f3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 28 Feb 2020 22:15:39 +0900
Subject: [PATCH 0783/1142] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 28fbdb3367..2a6bfa0f88 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.221.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.225.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.228.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index c5ebf0f712..ca62a959d9 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.221.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.225.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.228.0" />
     <PackageReference Include="Sentry" Version="2.0.3" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index abd562dc81..11e7991dfa 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.221.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.225.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.228.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
@@ -79,7 +79,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.225.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.228.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 4ad2d0cfb606835a9fe82ddb3b22181588e04e33 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 28 Feb 2020 16:07:08 +0900
Subject: [PATCH 0784/1142] Remove deprecated debug setting

---
 osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
index 457f064f89..9edb18e065 100644
--- a/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs
@@ -22,11 +22,6 @@ namespace osu.Game.Overlays.Settings.Sections.Debug
                     Bindable = frameworkConfig.GetBindable<bool>(FrameworkSetting.ShowLogOverlay)
                 },
                 new SettingsCheckbox
-                {
-                    LabelText = "Performance logging",
-                    Bindable = config.GetBindable<bool>(DebugSetting.PerformanceLogging)
-                },
-                new SettingsCheckbox
                 {
                     LabelText = "Bypass front-to-back render pass",
                     Bindable = config.GetBindable<bool>(DebugSetting.BypassFrontToBackPass)

From 394b88aa65d704cf602fb6f7bae4e2f6d0f95640 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 28 Feb 2020 19:11:18 +0900
Subject: [PATCH 0785/1142] Add thread mode dropdown

---
 .../Overlays/Settings/Sections/Graphics/RendererSettings.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
index 7317076c54..69ff9b43e5 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
+using osu.Framework.Platform;
 using osu.Game.Configuration;
 
 namespace osu.Game.Overlays.Settings.Sections.Graphics
@@ -24,6 +25,11 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                     LabelText = "Frame limiter",
                     Bindable = config.GetBindable<FrameSync>(FrameworkSetting.FrameSync)
                 },
+                new SettingsEnumDropdown<ExecutionMode>
+                {
+                    LabelText = "Threading mode",
+                    Bindable = config.GetBindable<ExecutionMode>(FrameworkSetting.ExecutionMode)
+                },
                 new SettingsCheckbox
                 {
                     LabelText = "Show FPS",

From 036f155afe755d961c99fa891cc3b9095b733cf6 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Fri, 28 Feb 2020 21:09:31 +0100
Subject: [PATCH 0786/1142] Adjust colours in DrawableMostPlayedBeatmap

---
 .../Historical/DrawableMostPlayedBeatmap.cs      | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs b/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
index e75ad2f161..dc8492562a 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
@@ -37,8 +37,10 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OsuColour colours, OverlayColourProvider colourProvider)
         {
+            ProfileItemContainer container;
+
             AddRangeInternal(new Drawable[]
             {
                 new UpdateableBeatmapSetCover
@@ -61,7 +63,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                             CornerRadius = corner_radius,
                             Children = new Drawable[]
                             {
-                                new ProfileItemContainer
+                                container = new ProfileItemContainer
                                 {
                                     Child = new Container
                                     {
@@ -78,11 +80,14 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                                                 Children = new Drawable[]
                                                 {
                                                     new MostPlayedBeatmapMetadataContainer(beatmap),
-                                                    new LinkFlowContainer(t => t.Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular))
+                                                    new LinkFlowContainer(t =>
+                                                    {
+                                                        t.Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular);
+                                                        t.Colour = colourProvider.Foreground1;
+                                                    })
                                                     {
                                                         AutoSizeAxes = Axes.Both,
                                                         Direction = FillDirection.Horizontal,
-                                                        Colour = colours.GreySeafoamLighter
                                                     }.With(d =>
                                                     {
                                                         d.AddText("mapped by ");
@@ -103,6 +108,9 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                     }
                 }
             });
+
+            container.IdleColour = colourProvider.Background4;
+            container.HoverColour = colourProvider.Background3;
         }
 
         private class MostPlayedBeatmapMetadataContainer : BeatmapMetadataContainer

From 5838af39c1a20cc8bc1dc5fc6aab93c4dc82403f Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Fri, 28 Feb 2020 21:09:49 +0100
Subject: [PATCH 0787/1142] Add background colour customization to
 ProfileItemContainer

---
 .../Profile/Sections/ProfileItemContainer.cs  | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs b/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs
index f65c909155..a48f21f52b 100644
--- a/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs
@@ -16,12 +16,19 @@ namespace osu.Game.Overlays.Profile.Sections
 
         protected override Container<Drawable> Content => content;
 
-        private Color4 idleColour;
-        private Color4 hoverColour;
-
         private readonly Box background;
         private readonly Container content;
 
+        private Color4 idleColour;
+
+        public Color4 IdleColour
+        {
+            get => idleColour;
+            set => idleColour = background.Colour = value;
+        }
+
+        public Color4 HoverColour { get; set; }
+
         public ProfileItemContainer()
         {
             RelativeSizeAxes = Axes.Both;
@@ -44,20 +51,20 @@ namespace osu.Game.Overlays.Profile.Sections
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
         {
-            background.Colour = idleColour = colourProvider.Background3;
-            hoverColour = colourProvider.Background2;
+            IdleColour = colourProvider.Background3;
+            HoverColour = colourProvider.Background2;
         }
 
         protected override bool OnHover(HoverEvent e)
         {
-            background.FadeColour(hoverColour, hover_duration, Easing.OutQuint);
+            background.FadeColour(HoverColour, hover_duration, Easing.OutQuint);
             return base.OnHover(e);
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
             base.OnHoverLost(e);
-            background.FadeColour(idleColour, hover_duration, Easing.OutQuint);
+            background.FadeColour(IdleColour, hover_duration, Easing.OutQuint);
         }
     }
 }

From d71b51690235187b31fb73a28f70d1cedf583dd8 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Fri, 28 Feb 2020 21:58:37 +0100
Subject: [PATCH 0788/1142] Check beatmap ranking status instead of the pp
 value

---
 osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs      | 10 +++++++---
 .../BeatmapSet/Scores/TopScoreStatisticsSection.cs     |  3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index c9008adc85..25537537d9 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
@@ -28,6 +29,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
         private readonly FillFlowContainer backgroundFlow;
 
         private Color4 highAccuracyColour;
+        private bool isBeatmapRanked;
 
         public ScoreTable()
         {
@@ -65,7 +67,9 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 for (int i = 0; i < value.Count; i++)
                     backgroundFlow.Add(new ScoreTableRowBackground(i, value[i], row_height));
 
-                Columns = createHeaders(value[0]);
+                isBeatmapRanked = value.First().Beatmap.Status == BeatmapSetOnlineStatus.Ranked;
+
+                Columns = createHeaders(value.First());
                 Content = value.Select((s, i) => createContent(i, s)).ToArray().ToRectangular();
             }
         }
@@ -88,7 +92,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
 
             columns.Add(new TableColumn(score.SortedStatistics.LastOrDefault().Key.GetDescription(), Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed, minSize: 45, maxSize: 95)));
 
-            if (score.PP.HasValue)
+            if (isBeatmapRanked)
                 columns.Add(new TableColumn("pp", Anchor.CentreLeft, new Dimension(GridSizeMode.Absolute, 30)));
 
             columns.Add(new TableColumn("mods", Anchor.CentreLeft, new Dimension(GridSizeMode.AutoSize)));
@@ -149,7 +153,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 });
             }
 
-            if (score.PP.HasValue)
+            if (isBeatmapRanked)
             {
                 content.Add(new OsuSpriteText
                 {
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index 12ad014f61..9ecc40eed2 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Mods;
@@ -96,7 +97,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 totalScoreColumn.Text = $@"{value.TotalScore:N0}";
                 accuracyColumn.Text = value.DisplayAccuracy;
                 maxComboColumn.Text = $@"{value.MaxCombo:N0}x";
-                ppColumn.Alpha = value.PP.HasValue ? 1 : 0;
+                ppColumn.Alpha = value.Beatmap.Status == BeatmapSetOnlineStatus.Ranked ? 1 : 0;
                 ppColumn.Text = $@"{value.PP:N0}";
 
                 statisticsColumns.ChildrenEnumerable = value.SortedStatistics.Select(kvp => createStatisticsColumn(kvp.Key, kvp.Value));

From 5dff7f0955a9108290277a971e0b5c7b2b73266a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 29 Feb 2020 02:21:52 +0300
Subject: [PATCH 0789/1142] Adjust horizontal padding

---
 osu.Game/Overlays/Changelog/ChangelogHeader.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Changelog/ChangelogHeader.cs b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
index f5b10ef0f2..dcadbf4cf5 100644
--- a/osu.Game/Overlays/Changelog/ChangelogHeader.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
@@ -92,7 +92,7 @@ namespace osu.Game.Overlays.Changelog
                     AutoSizeAxes = Axes.Y,
                     Padding = new MarginPadding
                     {
-                        Horizontal = 85,
+                        Horizontal = 65,
                         Vertical = 20
                     },
                     Child = Streams = new UpdateStreamBadgeArea()

From f18a1cde53e840b35646a5e946a8218f0d9b5507 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 29 Feb 2020 08:39:27 +0900
Subject: [PATCH 0790/1142] Fix crash when reaching results screen on single
 threaded execution mode

---
 osu.Game/Screens/Play/Player.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index bd43b23a9f..11ca36e25f 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -609,9 +609,9 @@ namespace osu.Game.Screens.Play
             {
                 var score = CreateScore();
                 if (DrawableRuleset.ReplayScore == null)
-                    scoreManager.Import(score).Wait();
-
-                this.Push(CreateResults(score));
+                    scoreManager.Import(score).ContinueWith(_ => Schedule(() => this.Push(CreateResults(score))));
+                else
+                    this.Push(CreateResults(score));
             });
         }
 

From a332b6980bc1dc250a6effcb4fa5e18b15f40ac0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 29 Feb 2020 14:28:26 +0900
Subject: [PATCH 0791/1142] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 2a6bfa0f88..651d1beda1 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.221.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.228.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.229.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index ca62a959d9..168a358e47 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.221.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.228.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.229.0" />
     <PackageReference Include="Sentry" Version="2.0.3" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 11e7991dfa..3c2a67e908 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.221.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.228.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.229.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
@@ -79,7 +79,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.228.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.229.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From f661806513767adaf69f5989bcf4b3b90397f994 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Sat, 29 Feb 2020 15:29:00 +0100
Subject: [PATCH 0792/1142] Move checking logic out of ScoreTable

---
 osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs      | 9 ++++-----
 osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs | 3 ++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 25537537d9..3a58f481e1 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -29,7 +29,6 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
         private readonly FillFlowContainer backgroundFlow;
 
         private Color4 highAccuracyColour;
-        private bool isBeatmapRanked;
 
         public ScoreTable()
         {
@@ -67,13 +66,13 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 for (int i = 0; i < value.Count; i++)
                     backgroundFlow.Add(new ScoreTableRowBackground(i, value[i], row_height));
 
-                isBeatmapRanked = value.First().Beatmap.Status == BeatmapSetOnlineStatus.Ranked;
-
                 Columns = createHeaders(value.First());
                 Content = value.Select((s, i) => createContent(i, s)).ToArray().ToRectangular();
             }
         }
 
+        public bool IsBeatmapRanked { get; set; }
+
         private TableColumn[] createHeaders(ScoreInfo score)
         {
             var columns = new List<TableColumn>
@@ -92,7 +91,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
 
             columns.Add(new TableColumn(score.SortedStatistics.LastOrDefault().Key.GetDescription(), Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed, minSize: 45, maxSize: 95)));
 
-            if (isBeatmapRanked)
+            if (IsBeatmapRanked)
                 columns.Add(new TableColumn("pp", Anchor.CentreLeft, new Dimension(GridSizeMode.Absolute, 30)));
 
             columns.Add(new TableColumn("mods", Anchor.CentreLeft, new Dimension(GridSizeMode.AutoSize)));
@@ -153,7 +152,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 });
             }
 
-            if (isBeatmapRanked)
+            if (IsBeatmapRanked)
             {
                 content.Add(new OsuSpriteText
                 {
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index e831c8ce42..5a931fffcb 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -59,11 +59,12 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 }
 
                 var scoreInfos = value.Scores.Select(s => s.CreateScoreInfo(rulesets)).ToList();
+                var topScore = scoreInfos.First();
 
                 scoreTable.Scores = scoreInfos;
+                scoreTable.IsBeatmapRanked = topScore.Beatmap.Status == BeatmapSetOnlineStatus.Ranked;
                 scoreTable.Show();
 
-                var topScore = scoreInfos.First();
                 var userScore = value.UserScore;
                 var userScoreInfo = userScore?.Score.CreateScoreInfo(rulesets);
 

From 4d19278df498a940b2356d84a00eeb77456cc6e7 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Sat, 29 Feb 2020 15:43:48 +0100
Subject: [PATCH 0793/1142] Remove using directive

---
 osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 3a58f481e1..af6bf8299f 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -7,7 +7,6 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
-using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;

From bca58ddb42f73cc79116b1450c4db446bd015577 Mon Sep 17 00:00:00 2001
From: naoey <naoey@protonmail.ch>
Date: Sat, 29 Feb 2020 21:07:42 +0530
Subject: [PATCH 0794/1142] Make KeyCounter stop counting during breaks

---
 .../Visual/Gameplay/TestSceneAutoplay.cs         | 16 ++++++++++++----
 osu.Game/Screens/Play/Player.cs                  | 10 ++++++++--
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
index 4daab8d137..ebd89039a5 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
@@ -24,10 +24,17 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         protected override void AddCheckSteps()
         {
-            AddUntilStep("score above zero", () => ((ScoreAccessiblePlayer)Player).ScoreProcessor.TotalScore.Value > 0);
-            AddUntilStep("key counter counted keys", () => ((ScoreAccessiblePlayer)Player).HUDOverlay.KeyCounter.Children.Any(kc => kc.CountPresses > 2));
-            AddStep("rewind", () => track.Seek(-10000));
-            AddUntilStep("key counter reset", () => ((ScoreAccessiblePlayer)Player).HUDOverlay.KeyCounter.Children.All(kc => kc.CountPresses == 0));
+            ScoreAccessiblePlayer scoreAccessiblePlayer = null;
+
+            AddUntilStep("player loaded", () => (scoreAccessiblePlayer = (ScoreAccessiblePlayer)Player) != null);
+            AddUntilStep("score above zero", () => scoreAccessiblePlayer.ScoreProcessor.TotalScore.Value > 0);
+            AddUntilStep("key counter counted keys", () => scoreAccessiblePlayer.HUDOverlay.KeyCounter.Children.Any(kc => kc.CountPresses > 2));
+            AddStep("seek to break time", () => scoreAccessiblePlayer.GameplayClockContainer.Seek(scoreAccessiblePlayer.BreakOverlay.Breaks.First().StartTime));
+            AddUntilStep("wait for seek to complete", () =>
+                scoreAccessiblePlayer.HUDOverlay.Progress.ReferenceClock.CurrentTime >= scoreAccessiblePlayer.BreakOverlay.Breaks.First().StartTime);
+            AddAssert("test keys not counting", () => !scoreAccessiblePlayer.HUDOverlay.KeyCounter.IsCounting);
+            AddStep("rewind", () => scoreAccessiblePlayer.GameplayClockContainer.Seek(-80000));
+            AddUntilStep("key counter reset", () => scoreAccessiblePlayer.HUDOverlay.KeyCounter.Children.All(kc => kc.CountPresses == 0));
         }
 
         protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
@@ -43,6 +50,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
             public new HUDOverlay HUDOverlay => base.HUDOverlay;
+            public new BreakOverlay BreakOverlay => base.BreakOverlay;
 
             public new GameplayClockContainer GameplayClockContainer => base.GameplayClockContainer;
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 11ca36e25f..237e364e69 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -184,7 +184,7 @@ namespace osu.Game.Screens.Play
             foreach (var mod in Mods.Value.OfType<IApplicableToHealthProcessor>())
                 mod.ApplyToHealthProcessor(HealthProcessor);
 
-            BreakOverlay.IsBreakTime.ValueChanged += _ => updatePauseOnFocusLostState();
+            BreakOverlay.IsBreakTime.BindValueChanged(_ => onBreakTimeChanged(), true);
         }
 
         private void addUnderlayComponents(Container target)
@@ -229,7 +229,7 @@ namespace osu.Game.Screens.Play
                         IsPaused = { BindTarget = GameplayClockContainer.IsPaused }
                     },
                     PlayerSettingsOverlay = { PlaybackSettings = { UserPlaybackRate = { BindTarget = GameplayClockContainer.UserPlaybackRate } } },
-                    KeyCounter = { AlwaysVisible = { BindTarget = DrawableRuleset.HasReplayLoaded } },
+                    KeyCounter = { AlwaysVisible = { BindTarget = DrawableRuleset.HasReplayLoaded }, IsCounting = false },
                     RequestSeek = GameplayClockContainer.Seek,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre
@@ -286,6 +286,12 @@ namespace osu.Game.Screens.Play
             HealthProcessor.IsBreakTime.BindTo(BreakOverlay.IsBreakTime);
         }
 
+        private void onBreakTimeChanged()
+        {
+            updatePauseOnFocusLostState();
+            HUDOverlay.KeyCounter.IsCounting = !BreakOverlay.IsBreakTime.Value;
+        }
+
         private void updatePauseOnFocusLostState() =>
             HUDOverlay.HoldToQuit.PauseOnFocusLost = PauseOnFocusLost
                                                      && !DrawableRuleset.HasReplayLoaded.Value

From 1ce972dd5b4a06d7ca6774a7daaf79cf3902dc69 Mon Sep 17 00:00:00 2001
From: naoey <naoey@protonmail.ch>
Date: Sat, 29 Feb 2020 21:53:49 +0530
Subject: [PATCH 0795/1142] Remove unused variable

---
 osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
index ebd89039a5..8e16d74dca 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
@@ -14,8 +14,6 @@ namespace osu.Game.Tests.Visual.Gameplay
     [Description("Player instantiated with an autoplay mod.")]
     public class TestSceneAutoplay : TestSceneAllRulesetPlayers
     {
-        private ClockBackedTestWorkingBeatmap.TrackVirtualManual track;
-
         protected override Player CreatePlayer(Ruleset ruleset)
         {
             SelectedMods.Value = SelectedMods.Value.Concat(new[] { ruleset.GetAutoplayMod() }).ToArray();
@@ -41,8 +39,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             var working = base.CreateWorkingBeatmap(beatmap, storyboard);
 
-            track = (ClockBackedTestWorkingBeatmap.TrackVirtualManual)working.Track;
-
             return working;
         }
 

From b9fef4f715717851998ec403582e46e6bf62207e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 1 Mar 2020 09:26:16 +0900
Subject: [PATCH 0796/1142] Update link location for appimage

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ae57b1d954..77c7eb9d2d 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ If you are looking to install or test osu! without setting up a development envi
 
 **Latest build:**
 
-| [Windows (x64)](https://github.com/ppy/osu/releases/latest/download/install.exe)  | [macOS 10.12+](https://github.com/ppy/osu/releases/latest/download/osu.app.zip) | [Linux (x64)](https://github.com/ppy/osu/releases/latest/download/osu.x86_64.AppImage) | [iOS(iOS 10+)](https://osu.ppy.sh/home/testflight) | [Android (5+)](https://github.com/ppy/osu/releases/latest/download/sh.ppy.osulazer.apk)
+| [Windows (x64)](https://github.com/ppy/osu/releases/latest/download/install.exe)  | [macOS 10.12+](https://github.com/ppy/osu/releases/latest/download/osu.app.zip) | [Linux (x64)](https://github.com/ppy/osu/releases/latest/download/osu.AppImage) | [iOS(iOS 10+)](https://osu.ppy.sh/home/testflight) | [Android (5+)](https://github.com/ppy/osu/releases/latest/download/sh.ppy.osulazer.apk)
 | ------------- | ------------- | ------------- | ------------- | ------------- |
 
 - When running on Windows 7 or 8.1, **[additional prerequisites](https://docs.microsoft.com/en-us/dotnet/core/install/dependencies?tabs=netcore31&pivots=os-windows)** may be required to correctly run .NET Core applications if your operating system is not up-to-date with the latest service packs.

From 089ec4c7922a18fe4f4da718bbc4ede63ddf6289 Mon Sep 17 00:00:00 2001
From: voidedWarranties <wong.zhao@voidedxd.xyz>
Date: Sat, 29 Feb 2020 21:16:28 -0800
Subject: [PATCH 0797/1142] Test scene for mod development

---
 .../TestSceneCatchModSandbox.cs               |  28 +++++
 .../TestSceneManiaModSandbox.cs               |  28 +++++
 .../Mods/TestSceneOsuModDifficultyAdjust.cs   |  20 ++++
 .../TestSceneOsuModSandbox.cs                 |  28 +++++
 .../TestSceneTaikoModSandbox.cs               |  28 +++++
 osu.Game/Tests/Visual/PlayerTestScene.cs      |   4 +-
 osu.Game/Tests/Visual/TestSceneModSandbox.cs  | 108 ++++++++++++++++++
 7 files changed, 242 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/TestSceneCatchModSandbox.cs
 create mode 100644 osu.Game.Rulesets.Mania.Tests/TestSceneManiaModSandbox.cs
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
 create mode 100644 osu.Game.Rulesets.Osu.Tests/TestSceneOsuModSandbox.cs
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModSandbox.cs
 create mode 100644 osu.Game/Tests/Visual/TestSceneModSandbox.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModSandbox.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModSandbox.cs
new file mode 100644
index 0000000000..3abf8163bd
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModSandbox.cs
@@ -0,0 +1,28 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Catch.Tests
+{
+    [TestFixture]
+    public class TestSceneCatchModSandbox : TestSceneModSandbox
+    {
+        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(TestSceneCatchModSandbox)).ToList();
+
+        public TestSceneCatchModSandbox()
+            : this(null)
+        {
+        }
+
+        public TestSceneCatchModSandbox(Mod mod = null)
+            : base(new CatchRuleset(), mod)
+        {
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaModSandbox.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaModSandbox.cs
new file mode 100644
index 0000000000..2693cebb43
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaModSandbox.cs
@@ -0,0 +1,28 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    [TestFixture]
+    public class TestSceneManiaModSandbox : TestSceneModSandbox
+    {
+        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(TestSceneManiaModSandbox)).ToList();
+
+        public TestSceneManiaModSandbox()
+            : this(null)
+        {
+        }
+
+        public TestSceneManiaModSandbox(Mod mod = null)
+            : base(new ManiaRuleset(), mod)
+        {
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
new file mode 100644
index 0000000000..7f09731a11
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.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 System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Game.Rulesets.Osu.Mods;
+
+namespace osu.Game.Rulesets.Osu.Tests.Mods
+{
+    public class TestSceneOsuModDifficultyAdjust : TestSceneOsuModSandbox
+    {
+        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(OsuModDifficultyAdjust)).ToList();
+
+        public TestSceneOsuModDifficultyAdjust()
+            : base(new OsuModDifficultyAdjust())
+        {
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuModSandbox.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuModSandbox.cs
new file mode 100644
index 0000000000..d2a9d1ea6e
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuModSandbox.cs
@@ -0,0 +1,28 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    [TestFixture]
+    public class TestSceneOsuModSandbox : TestSceneModSandbox
+    {
+        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(TestSceneOsuModSandbox)).ToList();
+
+        public TestSceneOsuModSandbox()
+            : this(null)
+        {
+        }
+
+        public TestSceneOsuModSandbox(Mod mod = null)
+            : base(new OsuRuleset(), mod)
+        {
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModSandbox.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModSandbox.cs
new file mode 100644
index 0000000000..f5481713f5
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModSandbox.cs
@@ -0,0 +1,28 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    [TestFixture]
+    public class TestSceneTaikoModSandbox : TestSceneModSandbox
+    {
+        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(TestSceneTaikoModSandbox)).ToList();
+
+        public TestSceneTaikoModSandbox()
+            : this(null)
+        {
+        }
+
+        public TestSceneTaikoModSandbox(Mod mod = null)
+            : base(new TaikoRuleset(), mod)
+        {
+        }
+    }
+}
diff --git a/osu.Game/Tests/Visual/PlayerTestScene.cs b/osu.Game/Tests/Visual/PlayerTestScene.cs
index 7c5ba7d30f..1ca5256353 100644
--- a/osu.Game/Tests/Visual/PlayerTestScene.cs
+++ b/osu.Game/Tests/Visual/PlayerTestScene.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.Visual
         {
             base.SetUpSteps();
 
-            AddStep(ruleset.RulesetInfo.Name, loadPlayer);
+            AddStep(ruleset.RulesetInfo.Name, LoadPlayer);
             AddUntilStep("player loaded", () => Player.IsLoaded && Player.Alpha == 1);
         }
 
@@ -45,7 +45,7 @@ namespace osu.Game.Tests.Visual
 
         protected virtual bool Autoplay => false;
 
-        private void loadPlayer()
+        protected void LoadPlayer()
         {
             var beatmap = CreateBeatmap(ruleset.RulesetInfo);
 
diff --git a/osu.Game/Tests/Visual/TestSceneModSandbox.cs b/osu.Game/Tests/Visual/TestSceneModSandbox.cs
new file mode 100644
index 0000000000..5c32ebadce
--- /dev/null
+++ b/osu.Game/Tests/Visual/TestSceneModSandbox.cs
@@ -0,0 +1,108 @@
+// 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 System.Reflection;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays.Mods;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Play;
+
+namespace osu.Game.Tests.Visual
+{
+    public abstract class TestSceneModSandbox : PlayerTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(TestSceneModSandbox)
+        };
+
+        protected Mod Mod;
+        private readonly TriangleButton button;
+
+        protected TestSceneModSandbox(Ruleset ruleset, Mod mod = null)
+            : base(ruleset)
+        {
+            Mod = mod ?? new SandboxMod();
+
+            var props = Mod.GetType().GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Instance);
+            var hasSettings = props.Any(prop => prop.GetCustomAttribute<SettingSourceAttribute>(true) != null);
+
+            Child = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Padding = new MarginPadding(50),
+                Margin = new MarginPadding { Bottom = 20 },
+                Width = 0.4f,
+                Anchor = Anchor.BottomLeft,
+                Origin = Anchor.BottomLeft,
+                Children = new Drawable[]
+                {
+                    new ModControlSection(Mod, Mod.CreateSettingsControls()),
+                    button = new TriangleButton
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Width = 0.5f,
+                        Text = "Start",
+                        Action = () =>
+                        {
+                            button.Text = hasSettings ? "Apply Settings" : "Restart";
+                            LoadPlayer();
+                        }
+                    }
+                }
+            };
+        }
+
+        [SetUpSteps]
+        public override void SetUpSteps()
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            LocalConfig.GetBindable<bool>(OsuSetting.KeyOverlay).Value = true;
+        }
+
+        protected override Player CreatePlayer(Ruleset ruleset)
+        {
+            SelectedMods.Value = SelectedMods.Value.Append(Mod).ToArray();
+
+            return base.CreatePlayer(ruleset);
+        }
+
+        protected class SandboxMod : Mod
+        {
+            public override string Name => "Sandbox Test";
+            public override string Acronym => "ST";
+            public override double ScoreMultiplier => 1.0;
+
+            [SettingSource("Test Setting")]
+            public Bindable<bool> TestSetting1 { get; } = new BindableBool
+            {
+                Default = true,
+                Value = true
+            };
+
+            [SettingSource("Test Setting 2")]
+            public Bindable<float> TestSetting2 { get; } = new BindableFloat
+            {
+                Precision = 0.1f,
+                MinValue = 0,
+                MaxValue = 20
+            };
+        }
+    }
+}

From a02c5710ac07a2486be020a7b0e2d1d4feb035b1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 2 Mar 2020 10:06:49 +0900
Subject: [PATCH 0798/1142] Rename base class

---
 osu.Game.Rulesets.Catch.Tests/TestSceneCatchModSandbox.cs   | 2 +-
 osu.Game.Rulesets.Mania.Tests/TestSceneManiaModSandbox.cs   | 2 +-
 osu.Game.Rulesets.Osu.Tests/TestSceneOsuModSandbox.cs       | 2 +-
 osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModSandbox.cs   | 2 +-
 .../{TestSceneModSandbox.cs => ModSandboxTestScene.cs}      | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename osu.Game/Tests/Visual/{TestSceneModSandbox.cs => ModSandboxTestScene.cs} (95%)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModSandbox.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModSandbox.cs
index 3abf8163bd..3e94121fd7 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModSandbox.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModSandbox.cs
@@ -11,7 +11,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestSceneCatchModSandbox : TestSceneModSandbox
+    public class TestSceneCatchModSandbox : ModSandboxTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(TestSceneCatchModSandbox)).ToList();
 
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaModSandbox.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaModSandbox.cs
index 2693cebb43..897e7df1e9 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaModSandbox.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaModSandbox.cs
@@ -11,7 +11,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Mania.Tests
 {
     [TestFixture]
-    public class TestSceneManiaModSandbox : TestSceneModSandbox
+    public class TestSceneManiaModSandbox : ModSandboxTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(TestSceneManiaModSandbox)).ToList();
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuModSandbox.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuModSandbox.cs
index d2a9d1ea6e..9f816ef2ed 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuModSandbox.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuModSandbox.cs
@@ -11,7 +11,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestSceneOsuModSandbox : TestSceneModSandbox
+    public class TestSceneOsuModSandbox : ModSandboxTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(TestSceneOsuModSandbox)).ToList();
 
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModSandbox.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModSandbox.cs
index f5481713f5..ef62c7ed56 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModSandbox.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModSandbox.cs
@@ -11,7 +11,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Taiko.Tests
 {
     [TestFixture]
-    public class TestSceneTaikoModSandbox : TestSceneModSandbox
+    public class TestSceneTaikoModSandbox : ModSandboxTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(TestSceneTaikoModSandbox)).ToList();
 
diff --git a/osu.Game/Tests/Visual/TestSceneModSandbox.cs b/osu.Game/Tests/Visual/ModSandboxTestScene.cs
similarity index 95%
rename from osu.Game/Tests/Visual/TestSceneModSandbox.cs
rename to osu.Game/Tests/Visual/ModSandboxTestScene.cs
index 5c32ebadce..bb872123c5 100644
--- a/osu.Game/Tests/Visual/TestSceneModSandbox.cs
+++ b/osu.Game/Tests/Visual/ModSandboxTestScene.cs
@@ -19,17 +19,17 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game.Tests.Visual
 {
-    public abstract class TestSceneModSandbox : PlayerTestScene
+    public abstract class ModSandboxTestScene : PlayerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
-            typeof(TestSceneModSandbox)
+            typeof(ModSandboxTestScene)
         };
 
         protected Mod Mod;
         private readonly TriangleButton button;
 
-        protected TestSceneModSandbox(Ruleset ruleset, Mod mod = null)
+        protected ModSandboxTestScene(Ruleset ruleset, Mod mod = null)
             : base(ruleset)
         {
             Mod = mod ?? new SandboxMod();

From 5c15704c819ab25868c48f511a26b417a2bb96d0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 2 Mar 2020 10:28:39 +0900
Subject: [PATCH 0799/1142] Improve abstract structure for testability

---
 osu.Game/Tests/Visual/ModSandboxTestScene.cs | 96 ++++++--------------
 osu.Game/Tests/Visual/TestReplayPlayer.cs    | 24 +++++
 2 files changed, 50 insertions(+), 70 deletions(-)
 create mode 100644 osu.Game/Tests/Visual/TestReplayPlayer.cs

diff --git a/osu.Game/Tests/Visual/ModSandboxTestScene.cs b/osu.Game/Tests/Visual/ModSandboxTestScene.cs
index bb872123c5..84bab6a9b9 100644
--- a/osu.Game/Tests/Visual/ModSandboxTestScene.cs
+++ b/osu.Game/Tests/Visual/ModSandboxTestScene.cs
@@ -4,15 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Testing;
-using osu.Game.Configuration;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Overlays.Mods;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play;
@@ -26,83 +18,47 @@ namespace osu.Game.Tests.Visual
             typeof(ModSandboxTestScene)
         };
 
-        protected Mod Mod;
-        private readonly TriangleButton button;
-
-        protected ModSandboxTestScene(Ruleset ruleset, Mod mod = null)
+        protected ModSandboxTestScene(Ruleset ruleset)
             : base(ruleset)
         {
-            Mod = mod ?? new SandboxMod();
-
-            var props = Mod.GetType().GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Instance);
-            var hasSettings = props.Any(prop => prop.GetCustomAttribute<SettingSourceAttribute>(true) != null);
-
-            Child = new FillFlowContainer
-            {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                Direction = FillDirection.Vertical,
-                Padding = new MarginPadding(50),
-                Margin = new MarginPadding { Bottom = 20 },
-                Width = 0.4f,
-                Anchor = Anchor.BottomLeft,
-                Origin = Anchor.BottomLeft,
-                Children = new Drawable[]
-                {
-                    new ModControlSection(Mod, Mod.CreateSettingsControls()),
-                    button = new TriangleButton
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        Width = 0.5f,
-                        Text = "Start",
-                        Action = () =>
-                        {
-                            button.Text = hasSettings ? "Apply Settings" : "Restart";
-                            LoadPlayer();
-                        }
-                    }
-                }
-            };
         }
 
-        [SetUpSteps]
+        private ModTestCaseData currentTest;
+
         public override void SetUpSteps()
         {
+            foreach (var testCase in CreateTestCases())
+            {
+                AddStep("set test case", () => currentTest = testCase);
+                base.SetUpSteps();
+            }
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            LocalConfig.GetBindable<bool>(OsuSetting.KeyOverlay).Value = true;
-        }
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => currentTest.Beatmap;
 
         protected override Player CreatePlayer(Ruleset ruleset)
         {
-            SelectedMods.Value = SelectedMods.Value.Append(Mod).ToArray();
+            SelectedMods.Value = SelectedMods.Value.Append(currentTest.Mod).ToArray();
+
+            if (currentTest.Autoplay)
+            {
+                // We're simulating an auto-play via a replay so that the auto-play mod does not interfere
+                var beatmap = Beatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo, SelectedMods.Value);
+                var score = ruleset.GetAutoplayMod().CreateReplayScore(beatmap);
+
+                return new TestReplayPlayer(score, false, false);
+            }
 
             return base.CreatePlayer(ruleset);
         }
 
-        protected class SandboxMod : Mod
+        protected abstract ModTestCaseData[] CreateTestCases();
+
+        protected class ModTestCaseData
         {
-            public override string Name => "Sandbox Test";
-            public override string Acronym => "ST";
-            public override double ScoreMultiplier => 1.0;
-
-            [SettingSource("Test Setting")]
-            public Bindable<bool> TestSetting1 { get; } = new BindableBool
-            {
-                Default = true,
-                Value = true
-            };
-
-            [SettingSource("Test Setting 2")]
-            public Bindable<float> TestSetting2 { get; } = new BindableFloat
-            {
-                Precision = 0.1f,
-                MinValue = 0,
-                MaxValue = 20
-            };
+            public Mod Mod;
+            public bool Autoplay;
+            public IBeatmap Beatmap;
         }
     }
 }
diff --git a/osu.Game/Tests/Visual/TestReplayPlayer.cs b/osu.Game/Tests/Visual/TestReplayPlayer.cs
new file mode 100644
index 0000000000..e99fcc1e37
--- /dev/null
+++ b/osu.Game/Tests/Visual/TestReplayPlayer.cs
@@ -0,0 +1,24 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
+using osu.Game.Screens.Play;
+
+namespace osu.Game.Tests.Visual
+{
+    public class TestReplayPlayer : ReplayPlayer
+    {
+        protected override bool PauseOnFocusLost { get; }
+
+        public new DrawableRuleset DrawableRuleset => base.DrawableRuleset;
+
+        public new GameplayClockContainer GameplayClockContainer => base.GameplayClockContainer;
+
+        public TestReplayPlayer(Score score, bool allowPause = true, bool showResults = true, bool pauseOnFocusLost = false)
+            : base(score, allowPause, showResults)
+        {
+            PauseOnFocusLost = pauseOnFocusLost;
+        }
+    }
+}

From 239cfddcbb92503b662d89750953950b6a11a12d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 2 Mar 2020 10:50:41 +0900
Subject: [PATCH 0800/1142] Improve test scenes/cases

---
 .../TestSceneCatchModSandbox.cs               | 28 -------
 .../TestSceneManiaModSandbox.cs               | 28 -------
 .../Mods/TestSceneOsuModDifficultyAdjust.cs   | 38 +++++++++-
 .../TestSceneOsuModSandbox.cs                 | 28 -------
 .../TestSceneTaikoModSandbox.cs               | 28 -------
 osu.Game/Tests/Visual/ModSandboxTestScene.cs  | 73 +++++++++++++++----
 6 files changed, 95 insertions(+), 128 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Catch.Tests/TestSceneCatchModSandbox.cs
 delete mode 100644 osu.Game.Rulesets.Mania.Tests/TestSceneManiaModSandbox.cs
 delete mode 100644 osu.Game.Rulesets.Osu.Tests/TestSceneOsuModSandbox.cs
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModSandbox.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModSandbox.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModSandbox.cs
deleted file mode 100644
index 3e94121fd7..0000000000
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModSandbox.cs
+++ /dev/null
@@ -1,28 +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 System;
-using System.Collections.Generic;
-using System.Linq;
-using NUnit.Framework;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Tests.Visual;
-
-namespace osu.Game.Rulesets.Catch.Tests
-{
-    [TestFixture]
-    public class TestSceneCatchModSandbox : ModSandboxTestScene
-    {
-        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(TestSceneCatchModSandbox)).ToList();
-
-        public TestSceneCatchModSandbox()
-            : this(null)
-        {
-        }
-
-        public TestSceneCatchModSandbox(Mod mod = null)
-            : base(new CatchRuleset(), mod)
-        {
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaModSandbox.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaModSandbox.cs
deleted file mode 100644
index 897e7df1e9..0000000000
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaModSandbox.cs
+++ /dev/null
@@ -1,28 +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 System;
-using System.Collections.Generic;
-using System.Linq;
-using NUnit.Framework;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Tests.Visual;
-
-namespace osu.Game.Rulesets.Mania.Tests
-{
-    [TestFixture]
-    public class TestSceneManiaModSandbox : ModSandboxTestScene
-    {
-        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(TestSceneManiaModSandbox)).ToList();
-
-        public TestSceneManiaModSandbox()
-            : this(null)
-        {
-        }
-
-        public TestSceneManiaModSandbox(Mod mod = null)
-            : base(new ManiaRuleset(), mod)
-        {
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index 7f09731a11..46a3c1dff3 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -5,16 +5,50 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests.Mods
 {
-    public class TestSceneOsuModDifficultyAdjust : TestSceneOsuModSandbox
+    public class TestSceneOsuModDifficultyAdjust : ModSandboxTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(OsuModDifficultyAdjust)).ToList();
 
         public TestSceneOsuModDifficultyAdjust()
-            : base(new OsuModDifficultyAdjust())
+            : base(new OsuRuleset())
         {
         }
+
+        protected override ModTestCaseData[] CreateTestCases() => new[]
+        {
+            new ModTestCaseData("no adjustment", new OsuModDifficultyAdjust())
+            {
+                Autoplay = true,
+                PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
+            },
+            new ModTestCaseData("cs = 10", new OsuModDifficultyAdjust { CircleSize = { Value = 10 } })
+            {
+                Autoplay = true,
+                PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
+            },
+            new ModTestCaseData("ar = 10", new OsuModDifficultyAdjust { ApproachRate = { Value = 10 } })
+            {
+                Autoplay = true,
+                PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
+            },
+        };
+
+        protected override TestPlayer CreateReplayPlayer(Score score) => new ScoreAccessibleTestPlayer(score);
+
+        private class ScoreAccessibleTestPlayer : TestPlayer
+        {
+            public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
+
+            public ScoreAccessibleTestPlayer(Score score)
+                : base(score)
+            {
+            }
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuModSandbox.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuModSandbox.cs
deleted file mode 100644
index 9f816ef2ed..0000000000
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuModSandbox.cs
+++ /dev/null
@@ -1,28 +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 System;
-using System.Collections.Generic;
-using System.Linq;
-using NUnit.Framework;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Tests.Visual;
-
-namespace osu.Game.Rulesets.Osu.Tests
-{
-    [TestFixture]
-    public class TestSceneOsuModSandbox : ModSandboxTestScene
-    {
-        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(TestSceneOsuModSandbox)).ToList();
-
-        public TestSceneOsuModSandbox()
-            : this(null)
-        {
-        }
-
-        public TestSceneOsuModSandbox(Mod mod = null)
-            : base(new OsuRuleset(), mod)
-        {
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModSandbox.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModSandbox.cs
deleted file mode 100644
index ef62c7ed56..0000000000
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModSandbox.cs
+++ /dev/null
@@ -1,28 +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 System;
-using System.Collections.Generic;
-using System.Linq;
-using NUnit.Framework;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Tests.Visual;
-
-namespace osu.Game.Rulesets.Taiko.Tests
-{
-    [TestFixture]
-    public class TestSceneTaikoModSandbox : ModSandboxTestScene
-    {
-        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(TestSceneTaikoModSandbox)).ToList();
-
-        public TestSceneTaikoModSandbox()
-            : this(null)
-        {
-        }
-
-        public TestSceneTaikoModSandbox(Mod mod = null)
-            : base(new TaikoRuleset(), mod)
-        {
-        }
-    }
-}
diff --git a/osu.Game/Tests/Visual/ModSandboxTestScene.cs b/osu.Game/Tests/Visual/ModSandboxTestScene.cs
index 84bab6a9b9..0610a145ae 100644
--- a/osu.Game/Tests/Visual/ModSandboxTestScene.cs
+++ b/osu.Game/Tests/Visual/ModSandboxTestScene.cs
@@ -4,9 +4,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Game.Beatmaps;
+using osu.Game.Replays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 
 namespace osu.Game.Tests.Visual
@@ -29,36 +32,78 @@ namespace osu.Game.Tests.Visual
         {
             foreach (var testCase in CreateTestCases())
             {
-                AddStep("set test case", () => currentTest = testCase);
+                AddStep(testCase.Name, () => currentTest = testCase);
                 base.SetUpSteps();
+                AddUntilStep("test passed", () => testCase.PassCondition?.Invoke() ?? true);
             }
         }
 
-        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => currentTest.Beatmap;
+        protected sealed override IBeatmap CreateBeatmap(RulesetInfo ruleset) => currentTest?.Beatmap ?? base.CreateBeatmap(ruleset);
 
-        protected override Player CreatePlayer(Ruleset ruleset)
+        protected sealed override Player CreatePlayer(Ruleset ruleset)
         {
             SelectedMods.Value = SelectedMods.Value.Append(currentTest.Mod).ToArray();
 
-            if (currentTest.Autoplay)
-            {
-                // We're simulating an auto-play via a replay so that the auto-play mod does not interfere
-                var beatmap = Beatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo, SelectedMods.Value);
-                var score = ruleset.GetAutoplayMod().CreateReplayScore(beatmap);
+            var score = currentTest.Autoplay
+                ? ruleset.GetAutoplayMod().CreateReplayScore(Beatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo, SelectedMods.Value))
+                : new Score { Replay = new Replay() };
 
-                return new TestReplayPlayer(score, false, false);
-            }
-
-            return base.CreatePlayer(ruleset);
+            return CreateReplayPlayer(score);
         }
 
+        /// <summary>
+        /// Creates the test cases for this test scene.
+        /// </summary>
         protected abstract ModTestCaseData[] CreateTestCases();
 
+        /// <summary>
+        /// Creates the <see cref="TestPlayer"/> for a test case.
+        /// </summary>
+        /// <param name="score">The <see cref="Score"/>.</param>
+        protected virtual TestPlayer CreateReplayPlayer(Score score) => new TestPlayer(score);
+
+        protected class TestPlayer : TestReplayPlayer
+        {
+            public TestPlayer(Score score)
+                : base(score, false, false)
+            {
+            }
+        }
+
         protected class ModTestCaseData
         {
-            public Mod Mod;
-            public bool Autoplay;
+            /// <summary>
+            /// Whether to use a replay to simulate an auto-play. True by default.
+            /// </summary>
+            public bool Autoplay = true;
+
+            /// <summary>
+            /// The beatmap for this test case.
+            /// </summary>
+            [CanBeNull]
             public IBeatmap Beatmap;
+
+            /// <summary>
+            /// The conditions that cause this test case to pass.
+            /// </summary>
+            [CanBeNull]
+            public Func<bool> PassCondition;
+
+            /// <summary>
+            /// The name of this test case, displayed in the test browser.
+            /// </summary>
+            public readonly string Name;
+
+            /// <summary>
+            /// The <see cref="Mod"/> this test case tests.
+            /// </summary>
+            public readonly Mod Mod;
+
+            public ModTestCaseData(string name, Mod mod)
+            {
+                Name = name;
+                Mod = mod;
+            }
         }
     }
 }

From ce7cbf29ca1546f4fc8f1d81ca8cbb401537dfdf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 2 Mar 2020 12:20:25 +0900
Subject: [PATCH 0801/1142] Move to using test methods for better separation

---
 .../Mods/TestSceneOsuModDifficultyAdjust.cs   | 37 ++++++++++---------
 osu.Game/Tests/Visual/ModSandboxTestScene.cs  | 22 +++++------
 osu.Game/Tests/Visual/PlayerTestScene.cs      | 17 +++++++++
 osu.Game/Tests/Visual/ScreenTestScene.cs      |  2 +-
 4 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index 46a3c1dff3..1fc9ccccd1 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using NUnit.Framework;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
@@ -20,24 +21,26 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         {
         }
 
-        protected override ModTestCaseData[] CreateTestCases() => new[]
+        [Test]
+        public void TestNoAdjustment() => CreateModTest(new ModTestCaseData("no adjustment", new OsuModDifficultyAdjust())
         {
-            new ModTestCaseData("no adjustment", new OsuModDifficultyAdjust())
-            {
-                Autoplay = true,
-                PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
-            },
-            new ModTestCaseData("cs = 10", new OsuModDifficultyAdjust { CircleSize = { Value = 10 } })
-            {
-                Autoplay = true,
-                PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
-            },
-            new ModTestCaseData("ar = 10", new OsuModDifficultyAdjust { ApproachRate = { Value = 10 } })
-            {
-                Autoplay = true,
-                PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
-            },
-        };
+            Autoplay = true,
+            PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
+        });
+
+        [Test]
+        public void TestCircleSize10() => CreateModTest(new ModTestCaseData("cs = 10", new OsuModDifficultyAdjust { CircleSize = { Value = 10 } })
+        {
+            Autoplay = true,
+            PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
+        });
+
+        [Test]
+        public void TestApproachRate10() => CreateModTest(new ModTestCaseData("ar = 10", new OsuModDifficultyAdjust { ApproachRate = { Value = 10 } })
+        {
+            Autoplay = true,
+            PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
+        });
 
         protected override TestPlayer CreateReplayPlayer(Score score) => new ScoreAccessibleTestPlayer(score);
 
diff --git a/osu.Game/Tests/Visual/ModSandboxTestScene.cs b/osu.Game/Tests/Visual/ModSandboxTestScene.cs
index 0610a145ae..a1fa757452 100644
--- a/osu.Game/Tests/Visual/ModSandboxTestScene.cs
+++ b/osu.Game/Tests/Visual/ModSandboxTestScene.cs
@@ -16,6 +16,8 @@ namespace osu.Game.Tests.Visual
 {
     public abstract class ModSandboxTestScene : PlayerTestScene
     {
+        protected sealed override bool HasCustomSteps => true;
+
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(ModSandboxTestScene)
@@ -28,14 +30,15 @@ namespace osu.Game.Tests.Visual
 
         private ModTestCaseData currentTest;
 
-        public override void SetUpSteps()
+        protected void CreateModTest(ModTestCaseData testCaseData) => CreateTest(() =>
         {
-            foreach (var testCase in CreateTestCases())
-            {
-                AddStep(testCase.Name, () => currentTest = testCase);
-                base.SetUpSteps();
-                AddUntilStep("test passed", () => testCase.PassCondition?.Invoke() ?? true);
-            }
+            AddStep("set test data", () => currentTest = testCaseData);
+        });
+
+        public override void TearDownSteps()
+        {
+            AddUntilStep("test passed", () => currentTest?.PassCondition?.Invoke() ?? true);
+            base.TearDownSteps();
         }
 
         protected sealed override IBeatmap CreateBeatmap(RulesetInfo ruleset) => currentTest?.Beatmap ?? base.CreateBeatmap(ruleset);
@@ -51,11 +54,6 @@ namespace osu.Game.Tests.Visual
             return CreateReplayPlayer(score);
         }
 
-        /// <summary>
-        /// Creates the test cases for this test scene.
-        /// </summary>
-        protected abstract ModTestCaseData[] CreateTestCases();
-
         /// <summary>
         /// Creates the <see cref="TestPlayer"/> for a test case.
         /// </summary>
diff --git a/osu.Game/Tests/Visual/PlayerTestScene.cs b/osu.Game/Tests/Visual/PlayerTestScene.cs
index 1ca5256353..0d5aac8cfd 100644
--- a/osu.Game/Tests/Visual/PlayerTestScene.cs
+++ b/osu.Game/Tests/Visual/PlayerTestScene.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
@@ -14,6 +15,11 @@ namespace osu.Game.Tests.Visual
 {
     public abstract class PlayerTestScene : RateAdjustedBeatmapTestScene
     {
+        /// <summary>
+        /// Whether custom test steps are provided. Custom tests should invoke <see cref="CreateTest"/> to create the test steps.
+        /// </summary>
+        protected virtual bool HasCustomSteps { get; } = false;
+
         private readonly Ruleset ruleset;
 
         protected Player Player;
@@ -37,6 +43,17 @@ namespace osu.Game.Tests.Visual
         {
             base.SetUpSteps();
 
+            if (!HasCustomSteps)
+                CreateTest(null);
+        }
+
+        protected void CreateTest(Action action)
+        {
+            if (action != null && !HasCustomSteps)
+                throw new InvalidOperationException($"Cannot add custom test steps without {nameof(HasCustomSteps)} being set.");
+
+            action?.Invoke();
+
             AddStep(ruleset.RulesetInfo.Name, LoadPlayer);
             AddUntilStep("player loaded", () => Player.IsLoaded && Player.Alpha == 1);
         }
diff --git a/osu.Game/Tests/Visual/ScreenTestScene.cs b/osu.Game/Tests/Visual/ScreenTestScene.cs
index feca592049..d26aacf2bc 100644
--- a/osu.Game/Tests/Visual/ScreenTestScene.cs
+++ b/osu.Game/Tests/Visual/ScreenTestScene.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Tests.Visual
         public virtual void SetUpSteps() => addExitAllScreensStep();
 
         [TearDownSteps]
-        public void TearDownSteps() => addExitAllScreensStep();
+        public virtual void TearDownSteps() => addExitAllScreensStep();
 
         private void addExitAllScreensStep()
         {

From 6d939e9d415609f7d64dea9874456529d32b48f4 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 2 Mar 2020 12:42:48 +0900
Subject: [PATCH 0802/1142] Add failing test scenes

---
 .../TestSceneCatchModPerfect.cs               | 54 +++++++++++++++
 .../TestSceneManiaModPerfect.cs               | 26 ++++++++
 .../TestSceneOsuModPerfect.cs                 | 52 +++++++++++++++
 .../TestSceneTaikoModPerfect.cs               | 30 +++++++++
 osu.Game/Tests/Visual/ModPerfectTestScene.cs  | 66 +++++++++++++++++++
 5 files changed, 228 insertions(+)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/TestSceneCatchModPerfect.cs
 create mode 100644 osu.Game.Rulesets.Mania.Tests/TestSceneManiaModPerfect.cs
 create mode 100644 osu.Game.Rulesets.Osu.Tests/TestSceneOsuModPerfect.cs
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModPerfect.cs
 create mode 100644 osu.Game/Tests/Visual/ModPerfectTestScene.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModPerfect.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModPerfect.cs
new file mode 100644
index 0000000000..f5bd3b1133
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModPerfect.cs
@@ -0,0 +1,54 @@
+// 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.Game.Rulesets.Catch.Mods;
+using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Tests.Visual;
+using osuTK;
+
+namespace osu.Game.Rulesets.Catch.Tests
+{
+    public class TestSceneCatchModPerfect : ModPerfectTestScene
+    {
+        public TestSceneCatchModPerfect()
+            : base(new CatchRuleset(), new CatchModPerfect())
+        {
+        }
+
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestBananaShower(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestCase(new BananaShower { StartTime = 1000, EndTime = 3000 }, false), shouldMiss);
+
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestFruit(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestCase(new Fruit { StartTime = 1000 }), shouldMiss);
+
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestTestJuiceStream(bool shouldMiss)
+        {
+            var stream = new JuiceStream
+            {
+                StartTime = 1000,
+                Path = new SliderPath(PathType.Linear, new[]
+                {
+                    Vector2.Zero,
+                    new Vector2(100, 0),
+                })
+            };
+
+            CreateHitObjectTest(new HitObjectTestCase(stream), shouldMiss);
+        }
+
+        // We only care about testing misses, hits are tested via JuiceStream
+        [TestCase(true)]
+        public void TestDroplet(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestCase(new Droplet { StartTime = 1000 }), shouldMiss);
+
+        // We only care about testing misses, hits are tested via JuiceStream
+        [TestCase(true)]
+        public void TestTinyDroplet(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestCase(new TinyDroplet { StartTime = 1000 }), shouldMiss);
+    }
+}
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaModPerfect.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaModPerfect.cs
new file mode 100644
index 0000000000..f49a19e218
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaModPerfect.cs
@@ -0,0 +1,26 @@
+// 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.Game.Rulesets.Mania.Mods;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    public class TestSceneManiaModPerfect : ModPerfectTestScene
+    {
+        public TestSceneManiaModPerfect()
+            : base(new ManiaRuleset(), new ManiaModPerfect())
+        {
+        }
+
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestNote(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestCase(new Note { StartTime = 1000 }), shouldMiss);
+
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestHoldNote(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestCase(new HoldNote { StartTime = 1000, EndTime = 3000 }), shouldMiss);
+    }
+}
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuModPerfect.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuModPerfect.cs
new file mode 100644
index 0000000000..02fd5b5a79
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuModPerfect.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 NUnit.Framework;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Types;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Tests.Visual;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    public class TestSceneOsuModPerfect : ModPerfectTestScene
+    {
+        public TestSceneOsuModPerfect()
+            : base(new OsuRuleset(), new OsuModPerfect())
+        {
+        }
+
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestHitCircle(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestCase(new HitCircle { StartTime = 1000 }), shouldMiss);
+
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestSlider(bool shouldMiss)
+        {
+            var slider = new Slider
+            {
+                StartTime = 1000,
+                Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, new Vector2(100, 0), })
+            };
+
+            CreateHitObjectTest(new HitObjectTestCase(slider), shouldMiss);
+        }
+
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestSpinner(bool shouldMiss)
+        {
+            var spinner = new Spinner
+            {
+                StartTime = 1000,
+                EndTime = 3000,
+                Position = new Vector2(256, 192)
+            };
+
+            CreateHitObjectTest(new HitObjectTestCase(spinner), shouldMiss);
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModPerfect.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModPerfect.cs
new file mode 100644
index 0000000000..4069ee7983
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModPerfect.cs
@@ -0,0 +1,30 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Game.Rulesets.Taiko.Mods;
+using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    public class TestSceneTaikoModPerfect : ModPerfectTestScene
+    {
+        public TestSceneTaikoModPerfect()
+            : base(new TaikoRuleset(), new TaikoModPerfect())
+        {
+        }
+
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestHit(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestCase(new CentreHit { StartTime = 1000 }), shouldMiss);
+
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestDrumRoll(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestCase(new DrumRoll { StartTime = 1000, EndTime = 3000 }), shouldMiss);
+
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestSwell(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestCase(new Swell { StartTime = 1000, EndTime = 3000 }), shouldMiss);
+    }
+}
diff --git a/osu.Game/Tests/Visual/ModPerfectTestScene.cs b/osu.Game/Tests/Visual/ModPerfectTestScene.cs
new file mode 100644
index 0000000000..272b5366a9
--- /dev/null
+++ b/osu.Game/Tests/Visual/ModPerfectTestScene.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 osu.Framework.Extensions.TypeExtensions;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Scoring;
+
+namespace osu.Game.Tests.Visual
+{
+    public abstract class ModPerfectTestScene : ModSandboxTestScene
+    {
+        private readonly ModPerfect perfectMod;
+
+        protected ModPerfectTestScene(Ruleset ruleset, ModPerfect perfectMod)
+            : base(ruleset)
+        {
+            this.perfectMod = perfectMod;
+        }
+
+        protected void CreateHitObjectTest(HitObjectTestCase testCaseData, bool shouldMiss) => CreateModTest(new ModTestCaseData(testCaseData.HitObject.GetType().ReadableName(), perfectMod)
+        {
+            Beatmap = new Beatmap
+            {
+                BeatmapInfo = { Ruleset = Ruleset.Value },
+                HitObjects = { testCaseData.HitObject }
+            },
+            Autoplay = !shouldMiss,
+            PassCondition = () => ((PerfectModTestPlayer)Player).CheckFailed(shouldMiss && testCaseData.FailOnMiss)
+        });
+
+        protected sealed override TestPlayer CreateReplayPlayer(Score score) => new PerfectModTestPlayer(score);
+
+        private class PerfectModTestPlayer : TestPlayer
+        {
+            public PerfectModTestPlayer(Score score)
+                : base(score)
+            {
+            }
+
+            protected override bool AllowFail => true;
+
+            public bool CheckFailed(bool failed)
+            {
+                if (!failed)
+                    return ScoreProcessor.HasCompleted && !HealthProcessor.HasFailed;
+
+                return ScoreProcessor.JudgedHits > 0 && HealthProcessor.HasFailed;
+            }
+        }
+
+        protected class HitObjectTestCase
+        {
+            public readonly HitObject HitObject;
+            public readonly bool FailOnMiss;
+
+            public HitObjectTestCase(HitObject hitObject, bool failOnMiss = true)
+            {
+                HitObject = hitObject;
+                FailOnMiss = failOnMiss;
+            }
+        }
+    }
+}

From e801ad514bacd08de9b09f4669278ac51a777223 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 2 Mar 2020 13:24:02 +0900
Subject: [PATCH 0803/1142] Fix ruleset nullref

---
 osu.Game/Tests/Visual/ModPerfectTestScene.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Tests/Visual/ModPerfectTestScene.cs b/osu.Game/Tests/Visual/ModPerfectTestScene.cs
index 272b5366a9..ded1b3676e 100644
--- a/osu.Game/Tests/Visual/ModPerfectTestScene.cs
+++ b/osu.Game/Tests/Visual/ModPerfectTestScene.cs
@@ -12,11 +12,13 @@ namespace osu.Game.Tests.Visual
 {
     public abstract class ModPerfectTestScene : ModSandboxTestScene
     {
+        private readonly Ruleset ruleset;
         private readonly ModPerfect perfectMod;
 
         protected ModPerfectTestScene(Ruleset ruleset, ModPerfect perfectMod)
             : base(ruleset)
         {
+            this.ruleset = ruleset;
             this.perfectMod = perfectMod;
         }
 
@@ -24,7 +26,7 @@ namespace osu.Game.Tests.Visual
         {
             Beatmap = new Beatmap
             {
-                BeatmapInfo = { Ruleset = Ruleset.Value },
+                BeatmapInfo = { Ruleset = ruleset.RulesetInfo },
                 HitObjects = { testCaseData.HitObject }
             },
             Autoplay = !shouldMiss,

From cd43a0c9e8071c818fa289972076ff61fcc1b5c3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 2 Mar 2020 13:24:07 +0900
Subject: [PATCH 0804/1142] Better check for failing state

---
 osu.Game/Tests/Visual/ModPerfectTestScene.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Tests/Visual/ModPerfectTestScene.cs b/osu.Game/Tests/Visual/ModPerfectTestScene.cs
index ded1b3676e..31d2ce9281 100644
--- a/osu.Game/Tests/Visual/ModPerfectTestScene.cs
+++ b/osu.Game/Tests/Visual/ModPerfectTestScene.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Tests.Visual
                 if (!failed)
                     return ScoreProcessor.HasCompleted && !HealthProcessor.HasFailed;
 
-                return ScoreProcessor.JudgedHits > 0 && HealthProcessor.HasFailed;
+                return HealthProcessor.HasFailed;
             }
         }
 

From bb4193d985cb47e450adafe03059b03fcff38705 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 2 Mar 2020 13:24:55 +0900
Subject: [PATCH 0805/1142] Fix taiko infinity health drain on some beatmaps

---
 osu.Game.Rulesets.Taiko/Scoring/TaikoHealthProcessor.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko/Scoring/TaikoHealthProcessor.cs b/osu.Game.Rulesets.Taiko/Scoring/TaikoHealthProcessor.cs
index edb089dbac..dd3c2289ea 100644
--- a/osu.Game.Rulesets.Taiko/Scoring/TaikoHealthProcessor.cs
+++ b/osu.Game.Rulesets.Taiko/Scoring/TaikoHealthProcessor.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Judgements;
@@ -39,7 +40,7 @@ namespace osu.Game.Rulesets.Taiko.Scoring
         {
             base.ApplyBeatmap(beatmap);
 
-            hpMultiplier = 1 / (object_count_factor * beatmap.HitObjects.OfType<Hit>().Count() * BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.DrainRate, 0.5, 0.75, 0.98));
+            hpMultiplier = 1 / (object_count_factor * Math.Max(1, beatmap.HitObjects.OfType<Hit>().Count()) * BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.DrainRate, 0.5, 0.75, 0.98));
             hpMissMultiplier = BeatmapDifficulty.DifficultyRange(beatmap.BeatmapInfo.BaseDifficulty.DrainRate, 0.0018, 0.0075, 0.0120);
         }
 

From e58fb3f52823a4feb1ead00097000e4e689cac48 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 2 Mar 2020 13:25:16 +0900
Subject: [PATCH 0806/1142] Make default taiko HP 1 for test scene

---
 .../TestSceneTaikoModPerfect.cs               | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModPerfect.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModPerfect.cs
index 4069ee7983..b67810846e 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModPerfect.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModPerfect.cs
@@ -2,8 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Mods;
 using osu.Game.Rulesets.Taiko.Objects;
+using osu.Game.Rulesets.Taiko.Scoring;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Taiko.Tests
@@ -11,7 +13,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
     public class TestSceneTaikoModPerfect : ModPerfectTestScene
     {
         public TestSceneTaikoModPerfect()
-            : base(new TaikoRuleset(), new TaikoModPerfect())
+            : base(new TestTaikoRuleset(), new TaikoModPerfect())
         {
         }
 
@@ -26,5 +28,20 @@ namespace osu.Game.Rulesets.Taiko.Tests
         [TestCase(false)]
         [TestCase(true)]
         public void TestSwell(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestCase(new Swell { StartTime = 1000, EndTime = 3000 }), shouldMiss);
+
+        private class TestTaikoRuleset : TaikoRuleset
+        {
+            public override HealthProcessor CreateHealthProcessor(double drainStartTime) => new TestTaikoHealthProcessor();
+
+            private class TestTaikoHealthProcessor : TaikoHealthProcessor
+            {
+                protected override void Reset(bool storeResults)
+                {
+                    base.Reset(storeResults);
+
+                    Health.Value = 1; // Don't care about the health condition (only the mod condition)
+                }
+            }
+        }
     }
 }

From 6fb52e5370c67de6a5f67bff3d8f19b13dc5bc22 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 2 Mar 2020 13:25:36 +0900
Subject: [PATCH 0807/1142] Fix custom rulesets not being testable

---
 osu.Game/Tests/Visual/PlayerTestScene.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Tests/Visual/PlayerTestScene.cs b/osu.Game/Tests/Visual/PlayerTestScene.cs
index 0d5aac8cfd..3d8eefaa9d 100644
--- a/osu.Game/Tests/Visual/PlayerTestScene.cs
+++ b/osu.Game/Tests/Visual/PlayerTestScene.cs
@@ -67,6 +67,7 @@ namespace osu.Game.Tests.Visual
             var beatmap = CreateBeatmap(ruleset.RulesetInfo);
 
             Beatmap.Value = CreateWorkingBeatmap(beatmap);
+            Ruleset.Value = ruleset.RulesetInfo;
 
             if (!AllowFail)
             {

From 6d051d9e42599c694d9a989c3c6a897451d968b8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 2 Mar 2020 13:25:56 +0900
Subject: [PATCH 0808/1142] Fix perfect mod failure cases

---
 osu.Game.Rulesets.Catch/Mods/CatchModPerfect.cs | 6 ++++++
 osu.Game/Rulesets/Mods/ModPerfect.cs            | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModPerfect.cs b/osu.Game.Rulesets.Catch/Mods/CatchModPerfect.cs
index fb92399102..e3391c47f1 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModPerfect.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModPerfect.cs
@@ -1,11 +1,17 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Game.Rulesets.Catch.Judgements;
+using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Catch.Mods
 {
     public class CatchModPerfect : ModPerfect
     {
+        protected override bool FailCondition(HealthProcessor healthProcessor, JudgementResult result)
+            => !(result.Judgement is CatchBananaJudgement)
+               && base.FailCondition(healthProcessor, result);
     }
 }
diff --git a/osu.Game/Rulesets/Mods/ModPerfect.cs b/osu.Game/Rulesets/Mods/ModPerfect.cs
index 882d3ebd6a..7fe606d584 100644
--- a/osu.Game/Rulesets/Mods/ModPerfect.cs
+++ b/osu.Game/Rulesets/Mods/ModPerfect.cs
@@ -15,6 +15,8 @@ namespace osu.Game.Rulesets.Mods
         public override IconUsage? Icon => OsuIcon.ModPerfect;
         public override string Description => "SS or quit.";
 
-        protected override bool FailCondition(HealthProcessor healthProcessor, JudgementResult result) => result.Type != result.Judgement.MaxResult;
+        protected override bool FailCondition(HealthProcessor healthProcessor, JudgementResult result)
+            => !(result.Judgement is IgnoreJudgement)
+               && result.Type != result.Judgement.MaxResult;
     }
 }

From 89399b177c56e7e129a3f642c787ea384e9f0dca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Mar 2020 16:41:00 +0900
Subject: [PATCH 0809/1142] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 651d1beda1..983c622f77 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.221.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.229.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.302.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 168a358e47..c6c2708e64 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.221.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.229.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.302.0" />
     <PackageReference Include="Sentry" Version="2.0.3" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 3c2a67e908..3552047cf8 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.221.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.229.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.302.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
@@ -79,7 +79,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.229.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.302.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 5432371c74bf9c4787ae206ff154513abd8da60b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Mar 2020 08:42:12 +0000
Subject: [PATCH 0810/1142] Bump Sentry from 2.0.3 to 2.1.0

Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 2.0.3 to 2.1.0.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/2.0.3...2.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 osu.Game/osu.Game.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 168a358e47..2b6ac585fa 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.221.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2020.229.0" />
-    <PackageReference Include="Sentry" Version="2.0.3" />
+    <PackageReference Include="Sentry" Version="2.1.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />

From ee73f3e2b2c2fba744cd67fd499b6fd1ef5fb46c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Mar 2020 18:54:00 +0900
Subject: [PATCH 0811/1142] Change matching mode for global actions to better
 discern similar binds

---
 osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs | 5 +++--
 osu.Game/Input/Bindings/GlobalActionContainer.cs        | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs b/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
index ea274284ac..e83d899469 100644
--- a/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
+++ b/osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
@@ -31,8 +31,9 @@ namespace osu.Game.Input.Bindings
         /// <param name="ruleset">A reference to identify the current <see cref="Ruleset"/>. Used to lookup mappings. Null for global mappings.</param>
         /// <param name="variant">An optional variant for the specified <see cref="Ruleset"/>. Used when a ruleset has more than one possible keyboard layouts.</param>
         /// <param name="simultaneousMode">Specify how to deal with multiple matches of <see cref="KeyCombination"/>s and <typeparamref name="T"/>s.</param>
-        public DatabasedKeyBindingContainer(RulesetInfo ruleset = null, int? variant = null, SimultaneousBindingMode simultaneousMode = SimultaneousBindingMode.None)
-            : base(simultaneousMode)
+        /// <param name="matchingMode">Specify how to deal with exact <see cref="KeyCombination"/> matches.</param>
+        public DatabasedKeyBindingContainer(RulesetInfo ruleset = null, int? variant = null, SimultaneousBindingMode simultaneousMode = SimultaneousBindingMode.None, KeyCombinationMatchingMode matchingMode = KeyCombinationMatchingMode.Any)
+            : base(simultaneousMode, matchingMode)
         {
             this.ruleset = ruleset;
             this.variant = variant;
diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 7763577a14..bb0c586d73 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -15,6 +15,7 @@ namespace osu.Game.Input.Bindings
         private readonly Drawable handler;
 
         public GlobalActionContainer(OsuGameBase game)
+            : base(matchingMode: KeyCombinationMatchingMode.Modifiers)
         {
             if (game is IKeyBindingHandler<GlobalAction>)
                 handler = game;

From 489bf16beae7bbdb91e390db14b30f9c0ea33575 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Mar 2020 18:55:28 +0900
Subject: [PATCH 0812/1142] Add SelectNext and SelectPrevious global actions

---
 .../Input/Bindings/GlobalActionContainer.cs   |  9 +++
 osu.Game/Screens/Play/GameplayMenuOverlay.cs  | 40 +++++---------
 osu.Game/Screens/Select/BeatmapCarousel.cs    | 55 +++++++++----------
 3 files changed, 50 insertions(+), 54 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index bb0c586d73..8f481d94c7 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -39,6 +39,9 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(InputKey.Escape, GlobalAction.Back),
             new KeyBinding(InputKey.ExtraMouseButton1, GlobalAction.Back),
 
+            new KeyBinding(InputKey.Up, GlobalAction.SelectPrevious),
+            new KeyBinding(InputKey.Down, GlobalAction.SelectNext),
+
             new KeyBinding(InputKey.Space, GlobalAction.Select),
             new KeyBinding(InputKey.Enter, GlobalAction.Select),
             new KeyBinding(InputKey.KeypadEnter, GlobalAction.Select),
@@ -142,5 +145,11 @@ namespace osu.Game.Input.Bindings
 
         [Description("Toggle now playing overlay")]
         ToggleNowPlaying,
+
+        [Description("Previous Selection")]
+        SelectPrevious,
+
+        [Description("Next Selection")]
+        SelectNext,
     }
 }
diff --git a/osu.Game/Screens/Play/GameplayMenuOverlay.cs b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
index 98e2bc5a03..6b37135c86 100644
--- a/osu.Game/Screens/Play/GameplayMenuOverlay.cs
+++ b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
@@ -12,7 +12,6 @@ using osu.Game.Graphics;
 using osu.Framework.Allocation;
 using osu.Game.Graphics.UserInterface;
 using osu.Framework.Graphics.Shapes;
-using osuTK.Input;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Input.Bindings;
@@ -204,35 +203,24 @@ namespace osu.Game.Screens.Play
                 InternalButtons[selectionIndex].Selected.Value = true;
         }
 
-        protected override bool OnKeyDown(KeyDownEvent e)
-        {
-            if (!e.Repeat)
-            {
-                switch (e.Key)
-                {
-                    case Key.Up:
-                        if (selectionIndex == -1 || selectionIndex == 0)
-                            setSelected(InternalButtons.Count - 1);
-                        else
-                            setSelected(selectionIndex - 1);
-                        return true;
-
-                    case Key.Down:
-                        if (selectionIndex == -1 || selectionIndex == InternalButtons.Count - 1)
-                            setSelected(0);
-                        else
-                            setSelected(selectionIndex + 1);
-                        return true;
-                }
-            }
-
-            return base.OnKeyDown(e);
-        }
-
         public bool OnPressed(GlobalAction action)
         {
             switch (action)
             {
+                case GlobalAction.SelectPrevious:
+                    if (selectionIndex == -1 || selectionIndex == 0)
+                        setSelected(InternalButtons.Count - 1);
+                    else
+                        setSelected(selectionIndex - 1);
+                    return true;
+
+                case GlobalAction.SelectNext:
+                    if (selectionIndex == -1 || selectionIndex == InternalButtons.Count - 1)
+                        setSelected(0);
+                    else
+                        setSelected(selectionIndex + 1);
+                    return true;
+
                 case GlobalAction.Back:
                     BackAction.Invoke();
                     return true;
diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 7f36a23a86..1db97af2f0 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -16,15 +16,17 @@ using osu.Framework.Bindables;
 using osu.Framework.Caching;
 using osu.Framework.Threading;
 using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
+using osu.Game.Input.Bindings;
 using osu.Game.Screens.Select.Carousel;
 
 namespace osu.Game.Screens.Select
 {
-    public class BeatmapCarousel : CompositeDrawable
+    public class BeatmapCarousel : CompositeDrawable, IKeyBindingHandler<GlobalAction>
     {
         private const float bleed_top = FilterControl.HEIGHT;
         private const float bleed_bottom = Footer.HEIGHT;
@@ -435,41 +437,38 @@ namespace osu.Game.Screens.Select
 
         protected override bool OnKeyDown(KeyDownEvent e)
         {
-            // allow for controlling volume when alt is held.
-            // this is required as the VolumeControlReceptor uses OnPressed, which is
-            // executed after all OnKeyDown events.
-            if (e.AltPressed)
-                return base.OnKeyDown(e);
-
-            int direction = 0;
-            bool skipDifficulties = false;
-
             switch (e.Key)
             {
-                case Key.Up:
-                    direction = -1;
-                    break;
-
-                case Key.Down:
-                    direction = 1;
-                    break;
-
                 case Key.Left:
-                    direction = -1;
-                    skipDifficulties = true;
-                    break;
+                    SelectNext(-1, true);
+                    return true;
 
                 case Key.Right:
-                    direction = 1;
-                    skipDifficulties = true;
-                    break;
+                    SelectNext(1, true);
+                    return true;
             }
 
-            if (direction == 0)
-                return base.OnKeyDown(e);
+            return false;
+        }
 
-            SelectNext(direction, skipDifficulties);
-            return true;
+        public bool OnPressed(GlobalAction action)
+        {
+            switch (action)
+            {
+                case GlobalAction.SelectNext:
+                    SelectNext(1, false);
+                    return true;
+
+                case GlobalAction.SelectPrevious:
+                    SelectNext(-1, false);
+                    return true;
+            }
+
+            return false;
+        }
+
+        public void OnReleased(GlobalAction action)
+        {
         }
 
         protected override void Update()

From 3404b09010608459508bf0f7829adde00bae011d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Mar 2020 18:55:52 +0900
Subject: [PATCH 0813/1142] Bring database snapshot in line with specs

---
 osu.Game/Migrations/OsuDbContextModelSnapshot.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Migrations/OsuDbContextModelSnapshot.cs b/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
index a6d9d1f3cb..bc4fc3342d 100644
--- a/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
+++ b/osu.Game/Migrations/OsuDbContextModelSnapshot.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Migrations
                     b.Property<int>("ID")
                         .ValueGeneratedOnAdd();
 
-                    b.Property<int>("AudioLeadIn");
+                    b.Property<double>("AudioLeadIn");
 
                     b.Property<double>("BPM");
 

From ed516f05c2fb6d054e20cb6ffd0e343f5603f74f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Mar 2020 18:56:09 +0900
Subject: [PATCH 0814/1142] Forward any unhandled scroll events to volume
 overlay

---
 osu.Game/OsuGame.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index a73d5b57c4..5781a7fbc4 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -25,6 +25,7 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
 using osu.Framework.Platform;
 using osu.Framework.Threading;
 using osu.Game.Beatmaps;
@@ -805,6 +806,13 @@ namespace osu.Game
             return d;
         }
 
+        protected override bool OnScroll(ScrollEvent e)
+        {
+            // forward any unhandled mouse scroll events to the volume control.
+            volume.Adjust(GlobalAction.IncreaseVolume, e.ScrollDelta.Y, e.IsPrecise);
+            return true;
+        }
+
         public bool OnPressed(GlobalAction action)
         {
             if (introScreen == null) return false;

From 88583b5c79c5c5becd55268ffc19ce6b1b76be5c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Mar 2020 18:56:41 +0900
Subject: [PATCH 0815/1142] Remove any existing bindings to increase/decrease
 volume

---
 ...02094919_RefreshVolumeBindings.Designer.cs | 506 ++++++++++++++++++
 .../20200302094919_RefreshVolumeBindings.cs   |  16 +
 2 files changed, 522 insertions(+)
 create mode 100644 osu.Game/Migrations/20200302094919_RefreshVolumeBindings.Designer.cs
 create mode 100644 osu.Game/Migrations/20200302094919_RefreshVolumeBindings.cs

diff --git a/osu.Game/Migrations/20200302094919_RefreshVolumeBindings.Designer.cs b/osu.Game/Migrations/20200302094919_RefreshVolumeBindings.Designer.cs
new file mode 100644
index 0000000000..22316b0380
--- /dev/null
+++ b/osu.Game/Migrations/20200302094919_RefreshVolumeBindings.Designer.cs
@@ -0,0 +1,506 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using osu.Game.Database;
+
+namespace osu.Game.Migrations
+{
+    [DbContext(typeof(OsuDbContext))]
+    [Migration("20200302094919_RefreshVolumeBindings")]
+    partial class RefreshVolumeBindings
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "2.2.6-servicing-10079");
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapDifficulty", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<float>("ApproachRate");
+
+                    b.Property<float>("CircleSize");
+
+                    b.Property<float>("DrainRate");
+
+                    b.Property<float>("OverallDifficulty");
+
+                    b.Property<double>("SliderMultiplier");
+
+                    b.Property<double>("SliderTickRate");
+
+                    b.HasKey("ID");
+
+                    b.ToTable("BeatmapDifficulty");
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<double>("AudioLeadIn");
+
+                    b.Property<double>("BPM");
+
+                    b.Property<int>("BaseDifficultyID");
+
+                    b.Property<int>("BeatDivisor");
+
+                    b.Property<int>("BeatmapSetInfoID");
+
+                    b.Property<bool>("Countdown");
+
+                    b.Property<double>("DistanceSpacing");
+
+                    b.Property<int>("GridSize");
+
+                    b.Property<string>("Hash");
+
+                    b.Property<bool>("Hidden");
+
+                    b.Property<double>("Length");
+
+                    b.Property<bool>("LetterboxInBreaks");
+
+                    b.Property<string>("MD5Hash");
+
+                    b.Property<int?>("MetadataID");
+
+                    b.Property<int?>("OnlineBeatmapID");
+
+                    b.Property<string>("Path");
+
+                    b.Property<int>("RulesetID");
+
+                    b.Property<bool>("SpecialStyle");
+
+                    b.Property<float>("StackLeniency");
+
+                    b.Property<double>("StarDifficulty");
+
+                    b.Property<int>("Status");
+
+                    b.Property<string>("StoredBookmarks");
+
+                    b.Property<double>("TimelineZoom");
+
+                    b.Property<string>("Version");
+
+                    b.Property<bool>("WidescreenStoryboard");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("BaseDifficultyID");
+
+                    b.HasIndex("BeatmapSetInfoID");
+
+                    b.HasIndex("Hash");
+
+                    b.HasIndex("MD5Hash");
+
+                    b.HasIndex("MetadataID");
+
+                    b.HasIndex("OnlineBeatmapID")
+                        .IsUnique();
+
+                    b.HasIndex("RulesetID");
+
+                    b.ToTable("BeatmapInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapMetadata", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Artist");
+
+                    b.Property<string>("ArtistUnicode");
+
+                    b.Property<string>("AudioFile");
+
+                    b.Property<string>("AuthorString")
+                        .HasColumnName("Author");
+
+                    b.Property<string>("BackgroundFile");
+
+                    b.Property<int>("PreviewTime");
+
+                    b.Property<string>("Source");
+
+                    b.Property<string>("Tags");
+
+                    b.Property<string>("Title");
+
+                    b.Property<string>("TitleUnicode");
+
+                    b.Property<string>("VideoFile");
+
+                    b.HasKey("ID");
+
+                    b.ToTable("BeatmapMetadata");
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("BeatmapSetInfoID");
+
+                    b.Property<int>("FileInfoID");
+
+                    b.Property<string>("Filename")
+                        .IsRequired();
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("BeatmapSetInfoID");
+
+                    b.HasIndex("FileInfoID");
+
+                    b.ToTable("BeatmapSetFileInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTimeOffset>("DateAdded");
+
+                    b.Property<bool>("DeletePending");
+
+                    b.Property<string>("Hash");
+
+                    b.Property<int?>("MetadataID");
+
+                    b.Property<int?>("OnlineBeatmapSetID");
+
+                    b.Property<bool>("Protected");
+
+                    b.Property<int>("Status");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DeletePending");
+
+                    b.HasIndex("Hash")
+                        .IsUnique();
+
+                    b.HasIndex("MetadataID");
+
+                    b.HasIndex("OnlineBeatmapSetID")
+                        .IsUnique();
+
+                    b.ToTable("BeatmapSetInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Key")
+                        .HasColumnName("Key");
+
+                    b.Property<int?>("RulesetID");
+
+                    b.Property<int?>("SkinInfoID");
+
+                    b.Property<string>("StringValue")
+                        .HasColumnName("Value");
+
+                    b.Property<int?>("Variant");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("SkinInfoID");
+
+                    b.HasIndex("RulesetID", "Variant");
+
+                    b.ToTable("Settings");
+                });
+
+            modelBuilder.Entity("osu.Game.IO.FileInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Hash");
+
+                    b.Property<int>("ReferenceCount");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("Hash")
+                        .IsUnique();
+
+                    b.HasIndex("ReferenceCount");
+
+                    b.ToTable("FileInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Input.Bindings.DatabasedKeyBinding", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("IntAction")
+                        .HasColumnName("Action");
+
+                    b.Property<string>("KeysString")
+                        .HasColumnName("Keys");
+
+                    b.Property<int?>("RulesetID");
+
+                    b.Property<int?>("Variant");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("IntAction");
+
+                    b.HasIndex("RulesetID", "Variant");
+
+                    b.ToTable("KeyBinding");
+                });
+
+            modelBuilder.Entity("osu.Game.Rulesets.RulesetInfo", b =>
+                {
+                    b.Property<int?>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Available");
+
+                    b.Property<string>("InstantiationInfo");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("ShortName");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("Available");
+
+                    b.HasIndex("ShortName")
+                        .IsUnique();
+
+                    b.ToTable("RulesetInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("FileInfoID");
+
+                    b.Property<string>("Filename")
+                        .IsRequired();
+
+                    b.Property<int?>("ScoreInfoID");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("FileInfoID");
+
+                    b.HasIndex("ScoreInfoID");
+
+                    b.ToTable("ScoreFileInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<double>("Accuracy")
+                        .HasColumnType("DECIMAL(1,4)");
+
+                    b.Property<int>("BeatmapInfoID");
+
+                    b.Property<int>("Combo");
+
+                    b.Property<DateTimeOffset>("Date");
+
+                    b.Property<bool>("DeletePending");
+
+                    b.Property<string>("Hash");
+
+                    b.Property<int>("MaxCombo");
+
+                    b.Property<string>("ModsJson")
+                        .HasColumnName("Mods");
+
+                    b.Property<long?>("OnlineScoreID");
+
+                    b.Property<double?>("PP");
+
+                    b.Property<int>("Rank");
+
+                    b.Property<int>("RulesetID");
+
+                    b.Property<string>("StatisticsJson")
+                        .HasColumnName("Statistics");
+
+                    b.Property<long>("TotalScore");
+
+                    b.Property<long?>("UserID")
+                        .HasColumnName("UserID");
+
+                    b.Property<string>("UserString")
+                        .HasColumnName("User");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("BeatmapInfoID");
+
+                    b.HasIndex("OnlineScoreID")
+                        .IsUnique();
+
+                    b.HasIndex("RulesetID");
+
+                    b.ToTable("ScoreInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("FileInfoID");
+
+                    b.Property<string>("Filename")
+                        .IsRequired();
+
+                    b.Property<int>("SkinInfoID");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("FileInfoID");
+
+                    b.HasIndex("SkinInfoID");
+
+                    b.ToTable("SkinFileInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Skinning.SkinInfo", b =>
+                {
+                    b.Property<int>("ID")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Creator");
+
+                    b.Property<bool>("DeletePending");
+
+                    b.Property<string>("Hash");
+
+                    b.Property<string>("Name");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("DeletePending");
+
+                    b.HasIndex("Hash")
+                        .IsUnique();
+
+                    b.ToTable("SkinInfo");
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapInfo", b =>
+                {
+                    b.HasOne("osu.Game.Beatmaps.BeatmapDifficulty", "BaseDifficulty")
+                        .WithMany()
+                        .HasForeignKey("BaseDifficultyID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo", "BeatmapSet")
+                        .WithMany("Beatmaps")
+                        .HasForeignKey("BeatmapSetInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
+                        .WithMany("Beatmaps")
+                        .HasForeignKey("MetadataID");
+
+                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
+                        .WithMany()
+                        .HasForeignKey("RulesetID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetFileInfo", b =>
+                {
+                    b.HasOne("osu.Game.Beatmaps.BeatmapSetInfo")
+                        .WithMany("Files")
+                        .HasForeignKey("BeatmapSetInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
+                        .WithMany()
+                        .HasForeignKey("FileInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("osu.Game.Beatmaps.BeatmapSetInfo", b =>
+                {
+                    b.HasOne("osu.Game.Beatmaps.BeatmapMetadata", "Metadata")
+                        .WithMany("BeatmapSets")
+                        .HasForeignKey("MetadataID");
+                });
+
+            modelBuilder.Entity("osu.Game.Configuration.DatabasedSetting", b =>
+                {
+                    b.HasOne("osu.Game.Skinning.SkinInfo")
+                        .WithMany("Settings")
+                        .HasForeignKey("SkinInfoID");
+                });
+
+            modelBuilder.Entity("osu.Game.Scoring.ScoreFileInfo", b =>
+                {
+                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
+                        .WithMany()
+                        .HasForeignKey("FileInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.Scoring.ScoreInfo")
+                        .WithMany("Files")
+                        .HasForeignKey("ScoreInfoID");
+                });
+
+            modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b =>
+                {
+                    b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap")
+                        .WithMany("Scores")
+                        .HasForeignKey("BeatmapInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.Rulesets.RulesetInfo", "Ruleset")
+                        .WithMany()
+                        .HasForeignKey("RulesetID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("osu.Game.Skinning.SkinFileInfo", b =>
+                {
+                    b.HasOne("osu.Game.IO.FileInfo", "FileInfo")
+                        .WithMany()
+                        .HasForeignKey("FileInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("osu.Game.Skinning.SkinInfo")
+                        .WithMany("Files")
+                        .HasForeignKey("SkinInfoID")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/osu.Game/Migrations/20200302094919_RefreshVolumeBindings.cs b/osu.Game/Migrations/20200302094919_RefreshVolumeBindings.cs
new file mode 100644
index 0000000000..ec4475971c
--- /dev/null
+++ b/osu.Game/Migrations/20200302094919_RefreshVolumeBindings.cs
@@ -0,0 +1,16 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace osu.Game.Migrations
+{
+    public partial class RefreshVolumeBindings : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.Sql("DELETE FROM KeyBinding WHERE action in (6,7)");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+        }
+    }
+}

From 6989738710cc6e3da689b26087ab9f6f3dc09295 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Mar 2020 18:59:05 +0900
Subject: [PATCH 0816/1142] Change default global bindings for volume changing
 to include the alt key prefix

---
 osu.Game/Input/Bindings/GlobalActionContainer.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 8f481d94c7..71771abede 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -58,10 +58,11 @@ namespace osu.Game.Input.Bindings
 
         public IEnumerable<KeyBinding> AudioControlKeyBindings => new[]
         {
-            new KeyBinding(InputKey.Up, GlobalAction.IncreaseVolume),
-            new KeyBinding(InputKey.MouseWheelUp, GlobalAction.IncreaseVolume),
-            new KeyBinding(InputKey.Down, GlobalAction.DecreaseVolume),
-            new KeyBinding(InputKey.MouseWheelDown, GlobalAction.DecreaseVolume),
+            new KeyBinding(new[] { InputKey.Alt, InputKey.Up }, GlobalAction.IncreaseVolume),
+            new KeyBinding(new[] { InputKey.Alt, InputKey.MouseWheelUp }, GlobalAction.IncreaseVolume),
+            new KeyBinding(new[] { InputKey.Alt, InputKey.Down }, GlobalAction.DecreaseVolume),
+            new KeyBinding(new[] { InputKey.Alt, InputKey.MouseWheelDown }, GlobalAction.DecreaseVolume),
+
             new KeyBinding(InputKey.F4, GlobalAction.ToggleMute),
 
             new KeyBinding(InputKey.TrackPrevious, GlobalAction.MusicPrev),

From e608d807f4c8db1c90741cf80fff56dc769f292a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Mar 2020 18:59:38 +0900
Subject: [PATCH 0817/1142] Handle SelectPrevious / SelectNext as volume change
 operations if nothing else handled game-wide

---
 .../Overlays/Volume/VolumeControlReceptor.cs  | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Volume/VolumeControlReceptor.cs b/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
index 76fad945cc..4bff8146b4 100644
--- a/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
+++ b/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
@@ -14,8 +14,25 @@ namespace osu.Game.Overlays.Volume
         public Func<GlobalAction, bool> ActionRequested;
         public Func<GlobalAction, float, bool, bool> ScrollActionRequested;
 
-        public bool OnPressed(GlobalAction action) => ActionRequested?.Invoke(action) ?? false;
-        public bool OnScroll(GlobalAction action, float amount, bool isPrecise) => ScrollActionRequested?.Invoke(action, amount, isPrecise) ?? false;
+        public bool OnPressed(GlobalAction action)
+        {
+            // if nothing else handles selection actions in the game, it's safe to let volume be adjusted.
+            switch (action)
+            {
+                case GlobalAction.SelectPrevious:
+                    action = GlobalAction.IncreaseVolume;
+                    break;
+
+                case GlobalAction.SelectNext:
+                    action = GlobalAction.DecreaseVolume;
+                    break;
+            }
+
+            return ActionRequested?.Invoke(action) ?? false;
+        }
+
+        public bool OnScroll(GlobalAction action, float amount, bool isPrecise) =>
+            ScrollActionRequested?.Invoke(action, amount, isPrecise) ?? false;
 
         public void OnReleased(GlobalAction action)
         {

From 81191a3d20d6f7150bc201bf40149d160dd3b259 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Mar 2020 18:59:55 +0900
Subject: [PATCH 0818/1142] Handle SelectPrevious/SelectNext locally to volume
 meter when hovered

---
 osu.Game/Overlays/Volume/VolumeMeter.cs | 27 ++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Volume/VolumeMeter.cs b/osu.Game/Overlays/Volume/VolumeMeter.cs
index 7effd290e6..07accf8820 100644
--- a/osu.Game/Overlays/Volume/VolumeMeter.cs
+++ b/osu.Game/Overlays/Volume/VolumeMeter.cs
@@ -11,16 +11,18 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
+using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Input.Bindings;
 using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Volume
 {
-    public class VolumeMeter : Container
+    public class VolumeMeter : Container, IKeyBindingHandler<GlobalAction>
     {
         private CircularProgress volumeCircle;
         private CircularProgress volumeCircleGlow;
@@ -260,5 +262,28 @@ namespace osu.Game.Overlays.Volume
         {
             this.ScaleTo(1f, transition_length, Easing.OutExpo);
         }
+
+        public bool OnPressed(GlobalAction action)
+        {
+            if (!IsHovered)
+                return false;
+
+            switch (action)
+            {
+                case GlobalAction.SelectPrevious:
+                    adjust(1, false);
+                    return true;
+
+                case GlobalAction.SelectNext:
+                    adjust(-1, false);
+                    return true;
+            }
+
+            return false;
+        }
+
+        public void OnReleased(GlobalAction action)
+        {
+        }
     }
 }

From e890e454200dbccb263df546d37ba209cc5fb7b6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Mar 2020 19:40:32 +0900
Subject: [PATCH 0819/1142] Fix Ctrl+Enter behaviour regression

---
 osu.Game/Screens/Select/PlaySongSelect.cs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index e744fd6a7b..af113781e5 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
+using osu.Framework.Input.Events;
 using osu.Framework.Screens;
 using osu.Game.Graphics;
 using osu.Game.Screens.Play;
@@ -49,6 +50,20 @@ namespace osu.Game.Screens.Select
             }
         }
 
+        protected override bool OnKeyDown(KeyDownEvent e)
+        {
+            switch (e.Key)
+            {
+                case Key.Enter:
+                    // this is a special hard-coded case; we can't rely on OnPressed (of SongSelect) as GlobalActionContainer is
+                    // matching with exact modifier consideration (so Ctrl+Enter would be ignored).
+                    FinaliseSelection();
+                    return true;
+            }
+
+            return base.OnKeyDown(e);
+        }
+
         protected override bool OnStart()
         {
             if (player != null) return false;

From 23068034b103e6e5ac5c320cbfa37d43c19bb17b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Mar 2020 19:51:06 +0900
Subject: [PATCH 0820/1142] Rename bool and make property for legibility

---
 .../Overlays/Changelog/UpdateStreamBadge.cs   | 23 ++++++++++---------
 .../Changelog/UpdateStreamBadgeArea.cs        |  4 ++--
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/Changelog/UpdateStreamBadge.cs b/osu.Game/Overlays/Changelog/UpdateStreamBadge.cs
index 5e10410f37..97c58614b8 100644
--- a/osu.Game/Overlays/Changelog/UpdateStreamBadge.cs
+++ b/osu.Game/Overlays/Changelog/UpdateStreamBadge.cs
@@ -100,7 +100,7 @@ namespace osu.Game.Overlays.Changelog
 
         private void updateState()
         {
-            if (SelectedTab.Value == null && !externalDimRequested)
+            if (SelectedTab.Value == null && !allStreamsDimmed)
             {
                 expandingBar.Expand();
                 expandingBar.FadeTo(1, transition_duration, Easing.OutQuint);
@@ -113,21 +113,22 @@ namespace osu.Game.Overlays.Changelog
             expandingBar.IsCollapsed = !shouldExpand;
             expandingBar.FadeTo(shouldExpand ? 1 : 0.5f, transition_duration, Easing.OutQuint);
 
-            text.FadeTo(IsHovered || (Active.Value && !externalDimRequested) ? 1 : 0.5f, transition_duration, Easing.OutQuint);
+            text.FadeTo(IsHovered || (Active.Value && !allStreamsDimmed) ? 1 : 0.5f, transition_duration, Easing.OutQuint);
         }
 
-        private bool externalDimRequested;
+        private bool allStreamsDimmed;
 
-        public void EnableDim()
+        public bool AllStreamsDimmed
         {
-            externalDimRequested = true;
-            updateState();
-        }
+            get => allStreamsDimmed;
+            set
+            {
+                if (value == allStreamsDimmed)
+                    return;
 
-        public void DisableDim()
-        {
-            externalDimRequested = false;
-            updateState();
+                allStreamsDimmed = value;
+                updateState();
+            }
         }
     }
 }
diff --git a/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs b/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs
index d937bf775a..314f94101a 100644
--- a/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs
+++ b/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays.Changelog
         protected override bool OnHover(HoverEvent e)
         {
             foreach (var streamBadge in TabContainer.Children.OfType<UpdateStreamBadge>())
-                streamBadge.EnableDim();
+                streamBadge.AllStreamsDimmed = true;
 
             return base.OnHover(e);
         }
@@ -35,7 +35,7 @@ namespace osu.Game.Overlays.Changelog
         protected override void OnHoverLost(HoverLostEvent e)
         {
             foreach (var streamBadge in TabContainer.Children.OfType<UpdateStreamBadge>())
-                streamBadge.DisableDim();
+                streamBadge.AllStreamsDimmed = false;
 
             base.OnHoverLost(e);
         }

From 9f73b2960d39d6039054df3590fd32a5da0d781b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 2 Mar 2020 20:08:04 +0900
Subject: [PATCH 0821/1142] Prevent unnecessary auto-size computations in mania

---
 osu.Game.Rulesets.Mania/UI/ManiaStage.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Mania/UI/ManiaStage.cs b/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
index a28de7ea58..bfe9f1085b 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaStage.cs
@@ -115,9 +115,8 @@ namespace osu.Game.Rulesets.Mania.UI
                         {
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.Centre,
-                            AutoSizeAxes = Axes.Both,
+                            RelativeSizeAxes = Axes.Both,
                             Y = HIT_TARGET_POSITION + 150,
-                            BypassAutoSizeAxes = Axes.Both
                         },
                         topLevelContainer = new Container { RelativeSizeAxes = Axes.Both }
                     }

From 69b47137311e121be5c1fdd9c7d865f570b548c4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 2 Mar 2020 20:16:58 +0900
Subject: [PATCH 0822/1142] Refactor everything so I can read the code

---
 .../Graphics/UserInterface/ExpandingBar.cs    | 20 +++++-----
 .../Overlays/Changelog/UpdateStreamBadge.cs   | 40 +++++++++++--------
 .../Changelog/UpdateStreamBadgeArea.cs        |  4 +-
 3 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/ExpandingBar.cs b/osu.Game/Graphics/UserInterface/ExpandingBar.cs
index 439a6002d8..60cb35b4c4 100644
--- a/osu.Game/Graphics/UserInterface/ExpandingBar.cs
+++ b/osu.Game/Graphics/UserInterface/ExpandingBar.cs
@@ -13,17 +13,17 @@ namespace osu.Game.Graphics.UserInterface
     /// </summary>
     public class ExpandingBar : Circle
     {
-        private bool isCollapsed;
+        private bool expanded = true;
 
-        public bool IsCollapsed
+        public bool Expanded
         {
-            get => isCollapsed;
+            get => expanded;
             set
             {
-                if (value == isCollapsed)
+                if (value == expanded)
                     return;
 
-                isCollapsed = value;
+                expanded = value;
                 updateState();
             }
         }
@@ -83,19 +83,21 @@ namespace osu.Game.Graphics.UserInterface
             updateState();
         }
 
-        public void Collapse() => IsCollapsed = true;
+        public void Collapse() => Expanded = false;
 
-        public void Expand() => IsCollapsed = false;
+        public void Expand() => Expanded = true;
 
         private void updateState()
         {
-            float newSize = IsCollapsed ? CollapsedSize : ExpandedSize;
-            Easing easingType = IsCollapsed ? Easing.Out : Easing.OutElastic;
+            float newSize = expanded ? ExpandedSize : CollapsedSize;
+            Easing easingType = expanded ? Easing.OutElastic : Easing.Out;
 
             if (RelativeSizeAxes == Axes.X)
                 this.ResizeHeightTo(newSize, 400, easingType);
             else
                 this.ResizeWidthTo(newSize, 400, easingType);
+
+            this.FadeTo(expanded ? 1 : 0.5f, 100, Easing.OutQuint);
         }
     }
 }
diff --git a/osu.Game/Overlays/Changelog/UpdateStreamBadge.cs b/osu.Game/Overlays/Changelog/UpdateStreamBadge.cs
index 97c58614b8..6786bbc49f 100644
--- a/osu.Game/Overlays/Changelog/UpdateStreamBadge.cs
+++ b/osu.Game/Overlays/Changelog/UpdateStreamBadge.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Overlays.Changelog
                     Colour = stream.Colour,
                     ExpandedSize = 4,
                     CollapsedSize = 2,
-                    IsCollapsed = true
+                    Expanded = true
                 },
                 new HoverClickSounds()
             });
@@ -100,33 +100,39 @@ namespace osu.Game.Overlays.Changelog
 
         private void updateState()
         {
-            if (SelectedTab.Value == null && !allStreamsDimmed)
+            // highlighted regardless if we are hovered
+            bool textHighlighted = IsHovered;
+            bool barExpanded = IsHovered;
+
+            if (SelectedTab.Value == null)
             {
-                expandingBar.Expand();
-                expandingBar.FadeTo(1, transition_duration, Easing.OutQuint);
-                text.FadeTo(1, transition_duration, Easing.OutQuint);
-                return;
+                // at listing, all badges are highlighted when user is not hovering any badge.
+                textHighlighted |= !userHoveringArea;
+                barExpanded |= !userHoveringArea;
+            }
+            else
+            {
+                // bar is always expanded when active
+                barExpanded |= Active.Value;
+
+                // text is highlighted only when hovered or active (but not if in selection mode)
+                textHighlighted |= Active.Value && !userHoveringArea;
             }
 
-            var shouldExpand = Active.Value || IsHovered;
-
-            expandingBar.IsCollapsed = !shouldExpand;
-            expandingBar.FadeTo(shouldExpand ? 1 : 0.5f, transition_duration, Easing.OutQuint);
-
-            text.FadeTo(IsHovered || (Active.Value && !allStreamsDimmed) ? 1 : 0.5f, transition_duration, Easing.OutQuint);
+            expandingBar.Expanded = barExpanded;
+            text.FadeTo(textHighlighted ? 1 : 0.5f, transition_duration, Easing.OutQuint);
         }
 
-        private bool allStreamsDimmed;
+        private bool userHoveringArea;
 
-        public bool AllStreamsDimmed
+        public bool UserHoveringArea
         {
-            get => allStreamsDimmed;
             set
             {
-                if (value == allStreamsDimmed)
+                if (value == userHoveringArea)
                     return;
 
-                allStreamsDimmed = value;
+                userHoveringArea = value;
                 updateState();
             }
         }
diff --git a/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs b/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs
index 314f94101a..ffb622dd37 100644
--- a/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs
+++ b/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays.Changelog
         protected override bool OnHover(HoverEvent e)
         {
             foreach (var streamBadge in TabContainer.Children.OfType<UpdateStreamBadge>())
-                streamBadge.AllStreamsDimmed = true;
+                streamBadge.UserHoveringArea = true;
 
             return base.OnHover(e);
         }
@@ -35,7 +35,7 @@ namespace osu.Game.Overlays.Changelog
         protected override void OnHoverLost(HoverLostEvent e)
         {
             foreach (var streamBadge in TabContainer.Children.OfType<UpdateStreamBadge>())
-                streamBadge.AllStreamsDimmed = false;
+                streamBadge.UserHoveringArea = false;
 
             base.OnHoverLost(e);
         }

From 3d344a076de0a934a5adfb92f2d1d01a3e1da31d Mon Sep 17 00:00:00 2001
From: naoey <naoey@protonmail.ch>
Date: Tue, 3 Mar 2020 06:17:25 +0530
Subject: [PATCH 0823/1142] Add test for disabled keycounter, don't discard
 change event values

---
 .../Visual/Gameplay/TestSceneKeyCounter.cs    | 23 ++++++++++---------
 osu.Game/Screens/Play/Player.cs               | 19 ++++++++-------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
index e7b3e007fc..10827bc0b9 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
@@ -47,21 +47,22 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             Key testKey = ((KeyCounterKeyboard)kc.Children.First()).Key;
 
-            AddStep($"Press {testKey} key", () =>
+            void addPressKeyStep()
             {
-                InputManager.PressKey(testKey);
-                InputManager.ReleaseKey(testKey);
-            });
+                AddStep($"Press {testKey} key", () =>
+                {
+                    InputManager.PressKey(testKey);
+                    InputManager.ReleaseKey(testKey);
+                });
+            }
 
+            addPressKeyStep();
             AddAssert($"Check {testKey} counter after keypress", () => testCounter.CountPresses == 1);
-
-            AddStep($"Press {testKey} key", () =>
-            {
-                InputManager.PressKey(testKey);
-                InputManager.ReleaseKey(testKey);
-            });
-
+            addPressKeyStep();
             AddAssert($"Check {testKey} counter after keypress", () => testCounter.CountPresses == 2);
+            AddStep($"Disable counting", () => testCounter.IsCounting = false);
+            addPressKeyStep();
+            AddAssert($"Check {testKey} count has not changed", () => testCounter.CountPresses == 2);
 
             Add(kc);
         }
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 237e364e69..2d49c707ec 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -157,7 +157,10 @@ namespace osu.Game.Screens.Play
             addGameplayComponents(GameplayClockContainer, Beatmap.Value);
             addOverlayComponents(GameplayClockContainer, Beatmap.Value);
 
-            DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
+            DrawableRuleset.HasReplayLoaded.BindValueChanged(e =>
+            {
+                updatePauseOnFocusLostState(e.NewValue, BreakOverlay.IsBreakTime.Value);
+            }, true);
 
             // bind clock into components that require it
             DrawableRuleset.IsPaused.BindTo(GameplayClockContainer.IsPaused);
@@ -184,7 +187,7 @@ namespace osu.Game.Screens.Play
             foreach (var mod in Mods.Value.OfType<IApplicableToHealthProcessor>())
                 mod.ApplyToHealthProcessor(HealthProcessor);
 
-            BreakOverlay.IsBreakTime.BindValueChanged(_ => onBreakTimeChanged(), true);
+            BreakOverlay.IsBreakTime.BindValueChanged(onBreakTimeChanged, true);
         }
 
         private void addUnderlayComponents(Container target)
@@ -286,16 +289,16 @@ namespace osu.Game.Screens.Play
             HealthProcessor.IsBreakTime.BindTo(BreakOverlay.IsBreakTime);
         }
 
-        private void onBreakTimeChanged()
+        private void onBreakTimeChanged(ValueChangedEvent<bool> changeEvent)
         {
-            updatePauseOnFocusLostState();
-            HUDOverlay.KeyCounter.IsCounting = !BreakOverlay.IsBreakTime.Value;
+            updatePauseOnFocusLostState(DrawableRuleset.HasReplayLoaded.Value, changeEvent.NewValue);
+            HUDOverlay.KeyCounter.IsCounting = !changeEvent.NewValue;
         }
 
-        private void updatePauseOnFocusLostState() =>
+        private void updatePauseOnFocusLostState(bool replayLoaded, bool isBreakTime) =>
             HUDOverlay.HoldToQuit.PauseOnFocusLost = PauseOnFocusLost
-                                                     && !DrawableRuleset.HasReplayLoaded.Value
-                                                     && !BreakOverlay.IsBreakTime.Value;
+                                                     && !replayLoaded
+                                                     && !isBreakTime;
 
         private IBeatmap loadPlayableBeatmap()
         {

From 90c2f7bd89620bc05cd0529f3a74780199e2fa0a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 3 Mar 2020 12:13:36 +0900
Subject: [PATCH 0824/1142] Fail tests by default

---
 osu.Game/Tests/Visual/ModSandboxTestScene.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Tests/Visual/ModSandboxTestScene.cs b/osu.Game/Tests/Visual/ModSandboxTestScene.cs
index a1fa757452..8bfa373e46 100644
--- a/osu.Game/Tests/Visual/ModSandboxTestScene.cs
+++ b/osu.Game/Tests/Visual/ModSandboxTestScene.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.Visual
 
         public override void TearDownSteps()
         {
-            AddUntilStep("test passed", () => currentTest?.PassCondition?.Invoke() ?? true);
+            AddUntilStep("test passed", () => currentTest?.PassCondition?.Invoke() ?? false);
             base.TearDownSteps();
         }
 

From 1e26df64b6cc022123222e4e104fbb382670037d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 3 Mar 2020 12:58:07 +0900
Subject: [PATCH 0825/1142] Fix constructor test failures

---
 osu.Game/Tests/Visual/ModSandboxTestScene.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Tests/Visual/ModSandboxTestScene.cs b/osu.Game/Tests/Visual/ModSandboxTestScene.cs
index 8bfa373e46..11612d0eca 100644
--- a/osu.Game/Tests/Visual/ModSandboxTestScene.cs
+++ b/osu.Game/Tests/Visual/ModSandboxTestScene.cs
@@ -37,7 +37,14 @@ namespace osu.Game.Tests.Visual
 
         public override void TearDownSteps()
         {
-            AddUntilStep("test passed", () => currentTest?.PassCondition?.Invoke() ?? false);
+            AddUntilStep("test passed", () =>
+            {
+                if (currentTest == null)
+                    return true;
+
+                return currentTest.PassCondition?.Invoke() ?? false;
+            });
+
             base.TearDownSteps();
         }
 

From a1aecd4c3905bbd9cd9d9e1925d257ff40e6419a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 3 Mar 2020 12:59:41 +0900
Subject: [PATCH 0826/1142] Fix TrackVirtualManual not respecting rate
 adjustments

---
 osu.Game/Tests/Visual/OsuTestScene.cs | 57 ++++++---------------------
 1 file changed, 11 insertions(+), 46 deletions(-)

diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index b203557fab..3faecc87d2 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -229,17 +229,10 @@ namespace osu.Game.Tests.Visual
             /// </summary>
             public class TrackVirtualManual : Track
             {
+                private readonly StopwatchClock stopwatchClock = new StopwatchClock();
+
                 private readonly IFrameBasedClock referenceClock;
 
-                private readonly ManualClock clock = new ManualClock();
-
-                private bool running;
-
-                /// <summary>
-                /// Local offset added to the reference clock to resolve correct time.
-                /// </summary>
-                private double offset;
-
                 public TrackVirtualManual(IFrameBasedClock referenceClock)
                 {
                     this.referenceClock = referenceClock;
@@ -248,60 +241,32 @@ namespace osu.Game.Tests.Visual
 
                 public override bool Seek(double seek)
                 {
-                    offset = Math.Clamp(seek, 0, Length);
-                    lastReferenceTime = null;
+                    var offset = Math.Clamp(seek, 0, Length);
+
+                    stopwatchClock.Seek(offset);
 
                     return offset == seek;
                 }
 
-                public override void Start()
-                {
-                    running = true;
-                }
+                public override void Start() => stopwatchClock.Start();
 
                 public override void Reset()
                 {
-                    Seek(0);
+                    stopwatchClock.Seek(0);
                     base.Reset();
                 }
 
-                public override void Stop()
-                {
-                    if (running)
-                    {
-                        running = false;
-                        // on stopping, the current value should be transferred out of the clock, as we can no longer rely on
-                        // the referenceClock (which will still be counting time).
-                        offset = clock.CurrentTime;
-                        lastReferenceTime = null;
-                    }
-                }
+                public override void Stop() => stopwatchClock.Stop();
 
-                public override bool IsRunning => running;
+                public override bool IsRunning => stopwatchClock.IsRunning;
 
-                private double? lastReferenceTime;
-
-                public override double CurrentTime => clock.CurrentTime;
+                public override double CurrentTime => stopwatchClock.CurrentTime;
 
                 protected override void UpdateState()
                 {
                     base.UpdateState();
 
-                    if (running)
-                    {
-                        double refTime = referenceClock.CurrentTime;
-
-                        if (!lastReferenceTime.HasValue)
-                        {
-                            // if the clock just started running, the current value should be transferred to the offset
-                            // (to zero the progression of time).
-                            offset -= refTime;
-                        }
-
-                        lastReferenceTime = refTime;
-                    }
-
-                    clock.CurrentTime = Math.Min((lastReferenceTime ?? 0) + offset, Length);
+                    stopwatchClock.Rate = Rate * referenceClock.Rate;
 
                     if (CurrentTime >= Length)
                     {

From cc5b44e46681eb6b46c6c0fc1109cd5b64dd108b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 3 Mar 2020 13:36:55 +0900
Subject: [PATCH 0827/1142] Add test scene

---
 .../Mods/TestSceneOsuModDoubleTime.cs         | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDoubleTime.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDoubleTime.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDoubleTime.cs
new file mode 100644
index 0000000000..deb733c581
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDoubleTime.cs
@@ -0,0 +1,41 @@
+// 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.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Osu.Tests.Mods
+{
+    public class TestSceneOsuModDoubleTime : ModSandboxTestScene
+    {
+        public TestSceneOsuModDoubleTime()
+            : base(new OsuRuleset())
+        {
+        }
+
+        [TestCase(0.5)]
+        [TestCase(1.01)]
+        [TestCase(1.5)]
+        [TestCase(2)]
+        [TestCase(5)]
+        public void TestDefaultRate(double rate) => CreateModTest(new ModTestCaseData("1.5x", new OsuModDoubleTime { SpeedChange = { Value = rate } })
+        {
+            PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
+        });
+
+        protected override TestPlayer CreateReplayPlayer(Score score) => new ScoreAccessibleTestPlayer(score);
+
+        private class ScoreAccessibleTestPlayer : TestPlayer
+        {
+            public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
+
+            public ScoreAccessibleTestPlayer(Score score)
+                : base(score)
+            {
+            }
+        }
+    }
+}

From 2e4adc056f3e02d1e165945bc0b7f251cae50d65 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 3 Mar 2020 13:38:10 +0900
Subject: [PATCH 0828/1142] Fix potential deadlock during gameplay tests

---
 osu.Game/Screens/Play/GameplayClockContainer.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index 1c061c215b..591e969ad8 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -123,6 +123,10 @@ namespace osu.Game.Screens.Play
 
         public void Restart()
         {
+            // The Reset() call below causes speed adjustments to be reset in an async context, leading to deadlocks.
+            // The deadlock can be prevented by resetting the track synchronously before entering the async context.
+            track.ResetSpeedAdjustments();
+
             Task.Run(() =>
             {
                 track.Reset();

From d11d29c1f7303988baad64f2efcb4979af6425db Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 3 Mar 2020 15:30:53 +0900
Subject: [PATCH 0829/1142] Adjust namespaces

---
 .../{ => Mods}/TestSceneCatchModPerfect.cs                      | 2 +-
 .../{ => Mods}/TestSceneManiaModPerfect.cs                      | 2 +-
 .../{ => Mods}/TestSceneOsuModPerfect.cs                        | 2 +-
 .../{ => Mods}/TestSceneTaikoModPerfect.cs                      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename osu.Game.Rulesets.Catch.Tests/{ => Mods}/TestSceneCatchModPerfect.cs (97%)
 rename osu.Game.Rulesets.Mania.Tests/{ => Mods}/TestSceneManiaModPerfect.cs (95%)
 rename osu.Game.Rulesets.Osu.Tests/{ => Mods}/TestSceneOsuModPerfect.cs (97%)
 rename osu.Game.Rulesets.Taiko.Tests/{ => Mods}/TestSceneTaikoModPerfect.cs (97%)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModPerfect.cs b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs
similarity index 97%
rename from osu.Game.Rulesets.Catch.Tests/TestSceneCatchModPerfect.cs
rename to osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs
index f5bd3b1133..3e28bac02f 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModPerfect.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs
@@ -9,7 +9,7 @@ using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Tests.Visual;
 using osuTK;
 
-namespace osu.Game.Rulesets.Catch.Tests
+namespace osu.Game.Rulesets.Catch.Tests.Mods
 {
     public class TestSceneCatchModPerfect : ModPerfectTestScene
     {
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaModPerfect.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
similarity index 95%
rename from osu.Game.Rulesets.Mania.Tests/TestSceneManiaModPerfect.cs
rename to osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
index f49a19e218..4e11a302c9 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaModPerfect.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
@@ -6,7 +6,7 @@ using osu.Game.Rulesets.Mania.Mods;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Tests.Visual;
 
-namespace osu.Game.Rulesets.Mania.Tests
+namespace osu.Game.Rulesets.Mania.Tests.Mods
 {
     public class TestSceneManiaModPerfect : ModPerfectTestScene
     {
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuModPerfect.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs
similarity index 97%
rename from osu.Game.Rulesets.Osu.Tests/TestSceneOsuModPerfect.cs
rename to osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs
index 02fd5b5a79..fc2dfa16ec 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuModPerfect.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs
@@ -9,7 +9,7 @@ using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Tests.Visual;
 using osuTK;
 
-namespace osu.Game.Rulesets.Osu.Tests
+namespace osu.Game.Rulesets.Osu.Tests.Mods
 {
     public class TestSceneOsuModPerfect : ModPerfectTestScene
     {
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModPerfect.cs b/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModPerfect.cs
similarity index 97%
rename from osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModPerfect.cs
rename to osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModPerfect.cs
index b67810846e..fd9d01a3db 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModPerfect.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModPerfect.cs
@@ -8,7 +8,7 @@ using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Taiko.Scoring;
 using osu.Game.Tests.Visual;
 
-namespace osu.Game.Rulesets.Taiko.Tests
+namespace osu.Game.Rulesets.Taiko.Tests.Mods
 {
     public class TestSceneTaikoModPerfect : ModPerfectTestScene
     {

From a26ac31c64076d68335ba53018132eb860907101 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 3 Mar 2020 15:33:54 +0900
Subject: [PATCH 0830/1142] Fix test name

---
 osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs
index 3e28bac02f..56d2fe1ee0 100644
--- a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
 
         [TestCase(false)]
         [TestCase(true)]
-        public void TestTestJuiceStream(bool shouldMiss)
+        public void TestJuiceStream(bool shouldMiss)
         {
             var stream = new JuiceStream
             {

From cb1129218135bd2b1e2d3a287d381c13e08725d6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 3 Mar 2020 16:06:31 +0900
Subject: [PATCH 0831/1142] Reduce social overlay/direct overlay paddings

---
 osu.Game/Overlays/SearchableList/SearchableListOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs b/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs
index 0783c64c20..72796df6d5 100644
--- a/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs
+++ b/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Overlays.SearchableList
 {
     public abstract class SearchableListOverlay : FullscreenOverlay
     {
-        public const float WIDTH_PADDING = 80;
+        public const float WIDTH_PADDING = 10;
 
         protected SearchableListOverlay(OverlayColourScheme colourScheme)
             : base(colourScheme)

From f1f4f1ffbd29bfe1126159c217084e552058f3a8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Mar 2020 18:04:12 +0900
Subject: [PATCH 0832/1142] Add torus font

---
 .../Resources/Fonts/Aquatico-Light.bin        | Bin 4998 -> 0 bytes
 .../Resources/Fonts/Aquatico-Light_0.png      | Bin 68407 -> 0 bytes
 .../Resources/Fonts/Aquatico-Regular.bin      | Bin 4994 -> 0 bytes
 .../Resources/Fonts/Aquatico-Regular_0.png    | Bin 69000 -> 0 bytes
 .../Gameplay/Components/MatchHeader.cs        |   4 +-
 .../Gameplay/Components/MatchScoreDisplay.cs  |   4 +-
 .../Screens/TeamIntro/TeamIntroScreen.cs      |   4 +-
 .../Screens/TeamWin/TeamWinScreen.cs          |   8 +-
 osu.Game.Tournament/TournamentFont.cs         |  75 ------------------
 osu.Game.Tournament/TournamentGameBase.cs     |   3 -
 osu.Game/Graphics/OsuFont.cs                  |  17 ++--
 osu.Game/OsuGameBase.cs                       |   5 ++
 12 files changed, 22 insertions(+), 98 deletions(-)
 delete mode 100644 osu.Game.Tournament/Resources/Fonts/Aquatico-Light.bin
 delete mode 100644 osu.Game.Tournament/Resources/Fonts/Aquatico-Light_0.png
 delete mode 100644 osu.Game.Tournament/Resources/Fonts/Aquatico-Regular.bin
 delete mode 100644 osu.Game.Tournament/Resources/Fonts/Aquatico-Regular_0.png
 delete mode 100644 osu.Game.Tournament/TournamentFont.cs

diff --git a/osu.Game.Tournament/Resources/Fonts/Aquatico-Light.bin b/osu.Game.Tournament/Resources/Fonts/Aquatico-Light.bin
deleted file mode 100644
index 42cfdf08de4977e66acd9063ef31741f88715f0f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4998
zcmZ9O$&XZ36vof1YC$6UOoK#>Od^8_O?Lw-Gzv7>Ey|#X4HzR~kimgL8AMGq{sB0|
zg_`Kb7$YVoy3mDjr7K<N23(4XZX6aCA?fZ)bNznzD~syVJowf3?z`ul@0@oZ{hJ4>
z#f*s9A3y8r5Jg8vtUG>k&xynPj?Uh6_~4-vQ7Q9^$8;|`ioB$wI$eMNzivrh*R}WX
zk=@;0$BrC~j*Al_W^2WY7>YvwN9>C^5v8uERR>~H^hY(Ogmx}(llEmXznB^~WlcMm
zbETb+598j(x_)W5OZ!pR(%7bTH)!uD=jr$2%Es6j>+`c)rOlUipx72GV}rELxKG*w
zY3CJVVoa4bHLjPoP};*vZANU#&njklhqUjrwmGjuTO{orJ$p;sEbXS4E$vQebBaYp
zPb`r(GwzbMSlSQG7#nkpCDLxJ%qwn<30k)-RBPEKty-C1Op1xpwqy^MO5?wt*ePvt
z-mhD~zo|s5j{Bu`#yUOQBki|p#Po(QGo|%PJ0lNzvIm`Ux3p!_K9{z%;R{|Zm-cq$
zP5EN)*GQ8d9~F;i9bQezo~o8Orx?o`aaU@c_KfeU=cBvvEc@LftxxNgx2)6Jc%kjt
zRnms!)udRU7<cA+`=p(V9%;*^Eza6%X@3Wvc1g3R_e$F*PnW1m)wo?bMX7$q*Ufda
zvRA4lUeSJwVy)IqQ9V(vm3Cac+#2+<Gqy{Uhw)jJY3YxO);%Civ!%Gd%QyR?Jj(Ub
z>TTX{khY_Ef80#oFYTYoh3IWOi}wT4&dRHv7Hv@4CwdpwG-gtJm5Lp&SKk;HccZjp
zs^i+mvo~nngVHXjM+@{UIcv_!hoqI2U*(>2mdE8LX}x;3tD&ji<z{ISALn}UMf;aq
zq`a#-`WoxjO4EB2-Kuv`y{yP9?NvT3?N!ybtg%l0E+3J`%nastuv5-PxlO<K78jd!
zsAuJ)(t6_wb<(p--{gOM(c&}f9+UQ`d|B0)KW1`B+O*1B(yq?w4r#w>p7%7g16sFJ
z+6Bd3(a`W<m$bnaPl@rkwCkkZ(^!Z0q_m5gt68cQUv!R?yQOvOUG0l&M7!lrlzT*H
zbq=-8%U)@x;;&}C%*#G$FSpIhereN+@n_gm(&lP5TIWTz#ICk^IVf#^+q@i-7Hx44
z=XK-f<!Nb!ylS17XQT~Qei=6}&q~vYGj3j<V_n<49Fg`*@!q(3IV$ZBy<4sGa!lG+
zZS!(m+H1O6=jD0*{<f`0FG!2Fc{w4aucco4c2e3xo$amja!T5EoolW0a$4Ge-t*RZ
zc~RO2ZS!(Q+JfThyHAXlr2VA*TIc0cX;*Y@$=?c}CD&}2tWTiCeqAX+91$iC2Gc;3
zc;T(_nwxl$O}xG)UQiRSpoy2v#Q2#QFcV{CVwg;fi-{pIF$N}@Z=$^>8fc<LrhE|Q
z+Bm}MnK&#=90w*|028BYVn|Gkfr&%lQr?C3nt0)BS)-LEUU(C&H1Tp@PRsRYudbB%
zlV4+rHN2{|OmxEJxZHIvkn@9_Gu>n7dVbawao1Hst{k!(Wa(&-qd|@aIU3VIz4Zi9
zuW6`BthKhINyM?{taz3fqj?wNn)obS$r>;GmBhr6-&iJcHc^L(+Due#!VMESo2X+f
zF}JQ4vImfTf$SB;e)aqW`<d(kckK&A9m9DYbqptVMN65`QsO-z?now9n22j4u8FuN
z;+lwSBCd%p{G0cq3not!9dOQ&>wsJv<a!};sV9j1>WRJZzLtr8)Do+SR?ox=(@>Lm
z-kN*P6Ye?Wo<sODns>n$lY7ox_nh;Ab;Ai_-EhtYx|E5#Cc8mKM|F+lyLJuDPC|AU
zBF;$S_jX<NOz0+8#9dbexgy9FL9PfQm(jcn`I%f1cU=+ZoZW@&I7BY>1hLlSZlSq@
z5ViU4@g_NY?mByjtVR<5OyO?I#9b4aj%AHZ#}aGEY9td`nd}gE$;z6YM6<gPS@|wm
znTT;I??((1Zq%}d8?}VTb_22-klldn24puNy8+n^$ZkNy_0GhtC3@x<kYhlO0XYWb
z7?5K?jsZCa<QR}+;I?BxjsZCa<QR}+K#l=92ILqJF)k;F7?%@&`b!LPYNo9DON_<|
zWX)e<G=GU9e~BS~i6MW9A%BS>rpLSZON_R^srgHccA%;GON{0(G2|~X<S#MgFEQjV
zG4#AHN3(xu_7Aduko|+~A7uX^`v=)Sh`GF!9Xin@=A)LiQ%$0a)=oDG*DvQ2gj{@<
zkl#q+A9CzImT6s+h>@~J+?1$`T}Co-x1R75t)4a3nVd6ExDLp*L9Q3F2atV%>=pg-
zevqR<)LTyw^_r;HM7<_w#X2e)%}-FJ$!8dMeTFduxG|O>GBA;qiA+soZ=xa-Rhp=L
zEHO#!SI^{%&|D?t$|1V}v7et{KNI_zsAD+qM;*h7)o3XbT1reNaYr%{*F;<saZSWE
zv6G3oCgPgt!oPVxx?u7&(JfcWYC8$pU5Knk6GWyacLvSfg4{u(yXTO54!P%$dk$TF
m!n>e(XUNeYX8<`X$eHrSvTis*tQ*dmItE!eF63Mw=l369{|p2G

diff --git a/osu.Game.Tournament/Resources/Fonts/Aquatico-Light_0.png b/osu.Game.Tournament/Resources/Fonts/Aquatico-Light_0.png
deleted file mode 100644
index 332d9ca0564224402f3b28d295b9ec05d3736822..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 68407
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
Rd(f$N8tR(DYOlLK{x5_sc-8;_

diff --git a/osu.Game.Tournament/Resources/Fonts/Aquatico-Regular.bin b/osu.Game.Tournament/Resources/Fonts/Aquatico-Regular.bin
deleted file mode 100644
index 3047c2eb3ef7354d250cf4c88b919269a696a06c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4994
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

diff --git a/osu.Game.Tournament/Resources/Fonts/Aquatico-Regular_0.png b/osu.Game.Tournament/Resources/Fonts/Aquatico-Regular_0.png
deleted file mode 100644
index 1252d233d3eafc995b76dbf4a440d215bfcfd588..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 69000
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
RyI)9%&@|Afy5soxe*oAv&B6cx

diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
index 9e1888b44b..d8f2df2e93 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
@@ -175,7 +175,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                             X = (flip ? -1 : 1) * 90,
                             Y = -10,
                             Colour = colour,
-                            Font = TournamentFont.GetFont(typeface: TournamentTypeface.Aquatico, weight: FontWeight.Regular, size: 20),
+                            Font = OsuFont.Torus.With(weight: FontWeight.Regular, size: 20),
                             Origin = anchor,
                             Anchor = anchor,
                         },
@@ -211,7 +211,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                         Origin = Anchor.Centre,
                         Colour = Color4.White,
                         Text = match.NewValue.Round.Value?.Name.Value ?? "Unknown Round",
-                        Font = TournamentFont.GetFont(typeface: TournamentTypeface.Aquatico, weight: FontWeight.Regular, size: 18),
+                        Font = OsuFont.Torus.With(weight: FontWeight.Regular, size: 18),
                     },
                 };
             }
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs
index cc7903f2fa..fcf1469278 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs
@@ -123,8 +123,8 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             public bool Winning
             {
                 set => DisplayedCountSpriteText.Font = value
-                    ? TournamentFont.GetFont(typeface: TournamentTypeface.Aquatico, weight: FontWeight.Regular, size: 60)
-                    : TournamentFont.GetFont(typeface: TournamentTypeface.Aquatico, weight: FontWeight.Light, size: 40);
+                    ? OsuFont.Torus.With(weight: FontWeight.Regular, size: 60)
+                    : OsuFont.Torus.With(weight: FontWeight.Light, size: 40);
             }
         }
     }
diff --git a/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
index 47c923ff30..75d63cde13 100644
--- a/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
@@ -201,7 +201,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                             new OsuSpriteText
                             {
                                 Text = team?.FullName.Value.ToUpper() ?? "???",
-                                Font = TournamentFont.GetFont(TournamentTypeface.Aquatico, 40, FontWeight.Light),
+                                Font = OsuFont.Torus.With(size: 40, weight: FontWeight.Light),
                                 Colour = Color4.Black,
                                 Origin = Anchor.TopCentre,
                                 Anchor = Anchor.TopCentre,
@@ -209,7 +209,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                             new OsuSpriteText
                             {
                                 Text = teamName.ToUpper(),
-                                Font = TournamentFont.GetFont(TournamentTypeface.Aquatico, 20, FontWeight.Regular),
+                                Font = OsuFont.Torus.With(size: 20, weight: FontWeight.Regular),
                                 Colour = colour,
                                 Origin = Anchor.TopCentre,
                                 Anchor = Anchor.TopCentre,
diff --git a/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs b/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
index a0216c5db3..b72cacc66f 100644
--- a/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Tournament.Screens.TeamWin
                                 Origin = Anchor.TopCentre,
                                 Colour = col,
                                 Text = "WINNER",
-                                Font = TournamentFont.GetFont(TournamentTypeface.Aquatico, 15, FontWeight.Regular),
+                                Font = OsuFont.Torus.With(size: 15, weight: FontWeight.Regular),
                             },
                             new OsuSpriteText
                             {
@@ -134,7 +134,7 @@ namespace osu.Game.Tournament.Screens.TeamWin
                                 Origin = Anchor.TopCentre,
                                 Colour = col,
                                 Text = match.Round.Value?.Name.Value ?? "Unknown Round",
-                                Font = TournamentFont.GetFont(TournamentTypeface.Aquatico, 50, FontWeight.Light),
+                                Font = OsuFont.Torus.With(size: 50, weight: FontWeight.Light),
                                 Spacing = new Vector2(10, 0),
                             },
                             new OsuSpriteText
@@ -143,7 +143,7 @@ namespace osu.Game.Tournament.Screens.TeamWin
                                 Origin = Anchor.TopCentre,
                                 Colour = col,
                                 Text = match.Date.Value.ToUniversalTime().ToString("dd MMMM HH:mm UTC"),
-                                Font = TournamentFont.GetFont(TournamentTypeface.Aquatico, 20, FontWeight.Light),
+                                Font = OsuFont.Torus.With(size: 20, weight: FontWeight.Light),
                             },
                         }
                     }
@@ -203,7 +203,7 @@ namespace osu.Game.Tournament.Screens.TeamWin
                             new OsuSpriteText
                             {
                                 Text = team?.FullName.Value.ToUpper() ?? "???",
-                                Font = TournamentFont.GetFont(TournamentTypeface.Aquatico, 40, FontWeight.Light),
+                                Font = OsuFont.Torus.With(size: 40, weight: FontWeight.Light),
                                 Colour = Color4.Black,
                                 Origin = Anchor.TopCentre,
                                 Anchor = Anchor.TopCentre,
diff --git a/osu.Game.Tournament/TournamentFont.cs b/osu.Game.Tournament/TournamentFont.cs
deleted file mode 100644
index 32f0264562..0000000000
--- a/osu.Game.Tournament/TournamentFont.cs
+++ /dev/null
@@ -1,75 +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.Graphics.Sprites;
-using osu.Game.Graphics;
-
-namespace osu.Game.Tournament
-{
-    public static class TournamentFont
-    {
-        /// <summary>
-        /// The default font size.
-        /// </summary>
-        public const float DEFAULT_FONT_SIZE = 16;
-
-        /// <summary>
-        /// Retrieves a <see cref="FontUsage"/>.
-        /// </summary>
-        /// <param name="typeface">The font typeface.</param>
-        /// <param name="size">The size of the text in local space. For a value of 16, a single line will have a height of 16px.</param>
-        /// <param name="weight">The font weight.</param>
-        /// <param name="italics">Whether the font is italic.</param>
-        /// <param name="fixedWidth">Whether all characters should be spaced the same distance apart.</param>
-        /// <returns>The <see cref="FontUsage"/>.</returns>
-        public static FontUsage GetFont(TournamentTypeface typeface = TournamentTypeface.Aquatico, float size = DEFAULT_FONT_SIZE, FontWeight weight = FontWeight.Medium, bool italics = false, bool fixedWidth = false)
-            => new FontUsage(GetFamilyString(typeface), size, GetWeightString(typeface, weight), italics, fixedWidth);
-
-        /// <summary>
-        /// Retrieves the string representation of a <see cref="TournamentTypeface"/>.
-        /// </summary>
-        /// <param name="typeface">The <see cref="TournamentTypeface"/>.</param>
-        /// <returns>The string representation.</returns>
-        public static string GetFamilyString(TournamentTypeface typeface)
-        {
-            switch (typeface)
-            {
-                case TournamentTypeface.Aquatico:
-                    return "Aquatico";
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Retrieves the string representation of a <see cref="FontWeight"/>.
-        /// </summary>
-        /// <param name="typeface">The <see cref="TournamentTypeface"/>.</param>
-        /// <param name="weight">The <see cref="FontWeight"/>.</param>
-        /// <returns>The string representation of <paramref name="weight"/> in the specified <paramref name="typeface"/>.</returns>
-        public static string GetWeightString(TournamentTypeface typeface, FontWeight weight)
-            => GetWeightString(GetFamilyString(typeface), weight);
-
-        /// <summary>
-        /// Retrieves the string representation of a <see cref="FontWeight"/>.
-        /// </summary>
-        /// <param name="family">The family string.</param>
-        /// <param name="weight">The <see cref="FontWeight"/>.</param>
-        /// <returns>The string representation of <paramref name="weight"/> in the specified <paramref name="family"/>.</returns>
-        public static string GetWeightString(string family, FontWeight weight)
-        {
-            string weightString = weight.ToString();
-
-            // Only exo has an explicit "regular" weight, other fonts do not
-            if (weight == FontWeight.Regular && family != GetFamilyString(TournamentTypeface.Aquatico))
-                weightString = string.Empty;
-
-            return weightString;
-        }
-    }
-
-    public enum TournamentTypeface
-    {
-        Aquatico
-    }
-}
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 1c94856a4e..9916b0e042 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -54,9 +54,6 @@ namespace osu.Game.Tournament
         {
             Resources.AddStore(new DllResourceStore(typeof(TournamentGameBase).Assembly));
 
-            AddFont(Resources, @"Resources/Fonts/Aquatico-Regular");
-            AddFont(Resources, @"Resources/Fonts/Aquatico-Light");
-
             Textures.AddStore(new TextureLoaderStore(new ResourceStore<byte[]>(new StorageBackedResourceStore(storage))));
 
             this.storage = storage;
diff --git a/osu.Game/Graphics/OsuFont.cs b/osu.Game/Graphics/OsuFont.cs
index 22250d4a56..54a25875bf 100644
--- a/osu.Game/Graphics/OsuFont.cs
+++ b/osu.Game/Graphics/OsuFont.cs
@@ -19,6 +19,8 @@ namespace osu.Game.Graphics
 
         public static FontUsage Numeric => GetFont(Typeface.Venera, weight: FontWeight.Regular);
 
+        public static FontUsage Torus => GetFont(Typeface.Torus, weight: FontWeight.Regular);
+
         /// <summary>
         /// Retrieves a <see cref="FontUsage"/>.
         /// </summary>
@@ -45,6 +47,9 @@ namespace osu.Game.Graphics
 
                 case Typeface.Venera:
                     return "Venera";
+
+                case Typeface.Torus:
+                    return "Torus";
             }
 
             return null;
@@ -65,16 +70,7 @@ namespace osu.Game.Graphics
         /// <param name="family">The family string.</param>
         /// <param name="weight">The <see cref="FontWeight"/>.</param>
         /// <returns>The string representation of <paramref name="weight"/> in the specified <paramref name="family"/>.</returns>
-        public static string GetWeightString(string family, FontWeight weight)
-        {
-            string weightString = weight.ToString();
-
-            // Only exo has an explicit "regular" weight, other fonts do not
-            if (family != GetFamilyString(Typeface.Exo) && weight == FontWeight.Regular)
-                weightString = string.Empty;
-
-            return weightString;
-        }
+        public static string GetWeightString(string family, FontWeight weight) => weight.ToString();
     }
 
     public static class OsuFontExtensions
@@ -102,6 +98,7 @@ namespace osu.Game.Graphics
     {
         Exo,
         Venera,
+        Torus
     }
 
     public enum FontWeight
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 07c9d37a86..676b4b6c7a 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -157,6 +157,11 @@ namespace osu.Game
             AddFont(Resources, @"Fonts/Exo2.0-Black");
             AddFont(Resources, @"Fonts/Exo2.0-BlackItalic");
 
+            AddFont(Resources, @"Fonts/Torus-SemiBold");
+            AddFont(Resources, @"Fonts/Torus-Bold");
+            AddFont(Resources, @"Fonts/Torus-Regular");
+            AddFont(Resources, @"Fonts/Torus-Light");
+
             AddFont(Resources, @"Fonts/Venera");
             AddFont(Resources, @"Fonts/Venera-Light");
             AddFont(Resources, @"Fonts/Venera-Medium");

From 08756186e983d533d739979cdcfaeca61c5a89f7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Mar 2020 18:35:28 +0900
Subject: [PATCH 0833/1142] Update resources

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 983c622f77..d62011bf1d 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -51,7 +51,7 @@
     <Reference Include="Java.Interop" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.221.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.303.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2020.302.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 3b00b807a2..e407fca8b7 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -22,7 +22,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.221.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.303.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2020.302.0" />
     <PackageReference Include="Sentry" Version="2.1.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 3552047cf8..cc0b8074bb 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.221.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.303.0" />
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.302.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->

From a2273234cb9009745fc7c6b2eb080d720a584717 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Mar 2020 18:09:25 +0900
Subject: [PATCH 0834/1142] Better handle startup when ladder cannot be read
 correctly

---
 osu.Game.Tournament/TournamentGameBase.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 9916b0e042..69f2bf57be 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -121,10 +121,9 @@ namespace osu.Game.Tournament
                 using (var sr = new StreamReader(stream))
                     ladder = JsonConvert.DeserializeObject<LadderInfo>(sr.ReadToEnd());
             }
-            else
-            {
+
+            if (ladder == null)
                 ladder = new LadderInfo();
-            }
 
             if (ladder.Ruleset.Value == null)
                 ladder.Ruleset.Value = RulesetStore.AvailableRulesets.First();

From 372060bc2b37dd5547defdfe1455e38f85e90310 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Mar 2020 18:11:21 +0900
Subject: [PATCH 0835/1142] Only trigger changes if new user information is
 actually populated

---
 osu.Game.Tournament/TournamentGameBase.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 69f2bf57be..dd93215fc1 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -201,9 +201,11 @@ namespace osu.Game.Tournament
             {
                 foreach (var p in t.Players)
                 {
-                    if (p.Username == null || p.Statistics == null)
+                    if (string.IsNullOrEmpty(p.Username) || p.Statistics == null)
+                    {
                         PopulateUser(p);
-                    addedInfo = true;
+                        addedInfo = true;
+                    }
                 }
             }
 

From 093f2affdffcc95fb91dec285954e823bbc229d0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Mar 2020 18:12:42 +0900
Subject: [PATCH 0836/1142] Add seeding screen

---
 .../Screens/TestSceneSeedingScreen.cs         | 125 +++++++
 osu.Game.Tournament/Models/SeedingBeatmap.cs  |  23 ++
 osu.Game.Tournament/Models/SeedingResult.cs   |  21 ++
 osu.Game.Tournament/Models/TournamentTeam.cs  |  27 ++
 .../Screens/Editors/SeedingEditor.cs          | 288 ++++++++++++++++
 .../Screens/Editors/TeamEditorScreen.cs       |  27 +-
 .../Ladder/Components/LadderEditorSettings.cs |  43 ---
 .../Components/LadderSettingsDropdown.cs      |  26 ++
 .../Ladder/Components/SettingsTeamDropdown.cs |  55 +++
 .../Screens/TeamIntro/SeedingScreen.cs        | 316 ++++++++++++++++++
 osu.Game.Tournament/TournamentGameBase.cs     |  18 +
 osu.Game.Tournament/TournamentSceneManager.cs |  14 +
 osu.Game.Tournament/TournamentSpriteText.cs   |  16 +
 13 files changed, 955 insertions(+), 44 deletions(-)
 create mode 100644 osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs
 create mode 100644 osu.Game.Tournament/Models/SeedingBeatmap.cs
 create mode 100644 osu.Game.Tournament/Models/SeedingResult.cs
 create mode 100644 osu.Game.Tournament/Screens/Editors/SeedingEditor.cs
 create mode 100644 osu.Game.Tournament/Screens/Ladder/Components/LadderSettingsDropdown.cs
 create mode 100644 osu.Game.Tournament/Screens/Ladder/Components/SettingsTeamDropdown.cs
 create mode 100644 osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
 create mode 100644 osu.Game.Tournament/TournamentSpriteText.cs

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs
new file mode 100644
index 0000000000..eb46d75705
--- /dev/null
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs
@@ -0,0 +1,125 @@
+// 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.Beatmaps;
+using osu.Game.Tournament.Models;
+using osu.Game.Tournament.Screens.TeamIntro;
+using osu.Game.Users;
+
+namespace osu.Game.Tournament.Tests.Screens
+{
+    public class TestSceneSeedingScreen : LadderTestScene
+    {
+        [Cached]
+        private readonly LadderInfo ladder = new LadderInfo();
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            ladder.CurrentMatch.Value = new TournamentMatch
+            {
+                Team1 =
+                {
+                    Value = new TournamentTeam
+                    {
+                        FlagName = { Value = "JP" },
+                        FullName = { Value = "Japan" },
+                        LastYearPlacing = { Value = 10 },
+                        Seed = { Value = "Low" },
+                        SeedingResults =
+                        {
+                            new SeedingResult
+                            {
+                                Mod = { Value = "NM" },
+                                Seed = { Value = 10 },
+                                Beatmaps =
+                                {
+                                    new SeedingBeatmap
+                                    {
+                                        BeatmapInfo = new BeatmapInfo { Metadata = new BeatmapMetadata { Title = "Test Title", Artist = "Test Artist" } },
+                                        Score = 12345672,
+                                        Seed = { Value = 24 },
+                                    },
+                                    new SeedingBeatmap
+                                    {
+                                        BeatmapInfo = new BeatmapInfo { Metadata = new BeatmapMetadata { Title = "Test Title", Artist = "Test Artist" } },
+                                        Score = 1234567,
+                                        Seed = { Value = 12 },
+                                    },
+                                    new SeedingBeatmap
+                                    {
+                                        BeatmapInfo = new BeatmapInfo { Metadata = new BeatmapMetadata { Title = "Test Title", Artist = "Test Artist" } },
+                                        Score = 1234567,
+                                        Seed = { Value = 16 },
+                                    }
+                                }
+                            },
+                            new SeedingResult
+                            {
+                                Mod = { Value = "DT" },
+                                Seed = { Value = 5 },
+                                Beatmaps =
+                                {
+                                    new SeedingBeatmap
+                                    {
+                                        BeatmapInfo = new BeatmapInfo { Metadata = new BeatmapMetadata { Title = "Test Title", Artist = "Test Artist" } },
+                                        Score = 234567,
+                                        Seed = { Value = 3 },
+                                    },
+                                    new SeedingBeatmap
+                                    {
+                                        BeatmapInfo = new BeatmapInfo { Metadata = new BeatmapMetadata { Title = "Test Title", Artist = "Test Artist" } },
+                                        Score = 234567,
+                                        Seed = { Value = 6 },
+                                    },
+                                    new SeedingBeatmap
+                                    {
+                                        BeatmapInfo = new BeatmapInfo { Metadata = new BeatmapMetadata { Title = "Test Title", Artist = "Test Artist" } },
+                                        Score = 234567,
+                                        Seed = { Value = 12 },
+                                    }
+                                }
+                            }
+                        },
+                        Players =
+                        {
+                            new User { Username = "Hello", Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 12 } } },
+                            new User { Username = "Hello", Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 16 } } },
+                            new User { Username = "Hello", Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 20 } } },
+                            new User { Username = "Hello", Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 24 } } },
+                            new User { Username = "Hello", Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 30 } } },
+                        }
+                    }
+                },
+                Team2 =
+                {
+                    Value = new TournamentTeam
+                    {
+                        FlagName = { Value = "US" },
+                        FullName = { Value = "United States" },
+                        Players =
+                        {
+                            new User { Username = "Hello" },
+                            new User { Username = "Hello" },
+                            new User { Username = "Hello" },
+                            new User { Username = "Hello" },
+                            new User { Username = "Hello" },
+                        }
+                    }
+                },
+                Round =
+                {
+                    Value = new TournamentRound { Name = { Value = "Quarterfinals" } }
+                }
+            };
+
+            Add(new SeedingScreen
+            {
+                FillMode = FillMode.Fit,
+                FillAspectRatio = 16 / 9f
+            });
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Models/SeedingBeatmap.cs b/osu.Game.Tournament/Models/SeedingBeatmap.cs
new file mode 100644
index 0000000000..2cd6fa7188
--- /dev/null
+++ b/osu.Game.Tournament/Models/SeedingBeatmap.cs
@@ -0,0 +1,23 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Bindables;
+using osu.Game.Beatmaps;
+
+namespace osu.Game.Tournament.Models
+{
+    public class SeedingBeatmap
+    {
+        public int ID;
+
+        public BeatmapInfo BeatmapInfo;
+
+        public long Score;
+
+        public Bindable<int> Seed = new BindableInt
+        {
+            MinValue = 1,
+            MaxValue = 64
+        };
+    }
+}
diff --git a/osu.Game.Tournament/Models/SeedingResult.cs b/osu.Game.Tournament/Models/SeedingResult.cs
new file mode 100644
index 0000000000..87aaf8bf36
--- /dev/null
+++ b/osu.Game.Tournament/Models/SeedingResult.cs
@@ -0,0 +1,21 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using osu.Framework.Bindables;
+
+namespace osu.Game.Tournament.Models
+{
+    public class SeedingResult
+    {
+        public List<SeedingBeatmap> Beatmaps = new List<SeedingBeatmap>();
+
+        public Bindable<string> Mod = new Bindable<string>();
+
+        public Bindable<int> Seed = new BindableInt
+        {
+            MinValue = 1,
+            MaxValue = 64
+        };
+    }
+}
diff --git a/osu.Game.Tournament/Models/TournamentTeam.cs b/osu.Game.Tournament/Models/TournamentTeam.cs
index 54b8a35180..7fca75cea4 100644
--- a/osu.Game.Tournament/Models/TournamentTeam.cs
+++ b/osu.Game.Tournament/Models/TournamentTeam.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
 using osu.Game.Users;
@@ -29,6 +30,32 @@ namespace osu.Game.Tournament.Models
         /// </summary>
         public Bindable<string> Acronym = new Bindable<string>(string.Empty);
 
+        public BindableList<SeedingResult> SeedingResults = new BindableList<SeedingResult>();
+
+        public double AverageRank
+        {
+            get
+            {
+                var ranks = Players.Select(p => p.Statistics?.Ranks.Global)
+                                   .Where(i => i.HasValue)
+                                   .Select(i => i.Value)
+                                   .ToArray();
+
+                if (ranks.Length == 0)
+                    return 0;
+
+                return ranks.Average();
+            }
+        }
+
+        public Bindable<string> Seed = new Bindable<string>(string.Empty);
+
+        public Bindable<int> LastYearPlacing = new BindableInt
+        {
+            MinValue = 1,
+            MaxValue = 64
+        };
+
         [JsonProperty]
         public BindableList<User> Players { get; set; } = new BindableList<User>();
 
diff --git a/osu.Game.Tournament/Screens/Editors/SeedingEditor.cs b/osu.Game.Tournament/Screens/Editors/SeedingEditor.cs
new file mode 100644
index 0000000000..68003a1c43
--- /dev/null
+++ b/osu.Game.Tournament/Screens/Editors/SeedingEditor.cs
@@ -0,0 +1,288 @@
+// 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.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Overlays.Settings;
+using osu.Game.Rulesets;
+using osu.Game.Tournament.Components;
+using osu.Game.Tournament.Models;
+using osuTK;
+
+namespace osu.Game.Tournament.Screens.Editors
+{
+    public class SeedingEditorScreen : TournamentEditorScreen<SeedingEditorScreen.SeeingResultRow, SeedingResult>
+    {
+        private readonly TournamentTeam team;
+
+        protected override BindableList<SeedingResult> Storage => team.SeedingResults;
+
+        public SeedingEditorScreen(TournamentTeam team)
+        {
+            this.team = team;
+        }
+
+        public class SeeingResultRow : CompositeDrawable, IModelBacked<SeedingResult>
+        {
+            public SeedingResult Model { get; }
+
+            [Resolved]
+            private LadderInfo ladderInfo { get; set; }
+
+            public SeeingResultRow(TournamentTeam team, SeedingResult round)
+            {
+                Model = round;
+
+                Masking = true;
+                CornerRadius = 10;
+
+                SeedingBeatmapEditor beatmapEditor = new SeedingBeatmapEditor(round)
+                {
+                    Width = 0.95f
+                };
+
+                InternalChildren = new Drawable[]
+                {
+                    new Box
+                    {
+                        Colour = OsuColour.Gray(0.1f),
+                        RelativeSizeAxes = Axes.Both,
+                    },
+                    new FillFlowContainer
+                    {
+                        Margin = new MarginPadding(5),
+                        Padding = new MarginPadding { Right = 160 },
+                        Spacing = new Vector2(5),
+                        Direction = FillDirection.Full,
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Children = new Drawable[]
+                        {
+                            new SettingsTextBox
+                            {
+                                LabelText = "Mod",
+                                Width = 0.33f,
+                                Bindable = Model.Mod
+                            },
+                            new SettingsSlider<int>
+                            {
+                                LabelText = "Seed",
+                                Width = 0.33f,
+                                Bindable = Model.Seed
+                            },
+                            new SettingsButton
+                            {
+                                Width = 0.2f,
+                                Margin = new MarginPadding(10),
+                                Text = "Add beatmap",
+                                Action = () => beatmapEditor.CreateNew()
+                            },
+                            beatmapEditor
+                        }
+                    },
+                    new DangerousSettingsButton
+                    {
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
+                        RelativeSizeAxes = Axes.None,
+                        Width = 150,
+                        Text = "Delete SeeingResult",
+                        Action = () =>
+                        {
+                            Expire();
+                            team.SeedingResults.Remove(Model);
+                        },
+                    }
+                };
+
+                RelativeSizeAxes = Axes.X;
+                AutoSizeAxes = Axes.Y;
+            }
+
+            public class SeedingBeatmapEditor : CompositeDrawable
+            {
+                private readonly SeedingResult round;
+                private readonly FillFlowContainer flow;
+
+                public SeedingBeatmapEditor(SeedingResult round)
+                {
+                    this.round = round;
+
+                    RelativeSizeAxes = Axes.X;
+                    AutoSizeAxes = Axes.Y;
+
+                    InternalChild = flow = new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
+                        LayoutDuration = 200,
+                        LayoutEasing = Easing.OutQuint,
+                        ChildrenEnumerable = round.Beatmaps.Select(p => new SeedingBeatmapRow(round, p))
+                    };
+                }
+
+                public void CreateNew()
+                {
+                    var user = new SeedingBeatmap();
+                    round.Beatmaps.Add(user);
+                    flow.Add(new SeedingBeatmapRow(round, user));
+                }
+
+                public class SeedingBeatmapRow : CompositeDrawable
+                {
+                    private readonly SeedingResult result;
+                    public SeedingBeatmap Model { get; }
+
+                    [Resolved]
+                    protected IAPIProvider API { get; private set; }
+
+                    private readonly Bindable<string> beatmapId = new Bindable<string>();
+
+                    private readonly Bindable<string> score = new Bindable<string>();
+
+                    private readonly Container drawableContainer;
+
+                    public SeedingBeatmapRow(SeedingResult result, SeedingBeatmap beatmap)
+                    {
+                        this.result = result;
+                        Model = beatmap;
+
+                        Margin = new MarginPadding(10);
+
+                        RelativeSizeAxes = Axes.X;
+                        AutoSizeAxes = Axes.Y;
+
+                        Masking = true;
+                        CornerRadius = 5;
+
+                        InternalChildren = new Drawable[]
+                        {
+                            new Box
+                            {
+                                Colour = OsuColour.Gray(0.2f),
+                                RelativeSizeAxes = Axes.Both,
+                            },
+                            new FillFlowContainer
+                            {
+                                Margin = new MarginPadding(5),
+                                Padding = new MarginPadding { Right = 160 },
+                                Spacing = new Vector2(5),
+                                Direction = FillDirection.Horizontal,
+                                AutoSizeAxes = Axes.Both,
+                                Children = new Drawable[]
+                                {
+                                    new SettingsNumberBox
+                                    {
+                                        LabelText = "Beatmap ID",
+                                        RelativeSizeAxes = Axes.None,
+                                        Width = 200,
+                                        Bindable = beatmapId,
+                                    },
+                                    new SettingsSlider<int>
+                                    {
+                                        LabelText = "Seed",
+                                        RelativeSizeAxes = Axes.None,
+                                        Width = 200,
+                                        Bindable = beatmap.Seed
+                                    },
+                                    new SettingsTextBox
+                                    {
+                                        LabelText = "Score",
+                                        RelativeSizeAxes = Axes.None,
+                                        Width = 200,
+                                        Bindable = score,
+                                    },
+                                    drawableContainer = new Container
+                                    {
+                                        Size = new Vector2(100, 70),
+                                    },
+                                }
+                            },
+                            new DangerousSettingsButton
+                            {
+                                Anchor = Anchor.CentreRight,
+                                Origin = Anchor.CentreRight,
+                                RelativeSizeAxes = Axes.None,
+                                Width = 150,
+                                Text = "Delete Beatmap",
+                                Action = () =>
+                                {
+                                    Expire();
+                                    result.Beatmaps.Remove(beatmap);
+                                },
+                            }
+                        };
+                    }
+
+                    [BackgroundDependencyLoader]
+                    private void load(RulesetStore rulesets)
+                    {
+                        beatmapId.Value = Model.ID.ToString();
+                        beatmapId.BindValueChanged(idString =>
+                        {
+                            int parsed;
+
+                            int.TryParse(idString.NewValue, out parsed);
+
+                            Model.ID = parsed;
+
+                            if (idString.NewValue != idString.OldValue)
+                                Model.BeatmapInfo = null;
+
+                            if (Model.BeatmapInfo != null)
+                            {
+                                updatePanel();
+                                return;
+                            }
+
+                            var req = new GetBeatmapRequest(new BeatmapInfo { OnlineBeatmapID = Model.ID });
+
+                            req.Success += res =>
+                            {
+                                Model.BeatmapInfo = res.ToBeatmap(rulesets);
+                                updatePanel();
+                            };
+
+                            req.Failure += _ =>
+                            {
+                                Model.BeatmapInfo = null;
+                                updatePanel();
+                            };
+
+                            API.Queue(req);
+                        }, true);
+
+                        score.Value = Model.Score.ToString();
+                        score.BindValueChanged(str => long.TryParse(str.NewValue, out Model.Score));
+                    }
+
+                    private void updatePanel()
+                    {
+                        drawableContainer.Clear();
+
+                        if (Model.BeatmapInfo != null)
+                        {
+                            drawableContainer.Child = new TournamentBeatmapPanel(Model.BeatmapInfo, result.Mod.Value)
+                            {
+                                Anchor = Anchor.CentreLeft,
+                                Origin = Anchor.CentreLeft,
+                                Width = 300
+                            };
+                        }
+                    }
+                }
+            }
+        }
+
+        protected override SeeingResultRow CreateDrawable(SeedingResult model) => new SeeingResultRow(team, model);
+    }
+}
diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index 494dd73edd..d6fa1a29a8 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -57,6 +57,9 @@ namespace osu.Game.Tournament.Screens.Editors
 
             private readonly Container drawableContainer;
 
+            [Resolved(canBeNull: true)]
+            private TournamentSceneManager sceneManager { get; set; }
+
             [Resolved]
             private LadderInfo ladderInfo { get; set; }
 
@@ -113,6 +116,18 @@ namespace osu.Game.Tournament.Screens.Editors
                                 Width = 0.2f,
                                 Bindable = Model.FlagName
                             },
+                            new SettingsTextBox
+                            {
+                                LabelText = "Seed",
+                                Width = 0.2f,
+                                Bindable = Model.Seed
+                            },
+                            new SettingsSlider<int>
+                            {
+                                LabelText = "Last Year Placement",
+                                Width = 0.33f,
+                                Bindable = Model.LastYearPlacing
+                            },
                             new SettingsButton
                             {
                                 Width = 0.11f,
@@ -131,7 +146,17 @@ namespace osu.Game.Tournament.Screens.Editors
                                     ladderInfo.Teams.Remove(Model);
                                 },
                             },
-                            playerEditor
+                            playerEditor,
+                            new SettingsButton
+                            {
+                                Width = 0.2f,
+                                Margin = new MarginPadding(10),
+                                Text = "Edit seeding results",
+                                Action = () =>
+                                {
+                                    sceneManager.SetScreen(new SeedingEditorScreen(team));
+                                }
+                            },
                         }
                     },
                 };
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
index 8ab083ddaf..672b7ecc02 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
@@ -127,49 +127,6 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             }
         }
 
-        private class SettingsTeamDropdown : LadderSettingsDropdown<TournamentTeam>
-        {
-            public SettingsTeamDropdown(BindableList<TournamentTeam> teams)
-            {
-                foreach (var t in teams.Prepend(new TournamentTeam()))
-                    add(t);
-
-                teams.CollectionChanged += (_, args) =>
-                {
-                    switch (args.Action)
-                    {
-                        case NotifyCollectionChangedAction.Add:
-                            args.NewItems.Cast<TournamentTeam>().ForEach(add);
-                            break;
-
-                        case NotifyCollectionChangedAction.Remove:
-                            args.OldItems.Cast<TournamentTeam>().ForEach(i => Control.RemoveDropdownItem(i));
-                            break;
-                    }
-                };
-            }
-
-            private readonly List<IUnbindable> refBindables = new List<IUnbindable>();
-
-            private T boundReference<T>(T obj)
-                where T : IBindable
-            {
-                obj = (T)obj.GetBoundCopy();
-                refBindables.Add(obj);
-                return obj;
-            }
-
-            private void add(TournamentTeam team)
-            {
-                Control.AddDropdownItem(team);
-                boundReference(team.FullName).BindValueChanged(_ =>
-                {
-                    Control.RemoveDropdownItem(team);
-                    Control.AddDropdownItem(team);
-                });
-            }
-        }
-
         private class LadderSettingsDropdown<T> : SettingsDropdown<T>
         {
             protected override OsuDropdown<T> CreateDropdown() => new DropdownControl();
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/LadderSettingsDropdown.cs b/osu.Game.Tournament/Screens/Ladder/Components/LadderSettingsDropdown.cs
new file mode 100644
index 0000000000..347e4d91e0
--- /dev/null
+++ b/osu.Game.Tournament/Screens/Ladder/Components/LadderSettingsDropdown.cs
@@ -0,0 +1,26 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays.Settings;
+
+namespace osu.Game.Tournament.Screens.Ladder.Components
+{
+    public class LadderSettingsDropdown<T> : SettingsDropdown<T>
+    {
+        protected override OsuDropdown<T> CreateDropdown() => new DropdownControl();
+
+        private new class DropdownControl : SettingsDropdown<T>.DropdownControl
+        {
+            protected override DropdownMenu CreateMenu() => new Menu();
+
+            private new class Menu : OsuDropdownMenu
+            {
+                public Menu()
+                {
+                    MaxHeight = 200;
+                }
+            }
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/SettingsTeamDropdown.cs b/osu.Game.Tournament/Screens/Ladder/Components/SettingsTeamDropdown.cs
new file mode 100644
index 0000000000..a630e51e44
--- /dev/null
+++ b/osu.Game.Tournament/Screens/Ladder/Components/SettingsTeamDropdown.cs
@@ -0,0 +1,55 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Game.Tournament.Models;
+
+namespace osu.Game.Tournament.Screens.Ladder.Components
+{
+    public class SettingsTeamDropdown : LadderSettingsDropdown<TournamentTeam>
+    {
+        public SettingsTeamDropdown(BindableList<TournamentTeam> teams)
+        {
+            foreach (var t in teams.Prepend(new TournamentTeam()))
+                add(t);
+
+            teams.CollectionChanged += (_, args) =>
+            {
+                switch (args.Action)
+                {
+                    case NotifyCollectionChangedAction.Add:
+                        args.NewItems.Cast<TournamentTeam>().ForEach(add);
+                        break;
+
+                    case NotifyCollectionChangedAction.Remove:
+                        args.OldItems.Cast<TournamentTeam>().ForEach(i => Control.RemoveDropdownItem(i));
+                        break;
+                }
+            };
+        }
+
+        private readonly List<IUnbindable> refBindables = new List<IUnbindable>();
+
+        private T boundReference<T>(T obj)
+            where T : IBindable
+        {
+            obj = (T)obj.GetBoundCopy();
+            refBindables.Add(obj);
+            return obj;
+        }
+
+        private void add(TournamentTeam team)
+        {
+            Control.AddDropdownItem(team);
+            boundReference(team.FullName).BindValueChanged(_ =>
+            {
+                Control.RemoveDropdownItem(team);
+                Control.AddDropdownItem(team);
+            });
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
new file mode 100644
index 0000000000..db5363c155
--- /dev/null
+++ b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
@@ -0,0 +1,316 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Platform;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Tournament.Components;
+using osu.Game.Tournament.Models;
+using osu.Game.Tournament.Screens.Ladder.Components;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Tournament.Screens.TeamIntro
+{
+    public class SeedingScreen : TournamentScreen, IProvideVideo
+    {
+        private Container mainContainer;
+
+        private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
+
+        private readonly Bindable<TournamentTeam> currentTeam = new Bindable<TournamentTeam>();
+
+        [BackgroundDependencyLoader]
+        private void load(Storage storage)
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
+            {
+                new TourneyVideo(storage.GetStream(@"videos/seeding.m4v"))
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Loop = true,
+                },
+                mainContainer = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                },
+                new ControlPanel
+                {
+                    Children = new Drawable[]
+                    {
+                        new TourneyButton
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Text = "Show first team",
+                            Action = () => currentTeam.Value = currentMatch.Value.Team1.Value,
+                        },
+                        new TourneyButton
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            Text = "Show second team",
+                            Action = () => currentTeam.Value = currentMatch.Value.Team2.Value,
+                        },
+                        new SettingsTeamDropdown(LadderInfo.Teams)
+                        {
+                            LabelText = "Show specific team",
+                            Bindable = currentTeam,
+                        }
+                    }
+                }
+            };
+
+            currentMatch.BindValueChanged(matchChanged);
+            currentMatch.BindTo(LadderInfo.CurrentMatch);
+
+            currentTeam.BindValueChanged(teamChanged, true);
+        }
+
+        private void teamChanged(ValueChangedEvent<TournamentTeam> team)
+        {
+            if (team.NewValue == null)
+            {
+                mainContainer.Clear();
+                return;
+            }
+
+            showTeam(team.NewValue);
+        }
+
+        private void matchChanged(ValueChangedEvent<TournamentMatch> match) =>
+            currentTeam.Value = currentMatch.Value.Team1.Value;
+
+        private void showTeam(TournamentTeam team)
+        {
+            mainContainer.Children = new Drawable[]
+            {
+                new LeftInfo(team) { Position = new Vector2(55, 150), },
+                new RightInfo(team) { Position = new Vector2(500, 150), },
+            };
+        }
+
+        private class RightInfo : CompositeDrawable
+        {
+            public RightInfo(TournamentTeam team)
+            {
+                FillFlowContainer fill;
+
+                Width = 400;
+
+                InternalChildren = new Drawable[]
+                {
+                    fill = new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
+                    },
+                };
+
+                foreach (var seeding in team.SeedingResults)
+                {
+                    fill.Add(new ModRow(seeding.Mod.Value, seeding.Seed.Value));
+                    foreach (var beatmap in seeding.Beatmaps)
+                        fill.Add(new BeatmapScoreRow(beatmap));
+                }
+            }
+
+            private class BeatmapScoreRow : CompositeDrawable
+            {
+                public BeatmapScoreRow(SeedingBeatmap beatmap)
+                {
+                    RelativeSizeAxes = Axes.X;
+                    AutoSizeAxes = Axes.Y;
+
+                    InternalChildren = new Drawable[]
+                    {
+                        new FillFlowContainer
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Direction = FillDirection.Horizontal,
+                            Spacing = new Vector2(5),
+                            Children = new Drawable[]
+                            {
+                                new TournamentSpriteText { Text = beatmap.BeatmapInfo.Metadata.Title, Colour = Color4.Black, },
+                                new TournamentSpriteText { Text = "by", Colour = Color4.Black, Font = OsuFont.Torus.With(weight: FontWeight.Regular) },
+                                new TournamentSpriteText { Text = beatmap.BeatmapInfo.Metadata.Artist, Colour = Color4.Black, Font = OsuFont.Torus.With(weight: FontWeight.Regular) },
+                            }
+                        },
+                        new FillFlowContainer
+                        {
+                            AutoSizeAxes = Axes.Y,
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.TopRight,
+                            Direction = FillDirection.Horizontal,
+                            Spacing = new Vector2(40),
+                            Children = new Drawable[]
+                            {
+                                new TournamentSpriteText { Text = beatmap.Score.ToString("#,0"), Colour = Color4.Black, Width = 80 },
+                                new TournamentSpriteText { Text = "#" + beatmap.Seed.Value.ToString("#,0"), Colour = Color4.Black, Font = OsuFont.Torus.With(weight: FontWeight.Regular) },
+                            }
+                        },
+                    };
+                }
+            }
+
+            private class ModRow : CompositeDrawable
+            {
+                private readonly string mods;
+                private readonly int seeding;
+
+                public ModRow(string mods, int seeding)
+                {
+                    this.mods = mods;
+                    this.seeding = seeding;
+
+                    Padding = new MarginPadding { Vertical = 10 };
+
+                    AutoSizeAxes = Axes.Y;
+                }
+
+                [BackgroundDependencyLoader]
+                private void load(TextureStore textures)
+                {
+                    InternalChildren = new Drawable[]
+                    {
+                        new FillFlowContainer
+                        {
+                            AutoSizeAxes = Axes.Both,
+                            Direction = FillDirection.Horizontal,
+                            Spacing = new Vector2(5),
+                            Children = new Drawable[]
+                            {
+                                new Sprite
+                                {
+                                    Texture = textures.Get($"mods/{mods.ToLower()}"),
+                                    Scale = new Vector2(0.5f)
+                                },
+                                new Container
+                                {
+                                    Size = new Vector2(50, 16),
+                                    CornerRadius = 10,
+                                    Masking = true,
+                                    Children = new Drawable[]
+                                    {
+                                        new Box
+                                        {
+                                            RelativeSizeAxes = Axes.Both,
+                                            Colour = Color4.Black,
+                                        },
+                                        new TournamentSpriteText
+                                        {
+                                            Anchor = Anchor.Centre,
+                                            Origin = Anchor.Centre,
+                                            Text = seeding.ToString("#,0"),
+                                        },
+                                    }
+                                },
+                            }
+                        },
+                    };
+                }
+            }
+        }
+
+        private class LeftInfo : CompositeDrawable
+        {
+            public LeftInfo(TournamentTeam team)
+            {
+                FillFlowContainer fill;
+
+                Width = 200;
+
+                if (team == null) return;
+
+                InternalChildren = new Drawable[]
+                {
+                    fill = new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
+                        Children = new Drawable[]
+                        {
+                            new TeamDisplay(team) { Margin = new MarginPadding { Bottom = 30 } },
+                            new RowDisplay("Average Rank:", $"#{team.AverageRank:#,0}"),
+                            new RowDisplay("Seed:", team.Seed.Value),
+                            new RowDisplay("Last year's placing:", team.LastYearPlacing.Value > 0 ? $"#{team.LastYearPlacing:#,0}" : "0"),
+                            new Container { Margin = new MarginPadding { Bottom = 30 } },
+                        }
+                    },
+                };
+
+                foreach (var p in team.Players)
+                    fill.Add(new RowDisplay(p.Username, p.Statistics?.Ranks.Global?.ToString("\\##,0") ?? "-"));
+            }
+
+            internal class RowDisplay : CompositeDrawable
+            {
+                public RowDisplay(string left, string right)
+                {
+                    AutoSizeAxes = Axes.Y;
+                    RelativeSizeAxes = Axes.X;
+
+                    var colour = OsuColour.Gray(0.3f);
+
+                    InternalChildren = new Drawable[]
+                    {
+                        new TournamentSpriteText
+                        {
+                            Text = left,
+                            Colour = colour,
+                            Font = OsuFont.Torus.With(size: 22),
+                        },
+                        new TournamentSpriteText
+                        {
+                            Text = right,
+                            Colour = colour,
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.TopLeft,
+                            Font = OsuFont.Torus.With(size: 22, weight: FontWeight.Regular),
+                        },
+                    };
+                }
+            }
+
+            private class TeamDisplay : DrawableTournamentTeam
+            {
+                public TeamDisplay(TournamentTeam team)
+                    : base(team)
+                {
+                    AutoSizeAxes = Axes.Both;
+
+                    Flag.RelativeSizeAxes = Axes.None;
+                    Flag.Size = new Vector2(300, 200);
+                    Flag.Scale = new Vector2(0.3f);
+
+                    InternalChild = new FillFlowContainer
+                    {
+                        AutoSizeAxes = Axes.Both,
+                        Direction = FillDirection.Vertical,
+                        Spacing = new Vector2(0, 5),
+                        Children = new Drawable[]
+                        {
+                            Flag,
+                            new OsuSpriteText
+                            {
+                                Text = team?.FullName.Value ?? "???",
+                                Font = OsuFont.Torus.With(size: 32, weight: FontWeight.SemiBold),
+                                Colour = Color4.Black,
+                            },
+                        }
+                    };
+                }
+            }
+        }
+    }
+}
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index dd93215fc1..64a5618d73 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -241,6 +241,24 @@ namespace osu.Game.Tournament
                 }
             }
 
+            foreach (var t in ladder.Teams)
+            {
+                foreach (var s in t.SeedingResults)
+                {
+                    foreach (var b in s.Beatmaps)
+                    {
+                        if (b.BeatmapInfo == null && b.ID > 0)
+                        {
+                            var req = new GetBeatmapRequest(new BeatmapInfo { OnlineBeatmapID = b.ID });
+                            req.Perform(API);
+                            b.BeatmapInfo = req.Result?.ToBeatmap(RulesetStore);
+
+                            addedInfo = true;
+                        }
+                    }
+                }
+            }
+
             return addedInfo;
         }
 
diff --git a/osu.Game.Tournament/TournamentSceneManager.cs b/osu.Game.Tournament/TournamentSceneManager.cs
index de3d685c31..38df40772f 100644
--- a/osu.Game.Tournament/TournamentSceneManager.cs
+++ b/osu.Game.Tournament/TournamentSceneManager.cs
@@ -80,6 +80,7 @@ namespace osu.Game.Tournament
                                 new ShowcaseScreen(),
                                 new MapPoolScreen(),
                                 new TeamIntroScreen(),
+                                new SeedingScreen(),
                                 new DrawingsScreen(),
                                 new GameplayScreen(),
                                 new TeamWinScreen()
@@ -121,6 +122,7 @@ namespace osu.Game.Tournament
                                 new ScreenButton(typeof(LadderScreen)) { Text = "Bracket", RequestSelection = SetScreen },
                                 new Separator(),
                                 new ScreenButton(typeof(TeamIntroScreen)) { Text = "TeamIntro", RequestSelection = SetScreen },
+                                new ScreenButton(typeof(SeedingScreen)) { Text = "Seeding", RequestSelection = SetScreen },
                                 new Separator(),
                                 new ScreenButton(typeof(MapPoolScreen)) { Text = "MapPool", RequestSelection = SetScreen },
                                 new ScreenButton(typeof(GameplayScreen)) { Text = "Gameplay", RequestSelection = SetScreen },
@@ -146,8 +148,20 @@ namespace osu.Game.Tournament
         private Drawable currentScreen;
         private ScheduledDelegate scheduledHide;
 
+        private Drawable temporaryScreen;
+
+        public void SetScreen(Drawable screen)
+        {
+            currentScreen?.Hide();
+            currentScreen = null;
+
+            screens.Add(temporaryScreen = screen);
+        }
+
         public void SetScreen(Type screenType)
         {
+            temporaryScreen?.Expire();
+
             var target = screens.FirstOrDefault(s => s.GetType() == screenType);
 
             if (target == null || currentScreen == target) return;
diff --git a/osu.Game.Tournament/TournamentSpriteText.cs b/osu.Game.Tournament/TournamentSpriteText.cs
new file mode 100644
index 0000000000..e550dfbfae
--- /dev/null
+++ b/osu.Game.Tournament/TournamentSpriteText.cs
@@ -0,0 +1,16 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Tournament
+{
+    public class TournamentSpriteText : OsuSpriteText
+    {
+        public TournamentSpriteText()
+        {
+            Font = OsuFont.Torus;
+        }
+    }
+}

From b6edd17242a2f94da3fe03e9c2bf2833b0d6bdec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Mar 2020 18:59:23 +0900
Subject: [PATCH 0837/1142] Fix TeamWin test scene

---
 osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
index 5cb35a506f..1a2faa76c1 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
@@ -21,6 +21,7 @@ namespace osu.Game.Tournament.Tests.Screens
             match.Team1.Value = Ladder.Teams.FirstOrDefault(t => t.Acronym.Value == "USA");
             match.Team2.Value = Ladder.Teams.FirstOrDefault(t => t.Acronym.Value == "JPN");
             match.Round.Value = Ladder.Rounds.FirstOrDefault(g => g.Name.Value == "Finals");
+            match.Completed.Value = true;
             ladder.CurrentMatch.Value = match;
 
             Add(new TeamWinScreen

From 1b355d02d6910b596a547670a1c6ffaaffc0fbd0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Mar 2020 19:10:29 +0900
Subject: [PATCH 0838/1142] Update video resource paths

---
 osu.Game.Tournament/Screens/Ladder/LadderScreen.cs       | 2 +-
 osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs   | 2 +-
 osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs | 2 +-
 osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs     | 4 ++--
 osu.Game.Tournament/TournamentSceneManager.cs            | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
index 8ea366e1b4..5528c9e9f5 100644
--- a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
+++ b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Tournament.Screens.Ladder
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
                 {
-                    new TourneyVideo(storage.GetStream(@"BG Side Logo - OWC.m4v"))
+                    new TourneyVideo(storage.GetStream(@"videos/ladder.m4v"))
                     {
                         RelativeSizeAxes = Axes.Both,
                         Loop = true,
diff --git a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
index 4b46264055..140ae54bfb 100644
--- a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
+++ b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Tournament.Screens.Schedule
 
             InternalChildren = new Drawable[]
             {
-                new TourneyVideo(storage.GetStream(@"BG Side Logo - OWC.m4v"))
+                new TourneyVideo(storage.GetStream(@"videos/schedule.m4v"))
                 {
                     RelativeSizeAxes = Axes.Both,
                     Loop = true,
diff --git a/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
index 75d63cde13..bff5c6aac3 100644
--- a/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
 
             InternalChildren = new Drawable[]
             {
-                new TourneyVideo(storage.GetStream(@"BG Team - Both OWC.m4v"))
+                new TourneyVideo(storage.GetStream(@"videos/teamintro.m4v"))
                 {
                     RelativeSizeAxes = Axes.Both,
                     Loop = true,
diff --git a/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs b/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
index b72cacc66f..cc1f2a73ae 100644
--- a/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
@@ -33,13 +33,13 @@ namespace osu.Game.Tournament.Screens.TeamWin
 
             InternalChildren = new Drawable[]
             {
-                blueWinVideo = new TourneyVideo(storage.GetStream(@"BG Team - Win Blue.m4v"))
+                blueWinVideo = new TourneyVideo(storage.GetStream(@"videos/teamwin-blue.m4v"))
                 {
                     Alpha = 1,
                     RelativeSizeAxes = Axes.Both,
                     Loop = true,
                 },
-                redWinVideo = new TourneyVideo(storage.GetStream(@"BG Team - Win Red.m4v"))
+                redWinVideo = new TourneyVideo(storage.GetStream(@"videos/teamwin-red.m4v"))
                 {
                     Alpha = 0,
                     RelativeSizeAxes = Axes.Both,
diff --git a/osu.Game.Tournament/TournamentSceneManager.cs b/osu.Game.Tournament/TournamentSceneManager.cs
index 38df40772f..9f5f2b6827 100644
--- a/osu.Game.Tournament/TournamentSceneManager.cs
+++ b/osu.Game.Tournament/TournamentSceneManager.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Tournament
                     //Masking = true,
                     Children = new Drawable[]
                     {
-                        video = new TourneyVideo(storage.GetStream("BG Logoless - OWC.m4v"))
+                        video = new TourneyVideo(storage.GetStream("videos/main.m4v"))
                         {
                             Loop = true,
                             RelativeSizeAxes = Axes.Both,

From e678a068b6ecca9df29c408c7e4858c75f39e477 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Mar 2020 19:14:44 +0900
Subject: [PATCH 0839/1142] Bring design up-to-date with 2019 standards

---
 .../Components/ControlPanel.cs                |   3 +-
 .../Components/DrawableTournamentTeam.cs      |   7 +-
 osu.Game.Tournament/Components/SongBar.cs     |   7 +-
 .../Components/TournamentBeatmapPanel.cs      |  21 +--
 .../Screens/Drawings/Components/Group.cs      |   7 +-
 .../Screens/Drawings/DrawingsScreen.cs        |   9 +-
 .../Gameplay/Components/MatchHeader.cs        |  48 ++---
 .../Ladder/Components/DrawableMatchTeam.cs    |  11 +-
 .../Components/DrawableTournamentRound.cs     |  11 +-
 .../Screens/MapPool/MapPoolScreen.cs          |   3 +-
 .../Screens/Schedule/ScheduleScreen.cs        |  15 +-
 osu.Game.Tournament/Screens/SetupScreen.cs    |   5 +-
 .../Screens/Showcase/ShowcaseScreen.cs        |   2 +-
 .../Screens/Showcase/TournamentLogo.cs        |  16 +-
 .../Screens/TeamIntro/TeamIntroScreen.cs      |  76 +++-----
 .../Screens/TeamWin/TeamWinScreen.cs          | 176 +++++++-----------
 osu.Game.Tournament/TournamentGame.cs         |   4 +
 osu.Game.Tournament/TournamentGameBase.cs     |   5 +-
 18 files changed, 168 insertions(+), 258 deletions(-)

diff --git a/osu.Game.Tournament/Components/ControlPanel.cs b/osu.Game.Tournament/Components/ControlPanel.cs
index a9bb1bf42f..fa5c941f1a 100644
--- a/osu.Game.Tournament/Components/ControlPanel.cs
+++ b/osu.Game.Tournament/Components/ControlPanel.cs
@@ -5,7 +5,6 @@ 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;
 using osuTK.Graphics;
 
@@ -35,7 +34,7 @@ namespace osu.Game.Tournament.Components
                     RelativeSizeAxes = Axes.Both,
                     Colour = new Color4(54, 54, 54, 255)
                 },
-                new OsuSpriteText
+                new TournamentSpriteText
                 {
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
diff --git a/osu.Game.Tournament/Components/DrawableTournamentTeam.cs b/osu.Game.Tournament/Components/DrawableTournamentTeam.cs
index 361bd92770..99116d4a17 100644
--- a/osu.Game.Tournament/Components/DrawableTournamentTeam.cs
+++ b/osu.Game.Tournament/Components/DrawableTournamentTeam.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Tournament.Models;
 
 namespace osu.Game.Tournament.Components
@@ -19,7 +18,7 @@ namespace osu.Game.Tournament.Components
         public readonly TournamentTeam Team;
 
         protected readonly Sprite Flag;
-        protected readonly OsuSpriteText AcronymText;
+        protected readonly TournamentSpriteText AcronymText;
 
         [UsedImplicitly]
         private Bindable<string> acronym;
@@ -37,9 +36,9 @@ namespace osu.Game.Tournament.Components
                 FillMode = FillMode.Fit
             };
 
-            AcronymText = new OsuSpriteText
+            AcronymText = new TournamentSpriteText
             {
-                Font = OsuFont.GetFont(weight: FontWeight.Regular),
+                Font = OsuFont.Torus.With(weight: FontWeight.Regular),
             };
         }
 
diff --git a/osu.Game.Tournament/Components/SongBar.cs b/osu.Game.Tournament/Components/SongBar.cs
index 8a46da9565..48ea36a8f3 100644
--- a/osu.Game.Tournament/Components/SongBar.cs
+++ b/osu.Game.Tournament/Components/SongBar.cs
@@ -13,7 +13,6 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Legacy;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Menu;
 using osuTK;
@@ -262,7 +261,7 @@ namespace osu.Game.Tournament.Components
                 static void cp(SpriteText s, Color4 colour)
                 {
                     s.Colour = colour;
-                    s.Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 15);
+                    s.Font = OsuFont.Torus.With(weight: FontWeight.Bold, size: 15);
                 }
 
                 for (var i = 0; i < tuples.Length; i++)
@@ -278,9 +277,9 @@ namespace osu.Game.Tournament.Components
                         });
                     }
 
-                    AddText(new OsuSpriteText { Text = heading }, s => cp(s, OsuColour.Gray(0.33f)));
+                    AddText(new TournamentSpriteText { Text = heading }, s => cp(s, OsuColour.Gray(0.33f)));
                     AddText(" ", s => cp(s, OsuColour.Gray(0.33f)));
-                    AddText(new OsuSpriteText { Text = content }, s => cp(s, OsuColour.Gray(0.5f)));
+                    AddText(new TournamentSpriteText { Text = content }, s => cp(s, OsuColour.Gray(0.5f)));
                 }
             }
         }
diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index 51483a0964..394ffe304e 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -15,7 +15,6 @@ using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Tournament.Models;
 using osuTK;
 using osuTK.Graphics;
@@ -77,14 +76,14 @@ namespace osu.Game.Tournament.Components
                     Direction = FillDirection.Vertical,
                     Children = new Drawable[]
                     {
-                        new OsuSpriteText
+                        new TournamentSpriteText
                         {
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.TopCentre,
                             Text = new LocalisedString((
                                 $"{Beatmap.Metadata.ArtistUnicode ?? Beatmap.Metadata.Artist} - {Beatmap.Metadata.TitleUnicode ?? Beatmap.Metadata.Title}",
                                 $"{Beatmap.Metadata.Artist} - {Beatmap.Metadata.Title}")),
-                            Font = OsuFont.GetFont(weight: FontWeight.Bold, italics: true),
+                            Font = OsuFont.Torus.With(weight: FontWeight.Bold),
                         },
                         new FillFlowContainer
                         {
@@ -95,28 +94,28 @@ namespace osu.Game.Tournament.Components
                             Direction = FillDirection.Horizontal,
                             Children = new Drawable[]
                             {
-                                new OsuSpriteText
+                                new TournamentSpriteText
                                 {
                                     Text = "mapper",
                                     Padding = new MarginPadding { Right = 5 },
-                                    Font = OsuFont.GetFont(italics: true, weight: FontWeight.Regular, size: 14)
+                                    Font = OsuFont.Torus.With(weight: FontWeight.Regular, size: 14)
                                 },
-                                new OsuSpriteText
+                                new TournamentSpriteText
                                 {
                                     Text = Beatmap.Metadata.AuthorString,
                                     Padding = new MarginPadding { Right = 20 },
-                                    Font = OsuFont.GetFont(italics: true, weight: FontWeight.Bold, size: 14)
+                                    Font = OsuFont.Torus.With(weight: FontWeight.Bold, size: 14)
                                 },
-                                new OsuSpriteText
+                                new TournamentSpriteText
                                 {
                                     Text = "difficulty",
                                     Padding = new MarginPadding { Right = 5 },
-                                    Font = OsuFont.GetFont(italics: true, weight: FontWeight.Regular, size: 14)
+                                    Font = OsuFont.Torus.With(weight: FontWeight.Regular, size: 14)
                                 },
-                                new OsuSpriteText
+                                new TournamentSpriteText
                                 {
                                     Text = Beatmap.Version,
-                                    Font = OsuFont.GetFont(italics: true, weight: FontWeight.Bold, size: 14)
+                                    Font = OsuFont.Torus.With(weight: FontWeight.Bold, size: 14)
                                 },
                             }
                         }
diff --git a/osu.Game.Tournament/Screens/Drawings/Components/Group.cs b/osu.Game.Tournament/Screens/Drawings/Components/Group.cs
index 549ff26018..4126f2db65 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/Group.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/Group.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
 using osuTK;
@@ -43,7 +42,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
                     Colour = new Color4(54, 54, 54, 255)
                 },
                 // Group name
-                new OsuSpriteText
+                new TournamentSpriteText
                 {
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
@@ -51,7 +50,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
                     Position = new Vector2(0, 7f),
 
                     Text = $"GROUP {name.ToUpperInvariant()}",
-                    Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 8),
+                    Font = OsuFont.Torus.With(weight: FontWeight.Bold, size: 8),
                     Colour = new Color4(255, 204, 34, 255),
                 },
                 teams = new FillFlowContainer<GroupTeam>
@@ -134,7 +133,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
                 AcronymText.Anchor = Anchor.TopCentre;
                 AcronymText.Origin = Anchor.TopCentre;
                 AcronymText.Text = team.Acronym.Value.ToUpperInvariant();
-                AcronymText.Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 10);
+                AcronymText.Font = OsuFont.Torus.With(weight: FontWeight.Bold, size: 10);
 
                 InternalChildren = new Drawable[]
                 {
diff --git a/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs b/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
index 5efa0a1e69..8be66ff98c 100644
--- a/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
+++ b/osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
@@ -14,7 +14,6 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Drawings.Components;
@@ -29,7 +28,7 @@ namespace osu.Game.Tournament.Screens.Drawings
 
         private ScrollingTeamContainer teamsContainer;
         private GroupContainer groupsContainer;
-        private OsuSpriteText fullTeamNameText;
+        private TournamentSpriteText fullTeamNameText;
 
         private readonly List<TournamentTeam> allTeams = new List<TournamentTeam>();
 
@@ -109,18 +108,18 @@ namespace osu.Game.Tournament.Screens.Drawings
                             RelativeSizeAxes = Axes.X,
                         },
                         // Scrolling team name
-                        fullTeamNameText = new OsuSpriteText
+                        fullTeamNameText = new TournamentSpriteText
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.TopCentre,
 
                             Position = new Vector2(0, 45f),
 
-                            Colour = OsuColour.Gray(0.33f),
+                            Colour = OsuColour.Gray(0.95f),
 
                             Alpha = 0,
 
-                            Font = OsuFont.GetFont(weight: FontWeight.Light, size: 42),
+                            Font = OsuFont.Torus.With(weight: FontWeight.Light, size: 42),
                         }
                     }
                 },
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
index d8f2df2e93..ce17c392d0 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
@@ -5,9 +5,9 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
@@ -30,7 +30,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                 new TournamentLogo(),
                 new RoundDisplay
                 {
-                    Y = 10,
+                    Y = 5,
                     Anchor = Anchor.BottomCentre,
                     Origin = Anchor.TopCentre,
                 },
@@ -51,9 +51,6 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
         {
             private readonly TeamColour teamColour;
 
-            private readonly Color4 red = new Color4(129, 68, 65, 255);
-            private readonly Color4 blue = new Color4(41, 91, 97, 255);
-
             private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
             private readonly Bindable<TournamentTeam> currentTeam = new Bindable<TournamentTeam>();
             private readonly Bindable<int?> currentTeamScore = new Bindable<int?>();
@@ -106,7 +103,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
 
             private void teamChanged(TournamentTeam team)
             {
-                var colour = teamColour == TeamColour.Red ? red : blue;
+                var colour = teamColour == TeamColour.Red ? TournamentGame.COLOUR_RED : TournamentGame.COLOUR_BLUE;
                 var flip = teamColour != TeamColour.Red;
 
                 InternalChildren = new Drawable[]
@@ -169,7 +166,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                     Children = new Drawable[]
                     {
                         Flag,
-                        new OsuSpriteText
+                        new TournamentSpriteText
                         {
                             Text = team?.FullName.Value.ToUpper() ?? "???",
                             X = (flip ? -1 : 1) * 90,
@@ -188,10 +185,31 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
         {
             private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
 
+            private readonly TournamentSpriteText text;
+
             public RoundDisplay()
             {
                 Width = 200;
                 Height = 20;
+
+                Masking = true;
+                CornerRadius = 10;
+
+                InternalChildren = new Drawable[]
+                {
+                    new Box
+                    {
+                        Colour = OsuColour.Gray(0.18f),
+                        RelativeSizeAxes = Axes.Both,
+                    },
+                    text = new TournamentSpriteText
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Colour = Color4.White,
+                        Font = OsuFont.Torus.With(weight: FontWeight.Regular, size: 16),
+                    },
+                };
             }
 
             [BackgroundDependencyLoader]
@@ -201,20 +219,8 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                 currentMatch.BindTo(ladder.CurrentMatch);
             }
 
-            private void matchChanged(ValueChangedEvent<TournamentMatch> match)
-            {
-                InternalChildren = new Drawable[]
-                {
-                    new OsuSpriteText
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Colour = Color4.White,
-                        Text = match.NewValue.Round.Value?.Name.Value ?? "Unknown Round",
-                        Font = OsuFont.Torus.With(weight: FontWeight.Regular, size: 18),
-                    },
-                };
-            }
+            private void matchChanged(ValueChangedEvent<TournamentMatch> match) =>
+                text.Text = match.NewValue.Round.Value?.Name.Value ?? "Unknown Round";
         }
     }
 }
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
index 031d6bf3d2..88d7b95b0c 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
@@ -26,7 +25,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
     {
         private readonly TournamentMatch match;
         private readonly bool losers;
-        private OsuSpriteText scoreText;
+        private TournamentSpriteText scoreText;
         private Box background;
 
         private readonly Bindable<int?> score = new Bindable<int?>();
@@ -69,7 +68,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
 
             AcronymText.Anchor = AcronymText.Origin = Anchor.CentreLeft;
             AcronymText.Padding = new MarginPadding { Left = 50 };
-            AcronymText.Font = OsuFont.GetFont(size: 24);
+            AcronymText.Font = OsuFont.Torus.With(size: 24);
 
             if (match != null)
             {
@@ -119,11 +118,11 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
                                     Alpha = 0.8f,
                                     RelativeSizeAxes = Axes.Both,
                                 },
-                                scoreText = new OsuSpriteText
+                                scoreText = new TournamentSpriteText
                                 {
                                     Anchor = Anchor.Centre,
                                     Origin = Anchor.Centre,
-                                    Font = OsuFont.GetFont(size: 20),
+                                    Font = OsuFont.Torus.With(size: 20),
                                 }
                             }
                         }
@@ -184,7 +183,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
 
             background.FadeColour(winner ? colourWinner : colourNormal, winner ? 500 : 0, Easing.OutQuint);
 
-            scoreText.Font = AcronymText.Font = OsuFont.GetFont(weight: winner ? FontWeight.Bold : FontWeight.Regular);
+            scoreText.Font = AcronymText.Font = OsuFont.Torus.With(weight: winner ? FontWeight.Bold : FontWeight.Regular);
         }
 
         public MenuItem[] ContextMenuItems
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentRound.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentRound.cs
index dacd98d3b8..d14ebb4d03 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentRound.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentRound.cs
@@ -6,7 +6,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Tournament.Models;
 using osuTK.Graphics;
 
@@ -22,8 +21,8 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
 
         public DrawableTournamentRound(TournamentRound round, bool losers = false)
         {
-            OsuSpriteText textName;
-            OsuSpriteText textDescription;
+            TournamentSpriteText textName;
+            TournamentSpriteText textDescription;
 
             AutoSizeAxes = Axes.Both;
             InternalChild = new FillFlowContainer
@@ -32,15 +31,15 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
                 AutoSizeAxes = Axes.Both,
                 Children = new Drawable[]
                 {
-                    textDescription = new OsuSpriteText
+                    textDescription = new TournamentSpriteText
                     {
                         Colour = Color4.Black,
                         Origin = Anchor.TopCentre,
                         Anchor = Anchor.TopCentre
                     },
-                    textName = new OsuSpriteText
+                    textName = new TournamentSpriteText
                     {
-                        Font = OsuFont.GetFont(weight: FontWeight.Bold),
+                        Font = OsuFont.Torus.With(weight: FontWeight.Bold),
                         Colour = Color4.Black,
                         Origin = Anchor.TopCentre,
                         Anchor = Anchor.TopCentre
diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index c3875716b8..c42d0a6da3 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
 using osu.Framework.Threading;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.IPC;
@@ -56,7 +55,7 @@ namespace osu.Game.Tournament.Screens.MapPool
                 {
                     Children = new Drawable[]
                     {
-                        new OsuSpriteText
+                        new TournamentSpriteText
                         {
                             Text = "Current Mode"
                         },
diff --git a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
index 140ae54bfb..080570eac4 100644
--- a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
+++ b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Platform;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Ladder.Components;
@@ -107,20 +106,20 @@ namespace osu.Game.Tournament.Screens.Schedule
                         Height = 0.25f,
                         Children = new Drawable[]
                         {
-                            new OsuSpriteText
+                            new TournamentSpriteText
                             {
                                 Margin = new MarginPadding { Left = -10, Bottom = 10, Top = -5 },
                                 Spacing = new Vector2(10, 0),
                                 Text = match.NewValue.Round.Value?.Name.Value,
                                 Colour = Color4.Black,
-                                Font = OsuFont.GetFont(size: 20)
+                                Font = OsuFont.Torus.With(size: 20)
                             },
                             new ScheduleMatch(match.NewValue, false),
-                            new OsuSpriteText
+                            new TournamentSpriteText
                             {
                                 Text = "Start Time " + match.NewValue.Date.Value.ToUniversalTime().ToString("HH:mm UTC"),
                                 Colour = Color4.Black,
-                                Font = OsuFont.GetFont(size: 20)
+                                Font = OsuFont.Torus.With(size: 20)
                             },
                         }
                     }
@@ -150,7 +149,7 @@ namespace osu.Game.Tournament.Screens.Schedule
                         Alpha = conditional ? 0.6f : 1,
                         Margin = new MarginPadding { Horizontal = 10, Vertical = 5 },
                     });
-                    AddInternal(new OsuSpriteText
+                    AddInternal(new TournamentSpriteText
                     {
                         Anchor = Anchor.BottomRight,
                         Origin = Anchor.BottomLeft,
@@ -174,13 +173,13 @@ namespace osu.Game.Tournament.Screens.Schedule
                 Padding = new MarginPadding { Left = 30, Top = 30 };
                 InternalChildren = new Drawable[]
                 {
-                    new OsuSpriteText
+                    new TournamentSpriteText
                     {
                         X = 30,
                         Text = title,
                         Colour = Color4.Black,
                         Spacing = new Vector2(10, 0),
-                        Font = OsuFont.GetFont(size: 30)
+                        Font = OsuFont.Torus.With(size: 30)
                     },
                     content = new FillFlowContainer
                     {
diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index 8e1481d87c..023582166c 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
 using osu.Game.Online.API;
@@ -147,7 +146,7 @@ namespace osu.Game.Tournament.Screens
 
             public Action Action;
 
-            private OsuSpriteText valueText;
+            private TournamentSpriteText valueText;
 
             protected override Drawable CreateComponent() => new Container
             {
@@ -155,7 +154,7 @@ namespace osu.Game.Tournament.Screens
                 RelativeSizeAxes = Axes.X,
                 Children = new Drawable[]
                 {
-                    valueText = new OsuSpriteText
+                    valueText = new TournamentSpriteText
                     {
                         Anchor = Anchor.CentreLeft,
                         Origin = Anchor.CentreLeft,
diff --git a/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs b/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
index 20928499bf..d809dfc994 100644
--- a/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
+++ b/osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Tournament.Screens.Showcase
         [BackgroundDependencyLoader]
         private void load()
         {
-            AddInternal(new TournamentLogo(false));
+            AddInternal(new TournamentLogo());
         }
     }
 }
diff --git a/osu.Game.Tournament/Screens/Showcase/TournamentLogo.cs b/osu.Game.Tournament/Screens/Showcase/TournamentLogo.cs
index 1fee2b29e8..6ad5ccaf0c 100644
--- a/osu.Game.Tournament/Screens/Showcase/TournamentLogo.cs
+++ b/osu.Game.Tournament/Screens/Showcase/TournamentLogo.cs
@@ -11,20 +11,12 @@ namespace osu.Game.Tournament.Screens.Showcase
 {
     public class TournamentLogo : CompositeDrawable
     {
-        public TournamentLogo(bool includeRoundBackground = true)
+        public TournamentLogo()
         {
             RelativeSizeAxes = Axes.X;
             Margin = new MarginPadding { Vertical = 5 };
 
-            if (includeRoundBackground)
-            {
-                AutoSizeAxes = Axes.Y;
-            }
-            else
-            {
-                Masking = true;
-                Height = 100;
-            }
+            Height = 100;
         }
 
         [BackgroundDependencyLoader]
@@ -32,9 +24,11 @@ namespace osu.Game.Tournament.Screens.Showcase
         {
             InternalChild = new Sprite
             {
-                Texture = textures.Get("game-screen-logo"),
                 Anchor = Anchor.TopCentre,
                 Origin = Anchor.TopCentre,
+                FillMode = FillMode.Fit,
+                RelativeSizeAxes = Axes.Both,
+                Texture = textures.Get("game-screen-logo"),
             };
         }
     }
diff --git a/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
index bff5c6aac3..6559113f55 100644
--- a/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
@@ -7,12 +7,9 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Platform;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
-using osu.Game.Tournament.Screens.Showcase;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Tournament.Screens.TeamIntro
 {
@@ -34,7 +31,6 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                     RelativeSizeAxes = Axes.Both,
                     Loop = true,
                 },
-                new TournamentLogo(false),
                 mainContainer = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -75,8 +71,9 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                 {
                     RelativeSizeAxes = Axes.Both,
                     Height = 0.25f,
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.BottomCentre,
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
+                    Y = 180,
                 }
             };
         }
@@ -85,8 +82,6 @@ namespace osu.Game.Tournament.Screens.TeamIntro
         {
             public RoundDisplay(TournamentMatch match)
             {
-                var col = OsuColour.Gray(0.33f);
-
                 InternalChildren = new Drawable[]
                 {
                     new FillFlowContainer
@@ -98,31 +93,13 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                         Spacing = new Vector2(0, 10),
                         Children = new Drawable[]
                         {
-                            new OsuSpriteText
+                            new TournamentSpriteText
                             {
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
-                                Colour = col,
-                                Text = "COMING UP NEXT",
-                                Spacing = new Vector2(2, 0),
-                                Font = OsuFont.GetFont(size: 15, weight: FontWeight.Black)
-                            },
-                            new OsuSpriteText
-                            {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
-                                Colour = col,
+                                Colour = OsuColour.Gray(0.33f),
                                 Text = match.Round.Value?.Name.Value ?? "Unknown Round",
-                                Spacing = new Vector2(10, 0),
-                                Font = OsuFont.GetFont(size: 50, weight: FontWeight.Light)
-                            },
-                            new OsuSpriteText
-                            {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
-                                Colour = col,
-                                Text = match.Date.Value.ToUniversalTime().ToString("dd MMMM HH:mm UTC"),
-                                Font = OsuFont.GetFont(size: 20)
+                                Font = OsuFont.Torus.With(size: 26, weight: FontWeight.Light)
                             },
                         }
                     }
@@ -132,21 +109,19 @@ namespace osu.Game.Tournament.Screens.TeamIntro
 
         private class TeamWithPlayers : CompositeDrawable
         {
-            private readonly Color4 red = new Color4(129, 68, 65, 255);
-            private readonly Color4 blue = new Color4(41, 91, 97, 255);
-
             public TeamWithPlayers(TournamentTeam team, bool left = false)
             {
                 FillFlowContainer players;
-                var colour = left ? red : blue;
+                var colour = left ? TournamentGame.COLOUR_RED : TournamentGame.COLOUR_BLUE;
                 InternalChildren = new Drawable[]
                 {
-                    new TeamDisplay(team, left ? "Team Red" : "Team Blue", colour)
+                    new TeamDisplay(team)
                     {
                         Anchor = left ? Anchor.CentreRight : Anchor.CentreLeft,
-                        Origin = Anchor.Centre,
+                        Origin = Anchor.TopCentre,
                         RelativePositionAxes = Axes.Both,
-                        X = (left ? -1 : 1) * 0.36f,
+                        X = (left ? -1 : 1) * 0.3145f,
+                        Y = -0.077f,
                     },
                     players = new FillFlowContainer
                     {
@@ -157,7 +132,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                         Anchor = left ? Anchor.CentreRight : Anchor.CentreLeft,
                         Origin = left ? Anchor.CentreRight : Anchor.CentreLeft,
                         RelativePositionAxes = Axes.Both,
-                        X = (left ? -1 : 1) * 0.66f,
+                        X = (left ? -1 : 1) * 0.58f,
                     },
                 };
 
@@ -165,10 +140,10 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                 {
                     foreach (var p in team.Players)
                     {
-                        players.Add(new OsuSpriteText
+                        players.Add(new TournamentSpriteText
                         {
                             Text = p.Username,
-                            Font = OsuFont.GetFont(size: 24),
+                            Font = OsuFont.Torus.With(size: 24),
                             Colour = colour,
                             Anchor = left ? Anchor.CentreRight : Anchor.CentreLeft,
                             Origin = left ? Anchor.CentreRight : Anchor.CentreLeft,
@@ -179,7 +154,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
 
             private class TeamDisplay : DrawableTournamentTeam
             {
-                public TeamDisplay(TournamentTeam team, string teamName, Color4 colour)
+                public TeamDisplay(TournamentTeam team)
                     : base(team)
                 {
                     AutoSizeAxes = Axes.Both;
@@ -187,33 +162,24 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                     Flag.Anchor = Flag.Origin = Anchor.TopCentre;
                     Flag.RelativeSizeAxes = Axes.None;
                     Flag.Size = new Vector2(300, 200);
-                    Flag.Scale = new Vector2(0.4f);
-                    Flag.Margin = new MarginPadding { Bottom = 20 };
+                    Flag.Scale = new Vector2(0.32f);
 
                     InternalChild = new FillFlowContainer
                     {
                         AutoSizeAxes = Axes.Both,
                         Direction = FillDirection.Vertical,
-                        Spacing = new Vector2(0, 5),
+                        Spacing = new Vector2(160),
                         Children = new Drawable[]
                         {
                             Flag,
-                            new OsuSpriteText
+                            new TournamentSpriteText
                             {
-                                Text = team?.FullName.Value.ToUpper() ?? "???",
-                                Font = OsuFont.Torus.With(size: 40, weight: FontWeight.Light),
-                                Colour = Color4.Black,
+                                Text = team?.FullName.Value ?? "???",
+                                Font = OsuFont.Torus.With(size: 20, weight: FontWeight.Regular),
+                                Colour = OsuColour.Gray(0.2f),
                                 Origin = Anchor.TopCentre,
                                 Anchor = Anchor.TopCentre,
                             },
-                            new OsuSpriteText
-                            {
-                                Text = teamName.ToUpper(),
-                                Font = OsuFont.Torus.With(size: 20, weight: FontWeight.Regular),
-                                Colour = colour,
-                                Origin = Anchor.TopCentre,
-                                Anchor = Anchor.TopCentre,
-                            }
                         }
                     };
                 }
diff --git a/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs b/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
index cc1f2a73ae..30b86f8421 100644
--- a/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
@@ -7,10 +7,8 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Platform;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
-using osu.Game.Tournament.Screens.Showcase;
 using osuTK;
 using osuTK.Graphics;
 
@@ -45,10 +43,6 @@ namespace osu.Game.Tournament.Screens.TeamWin
                     RelativeSizeAxes = Axes.Both,
                     Loop = true,
                 },
-                new TournamentLogo(false)
-                {
-                    Y = 40,
-                },
                 mainContainer = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -85,141 +79,99 @@ namespace osu.Game.Tournament.Screens.TeamWin
 
             mainContainer.Children = new Drawable[]
             {
+                new TeamFlagDisplay(match.Winner)
+                {
+                    Size = new Vector2(300, 200),
+                    Scale = new Vector2(0.5f),
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    X = -387,
+                },
+                new TournamentSpriteText
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.TopLeft,
+                    Position = new Vector2(78, -70),
+                    Colour = OsuColour.Gray(0.33f),
+                    Text = match.Round.Value?.Name.Value ?? "Unknown Round",
+                    Font = OsuFont.Torus.With(size: 30, weight: FontWeight.Regular)
+                },
                 new TeamWithPlayers(match.Winner, redWin)
                 {
                     RelativeSizeAxes = Axes.Both,
                     Width = 0.5f,
                     Height = 0.6f,
                     Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre
+                    Origin = Anchor.TopLeft,
+                    Position = new Vector2(78, 0),
                 },
-                new RoundDisplay(match)
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Height = 0.25f,
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.BottomCentre,
-                }
             };
         }
 
-        private class RoundDisplay : CompositeDrawable
-        {
-            public RoundDisplay(TournamentMatch match)
-            {
-                var col = OsuColour.Gray(0.33f);
-
-                InternalChildren = new Drawable[]
-                {
-                    new FillFlowContainer
-                    {
-                        AutoSizeAxes = Axes.Both,
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
-                        Direction = FillDirection.Vertical,
-                        Spacing = new Vector2(0, 10),
-                        Children = new Drawable[]
-                        {
-                            new OsuSpriteText
-                            {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
-                                Colour = col,
-                                Text = "WINNER",
-                                Font = OsuFont.Torus.With(size: 15, weight: FontWeight.Regular),
-                            },
-                            new OsuSpriteText
-                            {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
-                                Colour = col,
-                                Text = match.Round.Value?.Name.Value ?? "Unknown Round",
-                                Font = OsuFont.Torus.With(size: 50, weight: FontWeight.Light),
-                                Spacing = new Vector2(10, 0),
-                            },
-                            new OsuSpriteText
-                            {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
-                                Colour = col,
-                                Text = match.Date.Value.ToUniversalTime().ToString("dd MMMM HH:mm UTC"),
-                                Font = OsuFont.Torus.With(size: 20, weight: FontWeight.Light),
-                            },
-                        }
-                    }
-                };
-            }
-        }
-
         private class TeamWithPlayers : CompositeDrawable
         {
-            private readonly Color4 red = new Color4(129, 68, 65, 255);
-            private readonly Color4 blue = new Color4(41, 91, 97, 255);
-
             public TeamWithPlayers(TournamentTeam team, bool left = false)
             {
-                var colour = left ? red : blue;
+                FillFlowContainer players;
+
+                var colour = left ? TournamentGame.COLOUR_RED : TournamentGame.COLOUR_BLUE;
                 InternalChildren = new Drawable[]
                 {
-                    new TeamDisplay(team, left ? "Team Red" : "Team Blue", colour)
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                    },
                     new FillFlowContainer
                     {
                         Direction = FillDirection.Vertical,
                         AutoSizeAxes = Axes.Both,
-                        Spacing = new Vector2(0, 5),
-                        Padding = new MarginPadding(20),
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        RelativePositionAxes = Axes.Both,
-                    },
-                };
-            }
-
-            private class TeamDisplay : DrawableTournamentTeam
-            {
-                public TeamDisplay(TournamentTeam team, string teamName, Color4 colour)
-                    : base(team)
-                {
-                    AutoSizeAxes = Axes.Both;
-
-                    Flag.Anchor = Flag.Origin = Anchor.TopCentre;
-                    Flag.RelativeSizeAxes = Axes.None;
-                    Flag.Size = new Vector2(300, 200);
-                    Flag.Scale = new Vector2(0.4f);
-                    Flag.Margin = new MarginPadding { Bottom = 20 };
-
-                    InternalChild = new FillFlowContainer
-                    {
-                        AutoSizeAxes = Axes.Both,
-                        Direction = FillDirection.Vertical,
-                        Spacing = new Vector2(0, 5),
                         Children = new Drawable[]
                         {
-                            Flag,
-                            new OsuSpriteText
+                            new TournamentSpriteText
                             {
-                                Text = team?.FullName.Value.ToUpper() ?? "???",
-                                Font = OsuFont.Torus.With(size: 40, weight: FontWeight.Light),
+                                Text = "WINNER",
+                                Font = OsuFont.Torus.With(size: 24, weight: FontWeight.SemiBold),
                                 Colour = Color4.Black,
-                                Origin = Anchor.TopCentre,
-                                Anchor = Anchor.TopCentre,
                             },
-                            new OsuSpriteText
+                            new TournamentSpriteText
                             {
-                                Text = teamName.ToUpper(),
-                                Font = OsuFont.GetFont(size: 20),
-                                Colour = colour,
-                                Origin = Anchor.TopCentre,
-                                Anchor = Anchor.TopCentre,
-                            }
+                                Text = team?.FullName.Value ?? "???",
+                                Font = OsuFont.Torus.With(size: 30, weight: FontWeight.SemiBold),
+                                Colour = Color4.Black,
+                            },
+                            players = new FillFlowContainer
+                            {
+                                Direction = FillDirection.Vertical,
+                                AutoSizeAxes = Axes.Both,
+                                Padding = new MarginPadding { Top = 10 },
+                            },
                         }
-                    };
+                    },
+                };
+
+                if (team != null)
+                {
+                    foreach (var p in team.Players)
+                    {
+                        players.Add(new TournamentSpriteText
+                        {
+                            Text = p.Username,
+                            Font = OsuFont.Torus.With(size: 24),
+                            Colour = colour,
+                            Anchor = left ? Anchor.CentreRight : Anchor.CentreLeft,
+                            Origin = left ? Anchor.CentreRight : Anchor.CentreLeft,
+                        });
+                    }
                 }
             }
         }
+
+        private class TeamFlagDisplay : DrawableTournamentTeam
+        {
+            public TeamFlagDisplay(TournamentTeam team)
+                : base(team)
+            {
+                InternalChildren = new Drawable[]
+                {
+                    Flag
+                };
+            }
+        }
     }
 }
diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index 7dbcf37af6..608fc5f04a 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.cs
@@ -3,11 +3,15 @@
 
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Cursor;
+using osuTK.Graphics;
 
 namespace osu.Game.Tournament
 {
     public class TournamentGame : TournamentGameBase
     {
+        public static readonly Color4 COLOUR_RED = new Color4(144, 0, 0, 255);
+        public static readonly Color4 COLOUR_BLUE = new Color4(0, 84, 144, 255);
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 64a5618d73..435f315c8d 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -18,7 +18,6 @@ using osu.Framework.IO.Stores;
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API.Requests;
 using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Models;
@@ -101,10 +100,10 @@ namespace osu.Game.Tournament
                             Colour = Color4.Red,
                             RelativeSizeAxes = Axes.Both,
                         },
-                        new OsuSpriteText
+                        new TournamentSpriteText
                         {
                             Text = "Please make the window wider",
-                            Font = OsuFont.Default.With(weight: "bold"),
+                            Font = OsuFont.Torus.With(weight: FontWeight.Bold),
                             Colour = Color4.White,
                             Padding = new MarginPadding(20)
                         }

From 8dcdd6db6fc39b1e33a65675a5eb4c8cdccde8e5 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 3 Mar 2020 16:20:36 +0300
Subject: [PATCH 0840/1142] Rename UpdateStream components to
 ChangelogUpdateStream

---
 .../Visual/Online/TestSceneChangelogOverlay.cs         |  4 ++--
 osu.Game/Overlays/Changelog/ChangelogHeader.cs         |  4 ++--
 ...ateStreamBadge.cs => ChangelogUpdateStreamBadge.cs} |  4 ++--
 ...mBadgeArea.cs => ChangelogUpdateStreamBadgeArea.cs} | 10 +++++-----
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename osu.Game/Overlays/Changelog/{UpdateStreamBadge.cs => ChangelogUpdateStreamBadge.cs} (97%)
 rename osu.Game/Overlays/Changelog/{UpdateStreamBadgeArea.cs => ChangelogUpdateStreamBadgeArea.cs} (84%)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
index 7a8570c09b..530a486de8 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
@@ -17,8 +17,8 @@ namespace osu.Game.Tests.Visual.Online
 
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
-            typeof(UpdateStreamBadgeArea),
-            typeof(UpdateStreamBadge),
+            typeof(ChangelogUpdateStreamBadgeArea),
+            typeof(ChangelogUpdateStreamBadge),
             typeof(ChangelogHeader),
             typeof(ChangelogContent),
             typeof(ChangelogListing),
diff --git a/osu.Game/Overlays/Changelog/ChangelogHeader.cs b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
index dcadbf4cf5..0667bedfc6 100644
--- a/osu.Game/Overlays/Changelog/ChangelogHeader.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Changelog
 
         public Action ListingSelected;
 
-        public UpdateStreamBadgeArea Streams;
+        public ChangelogUpdateStreamBadgeArea Streams;
 
         private const string listing_string = "listing";
 
@@ -95,7 +95,7 @@ namespace osu.Game.Overlays.Changelog
                         Horizontal = 65,
                         Vertical = 20
                     },
-                    Child = Streams = new UpdateStreamBadgeArea()
+                    Child = Streams = new ChangelogUpdateStreamBadgeArea()
                 }
             }
         };
diff --git a/osu.Game/Overlays/Changelog/UpdateStreamBadge.cs b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamBadge.cs
similarity index 97%
rename from osu.Game/Overlays/Changelog/UpdateStreamBadge.cs
rename to osu.Game/Overlays/Changelog/ChangelogUpdateStreamBadge.cs
index 6786bbc49f..20cc564013 100644
--- a/osu.Game/Overlays/Changelog/UpdateStreamBadge.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamBadge.cs
@@ -17,7 +17,7 @@ using osuTK;
 
 namespace osu.Game.Overlays.Changelog
 {
-    public class UpdateStreamBadge : TabItem<APIUpdateStream>
+    public class ChangelogUpdateStreamBadge : TabItem<APIUpdateStream>
     {
         private const float badge_width = 100;
         private const float transition_duration = 100;
@@ -29,7 +29,7 @@ namespace osu.Game.Overlays.Changelog
         private FillFlowContainer<SpriteText> text;
         private ExpandingBar expandingBar;
 
-        public UpdateStreamBadge(APIUpdateStream stream)
+        public ChangelogUpdateStreamBadge(APIUpdateStream stream)
             : base(stream)
         {
             this.stream = stream;
diff --git a/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamBadgeArea.cs
similarity index 84%
rename from osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs
rename to osu.Game/Overlays/Changelog/ChangelogUpdateStreamBadgeArea.cs
index ffb622dd37..5ab86a72f3 100644
--- a/osu.Game/Overlays/Changelog/UpdateStreamBadgeArea.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamBadgeArea.cs
@@ -10,9 +10,9 @@ using osu.Framework.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Changelog
 {
-    public class UpdateStreamBadgeArea : TabControl<APIUpdateStream>
+    public class ChangelogUpdateStreamBadgeArea : TabControl<APIUpdateStream>
     {
-        public UpdateStreamBadgeArea()
+        public ChangelogUpdateStreamBadgeArea()
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
@@ -26,7 +26,7 @@ namespace osu.Game.Overlays.Changelog
 
         protected override bool OnHover(HoverEvent e)
         {
-            foreach (var streamBadge in TabContainer.Children.OfType<UpdateStreamBadge>())
+            foreach (var streamBadge in TabContainer.Children.OfType<ChangelogUpdateStreamBadge>())
                 streamBadge.UserHoveringArea = true;
 
             return base.OnHover(e);
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Changelog
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            foreach (var streamBadge in TabContainer.Children.OfType<UpdateStreamBadge>())
+            foreach (var streamBadge in TabContainer.Children.OfType<ChangelogUpdateStreamBadge>())
                 streamBadge.UserHoveringArea = false;
 
             base.OnHoverLost(e);
@@ -50,6 +50,6 @@ namespace osu.Game.Overlays.Changelog
         protected override Dropdown<APIUpdateStream> CreateDropdown() => null;
 
         protected override TabItem<APIUpdateStream> CreateTabItem(APIUpdateStream value) =>
-            new UpdateStreamBadge(value) { SelectedTab = { BindTarget = Current } };
+            new ChangelogUpdateStreamBadge(value) { SelectedTab = { BindTarget = Current } };
     }
 }

From db56fb57594ad14d1713c68778d207c21a3892e0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 3 Mar 2020 22:28:47 +0900
Subject: [PATCH 0841/1142] Fix venera font usage

---
 osu.Game/Graphics/OsuFont.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/OsuFont.cs b/osu.Game/Graphics/OsuFont.cs
index 54a25875bf..113816a14a 100644
--- a/osu.Game/Graphics/OsuFont.cs
+++ b/osu.Game/Graphics/OsuFont.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Graphics
         /// </summary>
         public static FontUsage Default => GetFont();
 
-        public static FontUsage Numeric => GetFont(Typeface.Venera, weight: FontWeight.Regular);
+        public static FontUsage Numeric => GetFont(Typeface.Venera);
 
         public static FontUsage Torus => GetFont(Typeface.Torus, weight: FontWeight.Regular);
 

From 937d9da43b183104f4cca9a4de427922a960bf37 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 3 Mar 2020 17:01:58 +0300
Subject: [PATCH 0842/1142] Implement OverlayUpdateStreamControl component

---
 .../Online/TestSceneChangelogOverlay.cs       |  4 +-
 .../Overlays/Changelog/ChangelogHeader.cs     |  4 +-
 .../Changelog/ChangelogUpdateStreamControl.cs | 12 +++
 .../Changelog/ChangelogUpdateStreamItem.cs    | 25 ++++++
 ...eArea.cs => OverlayUpdateStreamControl.cs} | 53 ++++++------
 ...eamBadge.cs => OverlayUpdateStreamItem.cs} | 80 ++++++++++---------
 6 files changed, 111 insertions(+), 67 deletions(-)
 create mode 100644 osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
 create mode 100644 osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs
 rename osu.Game/Overlays/{Changelog/ChangelogUpdateStreamBadgeArea.cs => OverlayUpdateStreamControl.cs} (61%)
 rename osu.Game/Overlays/{Changelog/ChangelogUpdateStreamBadge.cs => OverlayUpdateStreamItem.cs} (78%)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
index 530a486de8..864fd31a0f 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChangelogOverlay.cs
@@ -17,8 +17,8 @@ namespace osu.Game.Tests.Visual.Online
 
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
-            typeof(ChangelogUpdateStreamBadgeArea),
-            typeof(ChangelogUpdateStreamBadge),
+            typeof(ChangelogUpdateStreamControl),
+            typeof(ChangelogUpdateStreamItem),
             typeof(ChangelogHeader),
             typeof(ChangelogContent),
             typeof(ChangelogListing),
diff --git a/osu.Game/Overlays/Changelog/ChangelogHeader.cs b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
index 0667bedfc6..532efeb4bd 100644
--- a/osu.Game/Overlays/Changelog/ChangelogHeader.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogHeader.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Changelog
 
         public Action ListingSelected;
 
-        public ChangelogUpdateStreamBadgeArea Streams;
+        public ChangelogUpdateStreamControl Streams;
 
         private const string listing_string = "listing";
 
@@ -95,7 +95,7 @@ namespace osu.Game.Overlays.Changelog
                         Horizontal = 65,
                         Vertical = 20
                     },
-                    Child = Streams = new ChangelogUpdateStreamBadgeArea()
+                    Child = Streams = new ChangelogUpdateStreamControl()
                 }
             }
         };
diff --git a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
new file mode 100644
index 0000000000..555f0904d6
--- /dev/null
+++ b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
@@ -0,0 +1,12 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Online.API.Requests.Responses;
+
+namespace osu.Game.Overlays.Changelog
+{
+    public class ChangelogUpdateStreamControl : OverlayUpdateStreamControl<APIUpdateStream>
+    {
+        protected override OverlayUpdateStreamItem<APIUpdateStream> CreateStreamItem(APIUpdateStream value) => new ChangelogUpdateStreamItem(value);
+    }
+}
diff --git a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs
new file mode 100644
index 0000000000..6a4801bc4b
--- /dev/null
+++ b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.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 Humanizer;
+using osu.Game.Online.API.Requests.Responses;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.Changelog
+{
+    public class ChangelogUpdateStreamItem : OverlayUpdateStreamItem<APIUpdateStream>
+    {
+        public ChangelogUpdateStreamItem(APIUpdateStream stream)
+            : base(stream)
+        {
+        }
+
+        protected override string GetMainText() => Value.DisplayName;
+
+        protected override string GetAdditionalText() => Value.LatestBuild.DisplayVersion;
+
+        protected override string GetInfoText() => Value.LatestBuild.Users > 0 ? $"{"user".ToQuantity(Value.LatestBuild.Users, "N0")} online" : null;
+
+        protected override Color4 GetBarColour() => Value.Colour;
+    }
+}
diff --git a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamBadgeArea.cs b/osu.Game/Overlays/OverlayUpdateStreamControl.cs
similarity index 61%
rename from osu.Game/Overlays/Changelog/ChangelogUpdateStreamBadgeArea.cs
rename to osu.Game/Overlays/OverlayUpdateStreamControl.cs
index 5ab86a72f3..0fdf6c0111 100644
--- a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamBadgeArea.cs
+++ b/osu.Game/Overlays/OverlayUpdateStreamControl.cs
@@ -3,42 +3,32 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
-using osu.Game.Online.API.Requests.Responses;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Graphics.UserInterface;
+using JetBrains.Annotations;
 
-namespace osu.Game.Overlays.Changelog
+namespace osu.Game.Overlays
 {
-    public class ChangelogUpdateStreamBadgeArea : TabControl<APIUpdateStream>
+    public abstract class OverlayUpdateStreamControl<T> : TabControl<T>
     {
-        public ChangelogUpdateStreamBadgeArea()
+        protected OverlayUpdateStreamControl()
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
         }
 
-        public void Populate(List<APIUpdateStream> streams)
+        public void Populate(List<T> streams) => streams.ForEach(AddItem);
+
+        protected override Dropdown<T> CreateDropdown() => null;
+
+        protected override TabItem<T> CreateTabItem(T value) => CreateStreamItem(value).With(item =>
         {
-            foreach (var updateStream in streams)
-                AddItem(updateStream);
-        }
+            item.SelectedItem.BindTo(Current);
+        });
 
-        protected override bool OnHover(HoverEvent e)
-        {
-            foreach (var streamBadge in TabContainer.Children.OfType<ChangelogUpdateStreamBadge>())
-                streamBadge.UserHoveringArea = true;
-
-            return base.OnHover(e);
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            foreach (var streamBadge in TabContainer.Children.OfType<ChangelogUpdateStreamBadge>())
-                streamBadge.UserHoveringArea = false;
-
-            base.OnHoverLost(e);
-        }
+        [NotNull]
+        protected abstract OverlayUpdateStreamItem<T> CreateStreamItem(T value);
 
         protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
         {
@@ -47,9 +37,20 @@ namespace osu.Game.Overlays.Changelog
             AllowMultiline = true,
         };
 
-        protected override Dropdown<APIUpdateStream> CreateDropdown() => null;
+        protected override bool OnHover(HoverEvent e)
+        {
+            foreach (var streamBadge in TabContainer.Children.OfType<OverlayUpdateStreamItem<T>>())
+                streamBadge.UserHoveringArea = true;
 
-        protected override TabItem<APIUpdateStream> CreateTabItem(APIUpdateStream value) =>
-            new ChangelogUpdateStreamBadge(value) { SelectedTab = { BindTarget = Current } };
+            return base.OnHover(e);
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            foreach (var streamBadge in TabContainer.Children.OfType<OverlayUpdateStreamItem<T>>())
+                streamBadge.UserHoveringArea = false;
+
+            base.OnHoverLost(e);
+        }
     }
 }
diff --git a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamBadge.cs b/osu.Game/Overlays/OverlayUpdateStreamItem.cs
similarity index 78%
rename from osu.Game/Overlays/Changelog/ChangelogUpdateStreamBadge.cs
rename to osu.Game/Overlays/OverlayUpdateStreamItem.cs
index 20cc564013..5014aac5b0 100644
--- a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamBadge.cs
+++ b/osu.Game/Overlays/OverlayUpdateStreamItem.cs
@@ -1,44 +1,54 @@
 // 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 Humanizer;
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
-using osu.Game.Graphics;
-using osu.Game.Online.API.Requests.Responses;
 using osu.Framework.Graphics.UserInterface;
-using osu.Game.Graphics.Sprites;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Allocation;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics;
 using osuTK;
+using osuTK.Graphics;
 
-namespace osu.Game.Overlays.Changelog
+namespace osu.Game.Overlays
 {
-    public class ChangelogUpdateStreamBadge : TabItem<APIUpdateStream>
+    public abstract class OverlayUpdateStreamItem<T> : TabItem<T>
     {
-        private const float badge_width = 100;
         private const float transition_duration = 100;
+        private const float tab_width = 100;
 
-        public readonly Bindable<APIUpdateStream> SelectedTab = new Bindable<APIUpdateStream>();
+        public readonly Bindable<T> SelectedItem = new Bindable<T>();
 
-        private readonly APIUpdateStream stream;
+        private bool userHoveringArea;
+
+        public bool UserHoveringArea
+        {
+            set
+            {
+                if (value == userHoveringArea)
+                    return;
+
+                userHoveringArea = value;
+                updateState();
+            }
+        }
 
         private FillFlowContainer<SpriteText> text;
         private ExpandingBar expandingBar;
 
-        public ChangelogUpdateStreamBadge(APIUpdateStream stream)
-            : base(stream)
+        public OverlayUpdateStreamItem(T value)
+            : base(value)
         {
-            this.stream = stream;
         }
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider)
         {
-            Size = new Vector2(stream.IsFeatured ? badge_width * 2 : badge_width, 60);
+            Size = new Vector2(GetWidth(), 60);
             Padding = new MarginPadding(5);
 
             AddRange(new Drawable[]
@@ -52,17 +62,17 @@ namespace osu.Game.Overlays.Changelog
                     {
                         new OsuSpriteText
                         {
-                            Text = stream.DisplayName,
+                            Text = GetMainText(),
                             Font = OsuFont.GetFont(size: 12, weight: FontWeight.Black),
                         },
                         new OsuSpriteText
                         {
-                            Text = stream.LatestBuild.DisplayVersion,
+                            Text = GetAdditionalText(),
                             Font = OsuFont.GetFont(size: 16, weight: FontWeight.Regular),
                         },
                         new OsuSpriteText
                         {
-                            Text = stream.LatestBuild.Users > 0 ? $"{"user".ToQuantity(stream.LatestBuild.Users, "N0")} online" : null,
+                            Text = GetInfoText(),
                             Font = OsuFont.GetFont(size: 10),
                             Colour = colourProvider.Foreground1
                         },
@@ -71,7 +81,7 @@ namespace osu.Game.Overlays.Changelog
                 expandingBar = new ExpandingBar
                 {
                     Anchor = Anchor.TopCentre,
-                    Colour = stream.Colour,
+                    Colour = GetBarColour(),
                     ExpandedSize = 4,
                     CollapsedSize = 2,
                     Expanded = true
@@ -79,9 +89,19 @@ namespace osu.Game.Overlays.Changelog
                 new HoverClickSounds()
             });
 
-            SelectedTab.BindValueChanged(_ => updateState(), true);
+            SelectedItem.BindValueChanged(_ => updateState(), true);
         }
 
+        protected abstract string GetMainText();
+
+        protected abstract string GetAdditionalText();
+
+        protected virtual string GetInfoText() => string.Empty;
+
+        protected abstract Color4 GetBarColour();
+
+        protected virtual float GetWidth() => tab_width;
+
         protected override void OnActivated() => updateState();
 
         protected override void OnDeactivated() => updateState();
@@ -104,7 +124,7 @@ namespace osu.Game.Overlays.Changelog
             bool textHighlighted = IsHovered;
             bool barExpanded = IsHovered;
 
-            if (SelectedTab.Value == null)
+            if (SelectedItem.Value == null)
             {
                 // at listing, all badges are highlighted when user is not hovering any badge.
                 textHighlighted |= !userHoveringArea;
@@ -122,19 +142,5 @@ namespace osu.Game.Overlays.Changelog
             expandingBar.Expanded = barExpanded;
             text.FadeTo(textHighlighted ? 1 : 0.5f, transition_duration, Easing.OutQuint);
         }
-
-        private bool userHoveringArea;
-
-        public bool UserHoveringArea
-        {
-            set
-            {
-                if (value == userHoveringArea)
-                    return;
-
-                userHoveringArea = value;
-                updateState();
-            }
-        }
     }
 }

From c0f7a83f6f3d4aaab9ce0d4d9ee2ae9674d238de Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 3 Mar 2020 17:10:25 +0300
Subject: [PATCH 0843/1142] Fix featured stream item width

---
 osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs
index 6a4801bc4b..b796348242 100644
--- a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs
@@ -14,6 +14,14 @@ namespace osu.Game.Overlays.Changelog
         {
         }
 
+        protected override float GetWidth()
+        {
+            if (Value.IsFeatured)
+                return base.GetWidth() * 2;
+
+            return base.GetWidth();
+        }
+
         protected override string GetMainText() => Value.DisplayName;
 
         protected override string GetAdditionalText() => Value.LatestBuild.DisplayVersion;

From 160d64eecf1cff32ed662fbfcbc129fcfe2b928f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 3 Mar 2020 17:37:01 +0300
Subject: [PATCH 0844/1142] FriendsOnlineStatusControl basic implementation

---
 .../TestSceneFriendsOnlineStatusControl.cs    | 52 +++++++++++++++++++
 .../Overlays/Home/Friends/FriendsBundle.cs    | 48 +++++++++++++++++
 .../Friends/FriendsOnlineStatusControl.cs     | 10 ++++
 .../Home/Friends/FriendsOnlineStatusItem.cs   | 21 ++++++++
 4 files changed, 131 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
 create mode 100644 osu.Game/Overlays/Home/Friends/FriendsBundle.cs
 create mode 100644 osu.Game/Overlays/Home/Friends/FriendsOnlineStatusControl.cs
 create mode 100644 osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
new file mode 100644
index 0000000000..bb64593088
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.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 System;
+using System.Collections.Generic;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Overlays;
+using osu.Game.Overlays.Home.Friends;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneFriendsOnlineStatusControl : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(FriendsOnlineStatusControl),
+            typeof(FriendsOnlineStatusItem),
+            typeof(OverlayUpdateStreamControl<>),
+            typeof(OverlayUpdateStreamItem<>),
+            typeof(FriendsBundle)
+        };
+
+        [Cached]
+        private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+
+        private FriendsOnlineStatusControl control;
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
+        {
+            Clear();
+            Add(control = new FriendsOnlineStatusControl
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            });
+        });
+
+        [Test]
+        public void Populate()
+        {
+            AddStep(@"Populate", () => control.Populate(new List<FriendsBundle>
+            {
+                new FriendsBundle(FriendsOnlineStatus.All, 100),
+                new FriendsBundle(FriendsOnlineStatus.Online, 50),
+                new FriendsBundle(FriendsOnlineStatus.Offline, 50),
+            }));
+        }
+    }
+}
diff --git a/osu.Game/Overlays/Home/Friends/FriendsBundle.cs b/osu.Game/Overlays/Home/Friends/FriendsBundle.cs
new file mode 100644
index 0000000000..e0f841da9a
--- /dev/null
+++ b/osu.Game/Overlays/Home/Friends/FriendsBundle.cs
@@ -0,0 +1,48 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.Home.Friends
+{
+    public class FriendsBundle
+    {
+        public FriendsOnlineStatus Status { get; }
+
+        public int Amount { get; }
+
+        public Color4 Colour => getColour();
+
+        public FriendsBundle(FriendsOnlineStatus status, int amount)
+        {
+            Status = status;
+            Amount = amount;
+        }
+
+        private Color4 getColour()
+        {
+            switch (Status)
+            {
+                default:
+                    throw new ArgumentException($@"{Status} status does not provide a colour in {nameof(getColour)}.");
+
+                case FriendsOnlineStatus.All:
+                    return Color4.White;
+
+                case FriendsOnlineStatus.Online:
+                    return Color4.Lime;
+
+                case FriendsOnlineStatus.Offline:
+                    return Color4.Black;
+            }
+        }
+    }
+
+    public enum FriendsOnlineStatus
+    {
+        All,
+        Online,
+        Offline
+    }
+}
diff --git a/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusControl.cs b/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusControl.cs
new file mode 100644
index 0000000000..abcd04bb0e
--- /dev/null
+++ b/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusControl.cs
@@ -0,0 +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.
+
+namespace osu.Game.Overlays.Home.Friends
+{
+    public class FriendsOnlineStatusControl : OverlayUpdateStreamControl<FriendsBundle>
+    {
+        protected override OverlayUpdateStreamItem<FriendsBundle> CreateStreamItem(FriendsBundle value) => new FriendsOnlineStatusItem(value);
+    }
+}
diff --git a/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs b/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs
new file mode 100644
index 0000000000..0c77ef20b9
--- /dev/null
+++ b/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs
@@ -0,0 +1,21 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.Home.Friends
+{
+    public class FriendsOnlineStatusItem : OverlayUpdateStreamItem<FriendsBundle>
+    {
+        public FriendsOnlineStatusItem(FriendsBundle value)
+            : base(value)
+        {
+        }
+
+        protected override string GetMainText() => Value.Status.ToString();
+
+        protected override string GetAdditionalText() => Value.Amount.ToString();
+
+        protected override Color4 GetBarColour() => Value.Colour;
+    }
+}

From 83dad93b6d499555d8c015049599dc3df153dff6 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 3 Mar 2020 18:08:51 +0300
Subject: [PATCH 0845/1142] Make Populate() accept list of users

---
 .../TestSceneFriendsOnlineStatusControl.cs    | 23 +++++++++++++++----
 .../Friends/FriendsOnlineStatusControl.cs     | 16 +++++++++++++
 osu.Game/Overlays/OverlayUpdateStreamItem.cs  |  2 +-
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
index bb64593088..87e7d848a8 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
@@ -3,11 +3,13 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Home.Friends;
+using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
@@ -41,12 +43,25 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Test]
         public void Populate()
         {
-            AddStep(@"Populate", () => control.Populate(new List<FriendsBundle>
+            AddStep("Populate", () => control.Populate(new List<User>
             {
-                new FriendsBundle(FriendsOnlineStatus.All, 100),
-                new FriendsBundle(FriendsOnlineStatus.Online, 50),
-                new FriendsBundle(FriendsOnlineStatus.Offline, 50),
+                new User
+                {
+                    IsOnline = true
+                },
+                new User
+                {
+                    IsOnline = false
+                },
+                new User
+                {
+                    IsOnline = false
+                }
             }));
+
+            AddAssert("3 users", () => control.Items.FirstOrDefault(item => item.Status == FriendsOnlineStatus.All)?.Amount == 3);
+            AddAssert("1 online user", () => control.Items.FirstOrDefault(item => item.Status == FriendsOnlineStatus.Online)?.Amount == 1);
+            AddAssert("2 offline users", () => control.Items.FirstOrDefault(item => item.Status == FriendsOnlineStatus.Offline)?.Amount == 2);
         }
     }
 }
diff --git a/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusControl.cs b/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusControl.cs
index abcd04bb0e..a92de9dbeb 100644
--- a/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusControl.cs
+++ b/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusControl.cs
@@ -1,10 +1,26 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
+using System.Linq;
+using osu.Game.Users;
+
 namespace osu.Game.Overlays.Home.Friends
 {
     public class FriendsOnlineStatusControl : OverlayUpdateStreamControl<FriendsBundle>
     {
         protected override OverlayUpdateStreamItem<FriendsBundle> CreateStreamItem(FriendsBundle value) => new FriendsOnlineStatusItem(value);
+
+        public void Populate(List<User> users)
+        {
+            var userCount = users.Count;
+            var onlineUsersCount = users.Count(user => user.IsOnline);
+
+            AddItem(new FriendsBundle(FriendsOnlineStatus.All, userCount));
+            AddItem(new FriendsBundle(FriendsOnlineStatus.Online, onlineUsersCount));
+            AddItem(new FriendsBundle(FriendsOnlineStatus.Offline, userCount - onlineUsersCount));
+
+            Current.Value = Items.FirstOrDefault();
+        }
     }
 }
diff --git a/osu.Game/Overlays/OverlayUpdateStreamItem.cs b/osu.Game/Overlays/OverlayUpdateStreamItem.cs
index 5014aac5b0..bf8e6ac3b9 100644
--- a/osu.Game/Overlays/OverlayUpdateStreamItem.cs
+++ b/osu.Game/Overlays/OverlayUpdateStreamItem.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Overlays
         private FillFlowContainer<SpriteText> text;
         private ExpandingBar expandingBar;
 
-        public OverlayUpdateStreamItem(T value)
+        protected OverlayUpdateStreamItem(T value)
             : base(value)
         {
         }

From 06b23b626ecaab8754c602087e9af752979e51f2 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 4 Mar 2020 00:15:10 +0300
Subject: [PATCH 0846/1142] Simplify test scene setup

---
 .../TestSceneFriendsOnlineStatusControl.cs             | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
index 87e7d848a8..614e99ee0e 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
@@ -30,14 +30,10 @@ namespace osu.Game.Tests.Visual.UserInterface
         private FriendsOnlineStatusControl control;
 
         [SetUp]
-        public void SetUp() => Schedule(() =>
+        public void SetUp() => Schedule(() => Child = control = new FriendsOnlineStatusControl
         {
-            Clear();
-            Add(control = new FriendsOnlineStatusControl
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-            });
+            Anchor = Anchor.Centre,
+            Origin = Anchor.Centre,
         });
 
         [Test]

From c22f61b2b1ad9ec6663727b79eddb3616d9799f3 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 4 Mar 2020 00:28:47 +0300
Subject: [PATCH 0847/1142] Move colour selection to the
 FriendsOnlineStatusItem

---
 .../Changelog/ChangelogUpdateStreamItem.cs    |  3 ++-
 .../Overlays/Home/Friends/FriendsBundle.cs    | 23 -------------------
 .../Home/Friends/FriendsOnlineStatusItem.cs   | 20 +++++++++++++++-
 osu.Game/Overlays/OverlayUpdateStreamItem.cs  |  6 ++---
 4 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs
index b796348242..189c156b35 100644
--- a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using Humanizer;
+using osu.Game.Graphics;
 using osu.Game.Online.API.Requests.Responses;
 using osuTK.Graphics;
 
@@ -28,6 +29,6 @@ namespace osu.Game.Overlays.Changelog
 
         protected override string GetInfoText() => Value.LatestBuild.Users > 0 ? $"{"user".ToQuantity(Value.LatestBuild.Users, "N0")} online" : null;
 
-        protected override Color4 GetBarColour() => Value.Colour;
+        protected override Color4 GetBarColour(OsuColour colours) => Value.Colour;
     }
 }
diff --git a/osu.Game/Overlays/Home/Friends/FriendsBundle.cs b/osu.Game/Overlays/Home/Friends/FriendsBundle.cs
index e0f841da9a..aa403feffc 100644
--- a/osu.Game/Overlays/Home/Friends/FriendsBundle.cs
+++ b/osu.Game/Overlays/Home/Friends/FriendsBundle.cs
@@ -1,9 +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 osuTK.Graphics;
-
 namespace osu.Game.Overlays.Home.Friends
 {
     public class FriendsBundle
@@ -12,31 +9,11 @@ namespace osu.Game.Overlays.Home.Friends
 
         public int Amount { get; }
 
-        public Color4 Colour => getColour();
-
         public FriendsBundle(FriendsOnlineStatus status, int amount)
         {
             Status = status;
             Amount = amount;
         }
-
-        private Color4 getColour()
-        {
-            switch (Status)
-            {
-                default:
-                    throw new ArgumentException($@"{Status} status does not provide a colour in {nameof(getColour)}.");
-
-                case FriendsOnlineStatus.All:
-                    return Color4.White;
-
-                case FriendsOnlineStatus.Online:
-                    return Color4.Lime;
-
-                case FriendsOnlineStatus.Offline:
-                    return Color4.Black;
-            }
-        }
     }
 
     public enum FriendsOnlineStatus
diff --git a/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs b/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs
index 0c77ef20b9..bd480aebe8 100644
--- a/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs
+++ b/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
+using osu.Game.Graphics;
 using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Home.Friends
@@ -16,6 +18,22 @@ namespace osu.Game.Overlays.Home.Friends
 
         protected override string GetAdditionalText() => Value.Amount.ToString();
 
-        protected override Color4 GetBarColour() => Value.Colour;
+        protected override Color4 GetBarColour(OsuColour colours)
+        {
+            switch (Value.Status)
+            {
+                default:
+                    throw new ArgumentException($@"{Value.Status} status does not provide a colour in {nameof(GetBarColour)}.");
+
+                case FriendsOnlineStatus.All:
+                    return Color4.White;
+
+                case FriendsOnlineStatus.Online:
+                    return colours.GreenLight;
+
+                case FriendsOnlineStatus.Offline:
+                    return Color4.Black;
+            }
+        }
     }
 }
diff --git a/osu.Game/Overlays/OverlayUpdateStreamItem.cs b/osu.Game/Overlays/OverlayUpdateStreamItem.cs
index bf8e6ac3b9..ce9aca6f1f 100644
--- a/osu.Game/Overlays/OverlayUpdateStreamItem.cs
+++ b/osu.Game/Overlays/OverlayUpdateStreamItem.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Overlays
         }
 
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        private void load(OverlayColourProvider colourProvider, OsuColour colours)
         {
             Size = new Vector2(GetWidth(), 60);
             Padding = new MarginPadding(5);
@@ -81,7 +81,7 @@ namespace osu.Game.Overlays
                 expandingBar = new ExpandingBar
                 {
                     Anchor = Anchor.TopCentre,
-                    Colour = GetBarColour(),
+                    Colour = GetBarColour(colours),
                     ExpandedSize = 4,
                     CollapsedSize = 2,
                     Expanded = true
@@ -98,7 +98,7 @@ namespace osu.Game.Overlays
 
         protected virtual string GetInfoText() => string.Empty;
 
-        protected abstract Color4 GetBarColour();
+        protected abstract Color4 GetBarColour(OsuColour colours);
 
         protected virtual float GetWidth() => tab_width;
 

From 4d5445b5dc63d8b2c3ff889c70cd5f573b37d25d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 4 Mar 2020 00:31:06 +0300
Subject: [PATCH 0848/1142] Rename Amount to Count

---
 .../UserInterface/TestSceneFriendsOnlineStatusControl.cs    | 6 +++---
 osu.Game/Overlays/Home/Friends/FriendsBundle.cs             | 6 +++---
 osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs   | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
index 614e99ee0e..45f8a029a8 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
@@ -55,9 +55,9 @@ namespace osu.Game.Tests.Visual.UserInterface
                 }
             }));
 
-            AddAssert("3 users", () => control.Items.FirstOrDefault(item => item.Status == FriendsOnlineStatus.All)?.Amount == 3);
-            AddAssert("1 online user", () => control.Items.FirstOrDefault(item => item.Status == FriendsOnlineStatus.Online)?.Amount == 1);
-            AddAssert("2 offline users", () => control.Items.FirstOrDefault(item => item.Status == FriendsOnlineStatus.Offline)?.Amount == 2);
+            AddAssert("3 users", () => control.Items.FirstOrDefault(item => item.Status == FriendsOnlineStatus.All)?.Count == 3);
+            AddAssert("1 online user", () => control.Items.FirstOrDefault(item => item.Status == FriendsOnlineStatus.Online)?.Count == 1);
+            AddAssert("2 offline users", () => control.Items.FirstOrDefault(item => item.Status == FriendsOnlineStatus.Offline)?.Count == 2);
         }
     }
 }
diff --git a/osu.Game/Overlays/Home/Friends/FriendsBundle.cs b/osu.Game/Overlays/Home/Friends/FriendsBundle.cs
index aa403feffc..75d00dfef8 100644
--- a/osu.Game/Overlays/Home/Friends/FriendsBundle.cs
+++ b/osu.Game/Overlays/Home/Friends/FriendsBundle.cs
@@ -7,12 +7,12 @@ namespace osu.Game.Overlays.Home.Friends
     {
         public FriendsOnlineStatus Status { get; }
 
-        public int Amount { get; }
+        public int Count { get; }
 
-        public FriendsBundle(FriendsOnlineStatus status, int amount)
+        public FriendsBundle(FriendsOnlineStatus status, int count)
         {
             Status = status;
-            Amount = amount;
+            Count = count;
         }
     }
 
diff --git a/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs b/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs
index bd480aebe8..4043c72bc4 100644
--- a/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs
+++ b/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Home.Friends
 
         protected override string GetMainText() => Value.Status.ToString();
 
-        protected override string GetAdditionalText() => Value.Amount.ToString();
+        protected override string GetAdditionalText() => Value.Count.ToString();
 
         protected override Color4 GetBarColour(OsuColour colours)
         {

From 17f2baf600fd703a1f6769bbc08c9298019eb07a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 4 Mar 2020 00:35:32 +0300
Subject: [PATCH 0849/1142] Remove GetWidth function

---
 .../Changelog/ChangelogUpdateStreamItem.cs         | 10 ++--------
 osu.Game/Overlays/OverlayUpdateStreamItem.cs       | 14 ++++----------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs
index 189c156b35..5a16fc8ddf 100644
--- a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs
@@ -13,14 +13,8 @@ namespace osu.Game.Overlays.Changelog
         public ChangelogUpdateStreamItem(APIUpdateStream stream)
             : base(stream)
         {
-        }
-
-        protected override float GetWidth()
-        {
-            if (Value.IsFeatured)
-                return base.GetWidth() * 2;
-
-            return base.GetWidth();
+            if (stream.IsFeatured)
+                Width *= 2; 
         }
 
         protected override string GetMainText() => Value.DisplayName;
diff --git a/osu.Game/Overlays/OverlayUpdateStreamItem.cs b/osu.Game/Overlays/OverlayUpdateStreamItem.cs
index ce9aca6f1f..0cdf894f73 100644
--- a/osu.Game/Overlays/OverlayUpdateStreamItem.cs
+++ b/osu.Game/Overlays/OverlayUpdateStreamItem.cs
@@ -11,16 +11,12 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Allocation;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
     public abstract class OverlayUpdateStreamItem<T> : TabItem<T>
     {
-        private const float transition_duration = 100;
-        private const float tab_width = 100;
-
         public readonly Bindable<T> SelectedItem = new Bindable<T>();
 
         private bool userHoveringArea;
@@ -43,14 +39,14 @@ namespace osu.Game.Overlays
         protected OverlayUpdateStreamItem(T value)
             : base(value)
         {
+            Height = 60;
+            Width = 100;
+            Padding = new MarginPadding(5);
         }
 
         [BackgroundDependencyLoader]
         private void load(OverlayColourProvider colourProvider, OsuColour colours)
         {
-            Size = new Vector2(GetWidth(), 60);
-            Padding = new MarginPadding(5);
-
             AddRange(new Drawable[]
             {
                 text = new FillFlowContainer<SpriteText>
@@ -100,8 +96,6 @@ namespace osu.Game.Overlays
 
         protected abstract Color4 GetBarColour(OsuColour colours);
 
-        protected virtual float GetWidth() => tab_width;
-
         protected override void OnActivated() => updateState();
 
         protected override void OnDeactivated() => updateState();
@@ -140,7 +134,7 @@ namespace osu.Game.Overlays
             }
 
             expandingBar.Expanded = barExpanded;
-            text.FadeTo(textHighlighted ? 1 : 0.5f, transition_duration, Easing.OutQuint);
+            text.FadeTo(textHighlighted ? 1 : 0.5f, 100, Easing.OutQuint);
         }
     }
 }

From 6fca3e5a468d09d065a975e5d5eaab567ee6e5f7 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 4 Mar 2020 00:39:12 +0300
Subject: [PATCH 0850/1142] Remove functions with get-only properties

---
 .../Overlays/Changelog/ChangelogUpdateStreamItem.cs  |  6 +++---
 .../Overlays/Home/Friends/FriendsOnlineStatusItem.cs |  4 ++--
 osu.Game/Overlays/OverlayUpdateStreamItem.cs         | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs
index 5a16fc8ddf..84b33fcde9 100644
--- a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs
@@ -17,11 +17,11 @@ namespace osu.Game.Overlays.Changelog
                 Width *= 2; 
         }
 
-        protected override string GetMainText() => Value.DisplayName;
+        protected override string GetMainText => Value.DisplayName;
 
-        protected override string GetAdditionalText() => Value.LatestBuild.DisplayVersion;
+        protected override string GetAdditionalText => Value.LatestBuild.DisplayVersion;
 
-        protected override string GetInfoText() => Value.LatestBuild.Users > 0 ? $"{"user".ToQuantity(Value.LatestBuild.Users, "N0")} online" : null;
+        protected override string GetInfoText => Value.LatestBuild.Users > 0 ? $"{"user".ToQuantity(Value.LatestBuild.Users, "N0")} online" : null;
 
         protected override Color4 GetBarColour(OsuColour colours) => Value.Colour;
     }
diff --git a/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs b/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs
index 4043c72bc4..1025fc8146 100644
--- a/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs
+++ b/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs
@@ -14,9 +14,9 @@ namespace osu.Game.Overlays.Home.Friends
         {
         }
 
-        protected override string GetMainText() => Value.Status.ToString();
+        protected override string GetMainText => Value.Status.ToString();
 
-        protected override string GetAdditionalText() => Value.Count.ToString();
+        protected override string GetAdditionalText => Value.Count.ToString();
 
         protected override Color4 GetBarColour(OsuColour colours)
         {
diff --git a/osu.Game/Overlays/OverlayUpdateStreamItem.cs b/osu.Game/Overlays/OverlayUpdateStreamItem.cs
index 0cdf894f73..459daeb3a5 100644
--- a/osu.Game/Overlays/OverlayUpdateStreamItem.cs
+++ b/osu.Game/Overlays/OverlayUpdateStreamItem.cs
@@ -58,17 +58,17 @@ namespace osu.Game.Overlays
                     {
                         new OsuSpriteText
                         {
-                            Text = GetMainText(),
+                            Text = GetMainText,
                             Font = OsuFont.GetFont(size: 12, weight: FontWeight.Black),
                         },
                         new OsuSpriteText
                         {
-                            Text = GetAdditionalText(),
+                            Text = GetAdditionalText,
                             Font = OsuFont.GetFont(size: 16, weight: FontWeight.Regular),
                         },
                         new OsuSpriteText
                         {
-                            Text = GetInfoText(),
+                            Text = GetInfoText,
                             Font = OsuFont.GetFont(size: 10),
                             Colour = colourProvider.Foreground1
                         },
@@ -88,11 +88,11 @@ namespace osu.Game.Overlays
             SelectedItem.BindValueChanged(_ => updateState(), true);
         }
 
-        protected abstract string GetMainText();
+        protected abstract string GetMainText { get; }
 
-        protected abstract string GetAdditionalText();
+        protected abstract string GetAdditionalText { get; }
 
-        protected virtual string GetInfoText() => string.Empty;
+        protected virtual string GetInfoText => string.Empty;
 
         protected abstract Color4 GetBarColour(OsuColour colours);
 

From e2ed13b39248d10f52ffae58f4e51ed594a8951e Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 4 Mar 2020 00:40:10 +0300
Subject: [PATCH 0851/1142] Trim whitespace

---
 osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs
index 84b33fcde9..79824db572 100644
--- a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Changelog
             : base(stream)
         {
             if (stream.IsFeatured)
-                Width *= 2; 
+                Width *= 2;
         }
 
         protected override string GetMainText => Value.DisplayName;

From 5e218697c5a525d8289cfa3d9959b1e0df6ac2d6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 4 Mar 2020 09:46:53 +0900
Subject: [PATCH 0852/1142] Use stacked positions

---
 .../TestSceneFollowPoints.cs                  | 46 +++++++++++++++++++
 .../Connections/FollowPointConnection.cs      |  4 +-
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs
index 94ca2d4cd1..87da7ef417 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneFollowPoints.cs
@@ -2,9 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Osu.Objects;
@@ -114,6 +117,22 @@ namespace osu.Game.Rulesets.Osu.Tests
             assertGroups();
         }
 
+        [Test]
+        public void TestStackedObjects()
+        {
+            addObjectsStep(() => new OsuHitObject[]
+            {
+                new HitCircle { Position = new Vector2(300, 100) },
+                new HitCircle
+                {
+                    Position = new Vector2(300, 300),
+                    StackHeight = 20
+                },
+            });
+
+            assertDirections();
+        }
+
         private void addMultipleObjectsStep() => addObjectsStep(() => new OsuHitObject[]
         {
             new HitCircle { Position = new Vector2(100, 100) },
@@ -207,6 +226,33 @@ namespace osu.Game.Rulesets.Osu.Tests
             });
         }
 
+        private void assertDirections()
+        {
+            AddAssert("group directions are correct", () =>
+            {
+                for (int i = 0; i < hitObjectContainer.Count; i++)
+                {
+                    DrawableOsuHitObject expectedStart = getObject(i);
+                    DrawableOsuHitObject expectedEnd = i < hitObjectContainer.Count - 1 ? getObject(i + 1) : null;
+
+                    if (expectedEnd == null)
+                        continue;
+
+                    var points = getGroup(i).ChildrenOfType<FollowPoint>().ToArray();
+                    if (points.Length == 0)
+                        continue;
+
+                    float expectedDirection = MathF.Atan2(expectedStart.Position.Y - expectedEnd.Position.Y, expectedStart.Position.X - expectedEnd.Position.X);
+                    float realDirection = MathF.Atan2(expectedStart.Position.Y - points[^1].Position.Y, expectedStart.Position.X - points[^1].Position.X);
+
+                    if (!Precision.AlmostEquals(expectedDirection, realDirection))
+                        throw new AssertionException($"Expected group {i} in direction {expectedDirection}, but was {realDirection}.");
+                }
+
+                return true;
+            });
+        }
+
         private DrawableOsuHitObject getObject(int index) => hitObjectContainer[index];
 
         private FollowPointConnection getGroup(int index) => followPointRenderer.Connections[index];
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
index 921b23cb13..3e9c0f341b 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointConnection.cs
@@ -104,8 +104,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
                 return;
             }
 
-            Vector2 startPosition = osuStart.EndPosition;
-            Vector2 endPosition = osuEnd.Position;
+            Vector2 startPosition = osuStart.StackedEndPosition;
+            Vector2 endPosition = osuEnd.StackedPosition;
             double endTime = osuEnd.StartTime;
 
             Vector2 distanceVector = endPosition - startPosition;

From c3f840cc1a5071ee92c758315d5c41ee12cd1dec Mon Sep 17 00:00:00 2001
From: voidedWarranties <wong.zhao@voidedxd.xyz>
Date: Tue, 3 Mar 2020 17:12:01 -0800
Subject: [PATCH 0853/1142] Fix Autoplay = false and AllowFail behavior

---
 .../Mods/TestSceneOsuModDifficultyAdjust.cs         |  6 +++---
 osu.Game/Tests/Visual/ModSandboxTestScene.cs        | 13 ++++++++-----
 osu.Game/Tests/Visual/PlayerTestScene.cs            |  2 ++
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index 1fc9ccccd1..20cb9ef05d 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -42,14 +42,14 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
         });
 
-        protected override TestPlayer CreateReplayPlayer(Score score) => new ScoreAccessibleTestPlayer(score);
+        protected override TestPlayer CreateReplayPlayer(Score score, bool allowFail) => new ScoreAccessibleTestPlayer(score, allowFail);
 
         private class ScoreAccessibleTestPlayer : TestPlayer
         {
             public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
 
-            public ScoreAccessibleTestPlayer(Score score)
-                : base(score)
+            public ScoreAccessibleTestPlayer(Score score, bool allowFail)
+                : base(score, allowFail)
             {
             }
         }
diff --git a/osu.Game/Tests/Visual/ModSandboxTestScene.cs b/osu.Game/Tests/Visual/ModSandboxTestScene.cs
index 11612d0eca..8a9cdf009b 100644
--- a/osu.Game/Tests/Visual/ModSandboxTestScene.cs
+++ b/osu.Game/Tests/Visual/ModSandboxTestScene.cs
@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Game.Beatmaps;
-using osu.Game.Replays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
@@ -56,22 +55,26 @@ namespace osu.Game.Tests.Visual
 
             var score = currentTest.Autoplay
                 ? ruleset.GetAutoplayMod().CreateReplayScore(Beatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo, SelectedMods.Value))
-                : new Score { Replay = new Replay() };
+                : null;
 
-            return CreateReplayPlayer(score);
+            return CreateReplayPlayer(score, AllowFail);
         }
 
         /// <summary>
         /// Creates the <see cref="TestPlayer"/> for a test case.
         /// </summary>
         /// <param name="score">The <see cref="Score"/>.</param>
-        protected virtual TestPlayer CreateReplayPlayer(Score score) => new TestPlayer(score);
+        /// <param name="allowFail">Whether the player can fail.</param>
+        protected virtual TestPlayer CreateReplayPlayer(Score score, bool allowFail) => new TestPlayer(score, allowFail);
 
         protected class TestPlayer : TestReplayPlayer
         {
-            public TestPlayer(Score score)
+            protected override bool AllowFail { get; }
+
+            public TestPlayer(Score score, bool allowFail)
                 : base(score, false, false)
             {
+                AllowFail = allowFail;
             }
         }
 
diff --git a/osu.Game/Tests/Visual/PlayerTestScene.cs b/osu.Game/Tests/Visual/PlayerTestScene.cs
index 0d5aac8cfd..17ad6e80df 100644
--- a/osu.Game/Tests/Visual/PlayerTestScene.cs
+++ b/osu.Game/Tests/Visual/PlayerTestScene.cs
@@ -68,6 +68,8 @@ namespace osu.Game.Tests.Visual
 
             Beatmap.Value = CreateWorkingBeatmap(beatmap);
 
+            SelectedMods.Value = Array.Empty<Mod>();
+
             if (!AllowFail)
             {
                 var noFailMod = ruleset.GetAllMods().FirstOrDefault(m => m is ModNoFail);

From 4294ed4b6495e40bcb9c2eb9664f9e369cd949d7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Mar 2020 11:21:37 +0900
Subject: [PATCH 0854/1142] Better align fonts to weights

---
 osu.Game/Graphics/OsuFont.cs                 | 37 ++++++++++++++++----
 osu.Game/Online/Leaderboards/DrawableRank.cs |  2 +-
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Graphics/OsuFont.cs b/osu.Game/Graphics/OsuFont.cs
index 113816a14a..4dd7bcdf31 100644
--- a/osu.Game/Graphics/OsuFont.cs
+++ b/osu.Game/Graphics/OsuFont.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Graphics
         /// </summary>
         public static FontUsage Default => GetFont();
 
-        public static FontUsage Numeric => GetFont(Typeface.Venera);
+        public static FontUsage Numeric => GetFont(Typeface.Venera, weight: FontWeight.Bold);
 
         public static FontUsage Torus => GetFont(Typeface.Torus, weight: FontWeight.Regular);
 
@@ -103,11 +103,34 @@ namespace osu.Game.Graphics
 
     public enum FontWeight
     {
-        Light,
-        Regular,
-        Medium,
-        SemiBold,
-        Bold,
-        Black
+        /// <summary>
+        /// equivalent to weight 300
+        /// </summary>
+        Light = 300,
+
+        /// <summary>
+        /// equivalent to weight 400
+        /// </summary>
+        Regular = 400,
+
+        /// <summary>
+        /// equivalent to weight 500
+        /// </summary>
+        Medium = 500,
+
+        /// <summary>
+        /// equivalent to weight 600
+        /// </summary>
+        SemiBold = 600,
+
+        /// <summary>
+        /// equivalent to weight 700
+        /// </summary>
+        Bold = 700,
+
+        /// <summary>
+        /// equivalent to weight 900
+        /// </summary>
+        Black = 900
     }
 }
diff --git a/osu.Game/Online/Leaderboards/DrawableRank.cs b/osu.Game/Online/Leaderboards/DrawableRank.cs
index 50cb58c6ab..20bda4601f 100644
--- a/osu.Game/Online/Leaderboards/DrawableRank.cs
+++ b/osu.Game/Online/Leaderboards/DrawableRank.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Online.Leaderboards
                             Spacing = new Vector2(-3, 0),
                             Padding = new MarginPadding { Top = 5 },
                             Colour = getRankNameColour(),
-                            Font = OsuFont.GetFont(Typeface.Venera, 25),
+                            Font = OsuFont.Numeric.With(size: 25),
                             Text = getRankName(),
                             ShadowColour = Color4.Black.Opacity(0.3f),
                             ShadowOffset = new Vector2(0, 0.08f),

From 75968fb4baa8657c49f0bf9865a83c842553279b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Mar 2020 11:46:48 +0900
Subject: [PATCH 0855/1142] Update resources once more

---
 osu.Android.props        | 2 +-
 osu.Game/OsuGameBase.cs  | 4 ++--
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index d62011bf1d..1c4a6ffe75 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -51,7 +51,7 @@
     <Reference Include="Java.Interop" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.303.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.304.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2020.302.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 676b4b6c7a..a890331f05 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -162,9 +162,9 @@ namespace osu.Game
             AddFont(Resources, @"Fonts/Torus-Regular");
             AddFont(Resources, @"Fonts/Torus-Light");
 
-            AddFont(Resources, @"Fonts/Venera");
             AddFont(Resources, @"Fonts/Venera-Light");
-            AddFont(Resources, @"Fonts/Venera-Medium");
+            AddFont(Resources, @"Fonts/Venera-Bold");
+            AddFont(Resources, @"Fonts/Venera-Black");
 
             runMigrations();
 
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index e407fca8b7..4d59b709aa 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -22,7 +22,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.303.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.304.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2020.302.0" />
     <PackageReference Include="Sentry" Version="2.1.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index cc0b8074bb..6897d3e625 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.303.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.304.0" />
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.302.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->

From 275d075acda463cafa23bb6ac97145d3a1262597 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Wed, 4 Mar 2020 10:53:30 +0800
Subject: [PATCH 0856/1142] comment out log locations in bug report template

---
 .github/ISSUE_TEMPLATE/01-bug-issues.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/01-bug-issues.md b/.github/ISSUE_TEMPLATE/01-bug-issues.md
index 0aff276d03..0b80ce44dd 100644
--- a/.github/ISSUE_TEMPLATE/01-bug-issues.md
+++ b/.github/ISSUE_TEMPLATE/01-bug-issues.md
@@ -9,6 +9,8 @@ about: Issues regarding encountered bugs.
 **osu!lazer version:** 
 
 **Logs:**
+<!--
 *please attach logs here, which are located at:*
 - `%AppData%/osu/logs` *(on Windows),*
 - `~/.local/share/osu/logs` *(on Linux & macOS).*
+-->

From 0f7316d41d54a6c1c522aa3bdbac2992095ebd45 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Mar 2020 12:05:23 +0900
Subject: [PATCH 0857/1142] Move file to other file

---
 .../Ladder/Components/LadderEditorSettings.cs | 62 -------------------
 .../Components/LadderSettingsDropdown.cs      | 26 ++++++++
 .../Ladder/Components/SettingsTeamDropdown.cs | 55 ++++++++++++++++
 3 files changed, 81 insertions(+), 62 deletions(-)
 create mode 100644 osu.Game.Tournament/Screens/Ladder/Components/LadderSettingsDropdown.cs
 create mode 100644 osu.Game.Tournament/Screens/Ladder/Components/SettingsTeamDropdown.cs

diff --git a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
index 8ab083ddaf..4aea7ff4c0 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
@@ -9,7 +9,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Events;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Settings;
 using osu.Game.Screens.Play.PlayerSettings;
 using osu.Game.Tournament.Components;
@@ -126,66 +125,5 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
                 });
             }
         }
-
-        private class SettingsTeamDropdown : LadderSettingsDropdown<TournamentTeam>
-        {
-            public SettingsTeamDropdown(BindableList<TournamentTeam> teams)
-            {
-                foreach (var t in teams.Prepend(new TournamentTeam()))
-                    add(t);
-
-                teams.CollectionChanged += (_, args) =>
-                {
-                    switch (args.Action)
-                    {
-                        case NotifyCollectionChangedAction.Add:
-                            args.NewItems.Cast<TournamentTeam>().ForEach(add);
-                            break;
-
-                        case NotifyCollectionChangedAction.Remove:
-                            args.OldItems.Cast<TournamentTeam>().ForEach(i => Control.RemoveDropdownItem(i));
-                            break;
-                    }
-                };
-            }
-
-            private readonly List<IUnbindable> refBindables = new List<IUnbindable>();
-
-            private T boundReference<T>(T obj)
-                where T : IBindable
-            {
-                obj = (T)obj.GetBoundCopy();
-                refBindables.Add(obj);
-                return obj;
-            }
-
-            private void add(TournamentTeam team)
-            {
-                Control.AddDropdownItem(team);
-                boundReference(team.FullName).BindValueChanged(_ =>
-                {
-                    Control.RemoveDropdownItem(team);
-                    Control.AddDropdownItem(team);
-                });
-            }
-        }
-
-        private class LadderSettingsDropdown<T> : SettingsDropdown<T>
-        {
-            protected override OsuDropdown<T> CreateDropdown() => new DropdownControl();
-
-            private new class DropdownControl : SettingsDropdown<T>.DropdownControl
-            {
-                protected override DropdownMenu CreateMenu() => new Menu();
-
-                private new class Menu : OsuDropdownMenu
-                {
-                    public Menu()
-                    {
-                        MaxHeight = 200;
-                    }
-                }
-            }
-        }
     }
 }
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/LadderSettingsDropdown.cs b/osu.Game.Tournament/Screens/Ladder/Components/LadderSettingsDropdown.cs
new file mode 100644
index 0000000000..347e4d91e0
--- /dev/null
+++ b/osu.Game.Tournament/Screens/Ladder/Components/LadderSettingsDropdown.cs
@@ -0,0 +1,26 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays.Settings;
+
+namespace osu.Game.Tournament.Screens.Ladder.Components
+{
+    public class LadderSettingsDropdown<T> : SettingsDropdown<T>
+    {
+        protected override OsuDropdown<T> CreateDropdown() => new DropdownControl();
+
+        private new class DropdownControl : SettingsDropdown<T>.DropdownControl
+        {
+            protected override DropdownMenu CreateMenu() => new Menu();
+
+            private new class Menu : OsuDropdownMenu
+            {
+                public Menu()
+                {
+                    MaxHeight = 200;
+                }
+            }
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/SettingsTeamDropdown.cs b/osu.Game.Tournament/Screens/Ladder/Components/SettingsTeamDropdown.cs
new file mode 100644
index 0000000000..a630e51e44
--- /dev/null
+++ b/osu.Game.Tournament/Screens/Ladder/Components/SettingsTeamDropdown.cs
@@ -0,0 +1,55 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Game.Tournament.Models;
+
+namespace osu.Game.Tournament.Screens.Ladder.Components
+{
+    public class SettingsTeamDropdown : LadderSettingsDropdown<TournamentTeam>
+    {
+        public SettingsTeamDropdown(BindableList<TournamentTeam> teams)
+        {
+            foreach (var t in teams.Prepend(new TournamentTeam()))
+                add(t);
+
+            teams.CollectionChanged += (_, args) =>
+            {
+                switch (args.Action)
+                {
+                    case NotifyCollectionChangedAction.Add:
+                        args.NewItems.Cast<TournamentTeam>().ForEach(add);
+                        break;
+
+                    case NotifyCollectionChangedAction.Remove:
+                        args.OldItems.Cast<TournamentTeam>().ForEach(i => Control.RemoveDropdownItem(i));
+                        break;
+                }
+            };
+        }
+
+        private readonly List<IUnbindable> refBindables = new List<IUnbindable>();
+
+        private T boundReference<T>(T obj)
+            where T : IBindable
+        {
+            obj = (T)obj.GetBoundCopy();
+            refBindables.Add(obj);
+            return obj;
+        }
+
+        private void add(TournamentTeam team)
+        {
+            Control.AddDropdownItem(team);
+            boundReference(team.FullName).BindValueChanged(_ =>
+            {
+                Control.RemoveDropdownItem(team);
+                Control.AddDropdownItem(team);
+            });
+        }
+    }
+}

From fc0821f1942d141854b9ff6823d0762256068a37 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 4 Mar 2020 12:37:42 +0900
Subject: [PATCH 0858/1142] Fix nullref when deleting teams in the ladder
 screen

---
 osu.Game.Tournament/Screens/Ladder/LadderScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
index 8ea366e1b4..86d1081241 100644
--- a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
+++ b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Tournament.Screens.Ladder
                         break;
 
                     case NotifyCollectionChangedAction.Remove:
-                        foreach (var p in args.NewItems.Cast<TournamentMatch>())
+                        foreach (var p in args.OldItems.Cast<TournamentMatch>())
                         {
                             foreach (var d in MatchesContainer.Where(d => d.Match == p))
                                 d.Expire();

From e9b0770f6418e904686f0744b82475d9db41f026 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Mar 2020 12:44:44 +0900
Subject: [PATCH 0859/1142] Apply suggestions from code review

Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>
---
 osu.Game/Graphics/OsuFont.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/OsuFont.cs b/osu.Game/Graphics/OsuFont.cs
index 4dd7bcdf31..12e36871f0 100644
--- a/osu.Game/Graphics/OsuFont.cs
+++ b/osu.Game/Graphics/OsuFont.cs
@@ -109,27 +109,27 @@ namespace osu.Game.Graphics
         Light = 300,
 
         /// <summary>
-        /// equivalent to weight 400
+        /// Equivalent to weight 400.
         /// </summary>
         Regular = 400,
 
         /// <summary>
-        /// equivalent to weight 500
+        /// Equivalent to weight 500.
         /// </summary>
         Medium = 500,
 
         /// <summary>
-        /// equivalent to weight 600
+        /// Equivalent to weight 600.
         /// </summary>
         SemiBold = 600,
 
         /// <summary>
-        /// equivalent to weight 700
+        /// Equivalent to weight 700.
         /// </summary>
         Bold = 700,
 
         /// <summary>
-        /// equivalent to weight 900
+        /// Equivalent to weight 900.
         /// </summary>
         Black = 900
     }

From aa17a64a0e383e7a6f7b011439a84f2cf1bef191 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Wed, 4 Mar 2020 12:47:01 +0900
Subject: [PATCH 0860/1142] Apply missed xmldoc suggestion

---
 osu.Game/Graphics/OsuFont.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/OsuFont.cs b/osu.Game/Graphics/OsuFont.cs
index 12e36871f0..841936d2c5 100644
--- a/osu.Game/Graphics/OsuFont.cs
+++ b/osu.Game/Graphics/OsuFont.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Graphics
     public enum FontWeight
     {
         /// <summary>
-        /// equivalent to weight 300
+        /// Equivalent to weight 300.
         /// </summary>
         Light = 300,
 

From 6b7144e21bf923b3f72af0a2980bab8c416ba718 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Mar 2020 13:19:52 +0900
Subject: [PATCH 0861/1142] Fix non-matching filename

---
 .../Screens/Editors/{SeedingEditor.cs => SeedingEditorScreen.cs}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename osu.Game.Tournament/Screens/Editors/{SeedingEditor.cs => SeedingEditorScreen.cs} (100%)

diff --git a/osu.Game.Tournament/Screens/Editors/SeedingEditor.cs b/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs
similarity index 100%
rename from osu.Game.Tournament/Screens/Editors/SeedingEditor.cs
rename to osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs

From dade58adf39afb94677c26936adc9df2a36b3b2b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Mar 2020 13:21:14 +0900
Subject: [PATCH 0862/1142] Fix crash from editor screen test scene when trying
 to view seeding editor

---
 osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index d6fa1a29a8..ca8bce1cca 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -154,7 +154,7 @@ namespace osu.Game.Tournament.Screens.Editors
                                 Text = "Edit seeding results",
                                 Action = () =>
                                 {
-                                    sceneManager.SetScreen(new SeedingEditorScreen(team));
+                                    sceneManager?.SetScreen(new SeedingEditorScreen(team));
                                 }
                             },
                         }

From 003aeeb05294889a74d99dc59f63747b320c17e9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Mar 2020 13:26:25 +0900
Subject: [PATCH 0863/1142] Add test scene for seedings editor

---
 .../Screens/TestSceneSeedingEditorScreen.cs   |  25 +++
 .../Screens/TestSceneSeedingScreen.cs         | 194 +++++++++---------
 2 files changed, 123 insertions(+), 96 deletions(-)
 create mode 100644 osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.cs
new file mode 100644
index 0000000000..014cd4663b
--- /dev/null
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingEditorScreen.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.Game.Tournament.Models;
+using osu.Game.Tournament.Screens.Editors;
+
+namespace osu.Game.Tournament.Tests.Screens
+{
+    public class TestSceneSeedingEditorScreen : LadderTestScene
+    {
+        [Cached]
+        private readonly LadderInfo ladder = new LadderInfo();
+
+        public TestSceneSeedingEditorScreen()
+        {
+            var match = TestSceneSeedingScreen.CreateSampleSeededMatch();
+
+            Add(new SeedingEditorScreen(match.Team1.Value)
+            {
+                Width = 0.85f // create room for control panel
+            });
+        }
+    }
+}
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs
index eb46d75705..335a6c80a1 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneSeedingScreen.cs
@@ -18,102 +18,7 @@ namespace osu.Game.Tournament.Tests.Screens
         [BackgroundDependencyLoader]
         private void load()
         {
-            ladder.CurrentMatch.Value = new TournamentMatch
-            {
-                Team1 =
-                {
-                    Value = new TournamentTeam
-                    {
-                        FlagName = { Value = "JP" },
-                        FullName = { Value = "Japan" },
-                        LastYearPlacing = { Value = 10 },
-                        Seed = { Value = "Low" },
-                        SeedingResults =
-                        {
-                            new SeedingResult
-                            {
-                                Mod = { Value = "NM" },
-                                Seed = { Value = 10 },
-                                Beatmaps =
-                                {
-                                    new SeedingBeatmap
-                                    {
-                                        BeatmapInfo = new BeatmapInfo { Metadata = new BeatmapMetadata { Title = "Test Title", Artist = "Test Artist" } },
-                                        Score = 12345672,
-                                        Seed = { Value = 24 },
-                                    },
-                                    new SeedingBeatmap
-                                    {
-                                        BeatmapInfo = new BeatmapInfo { Metadata = new BeatmapMetadata { Title = "Test Title", Artist = "Test Artist" } },
-                                        Score = 1234567,
-                                        Seed = { Value = 12 },
-                                    },
-                                    new SeedingBeatmap
-                                    {
-                                        BeatmapInfo = new BeatmapInfo { Metadata = new BeatmapMetadata { Title = "Test Title", Artist = "Test Artist" } },
-                                        Score = 1234567,
-                                        Seed = { Value = 16 },
-                                    }
-                                }
-                            },
-                            new SeedingResult
-                            {
-                                Mod = { Value = "DT" },
-                                Seed = { Value = 5 },
-                                Beatmaps =
-                                {
-                                    new SeedingBeatmap
-                                    {
-                                        BeatmapInfo = new BeatmapInfo { Metadata = new BeatmapMetadata { Title = "Test Title", Artist = "Test Artist" } },
-                                        Score = 234567,
-                                        Seed = { Value = 3 },
-                                    },
-                                    new SeedingBeatmap
-                                    {
-                                        BeatmapInfo = new BeatmapInfo { Metadata = new BeatmapMetadata { Title = "Test Title", Artist = "Test Artist" } },
-                                        Score = 234567,
-                                        Seed = { Value = 6 },
-                                    },
-                                    new SeedingBeatmap
-                                    {
-                                        BeatmapInfo = new BeatmapInfo { Metadata = new BeatmapMetadata { Title = "Test Title", Artist = "Test Artist" } },
-                                        Score = 234567,
-                                        Seed = { Value = 12 },
-                                    }
-                                }
-                            }
-                        },
-                        Players =
-                        {
-                            new User { Username = "Hello", Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 12 } } },
-                            new User { Username = "Hello", Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 16 } } },
-                            new User { Username = "Hello", Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 20 } } },
-                            new User { Username = "Hello", Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 24 } } },
-                            new User { Username = "Hello", Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 30 } } },
-                        }
-                    }
-                },
-                Team2 =
-                {
-                    Value = new TournamentTeam
-                    {
-                        FlagName = { Value = "US" },
-                        FullName = { Value = "United States" },
-                        Players =
-                        {
-                            new User { Username = "Hello" },
-                            new User { Username = "Hello" },
-                            new User { Username = "Hello" },
-                            new User { Username = "Hello" },
-                            new User { Username = "Hello" },
-                        }
-                    }
-                },
-                Round =
-                {
-                    Value = new TournamentRound { Name = { Value = "Quarterfinals" } }
-                }
-            };
+            ladder.CurrentMatch.Value = CreateSampleSeededMatch();
 
             Add(new SeedingScreen
             {
@@ -121,5 +26,102 @@ namespace osu.Game.Tournament.Tests.Screens
                 FillAspectRatio = 16 / 9f
             });
         }
+
+        public static TournamentMatch CreateSampleSeededMatch() => new TournamentMatch
+        {
+            Team1 =
+            {
+                Value = new TournamentTeam
+                {
+                    FlagName = { Value = "JP" },
+                    FullName = { Value = "Japan" },
+                    LastYearPlacing = { Value = 10 },
+                    Seed = { Value = "Low" },
+                    SeedingResults =
+                    {
+                        new SeedingResult
+                        {
+                            Mod = { Value = "NM" },
+                            Seed = { Value = 10 },
+                            Beatmaps =
+                            {
+                                new SeedingBeatmap
+                                {
+                                    BeatmapInfo = new BeatmapInfo { Metadata = new BeatmapMetadata { Title = "Test Title", Artist = "Test Artist" } },
+                                    Score = 12345672,
+                                    Seed = { Value = 24 },
+                                },
+                                new SeedingBeatmap
+                                {
+                                    BeatmapInfo = new BeatmapInfo { Metadata = new BeatmapMetadata { Title = "Test Title", Artist = "Test Artist" } },
+                                    Score = 1234567,
+                                    Seed = { Value = 12 },
+                                },
+                                new SeedingBeatmap
+                                {
+                                    BeatmapInfo = new BeatmapInfo { Metadata = new BeatmapMetadata { Title = "Test Title", Artist = "Test Artist" } },
+                                    Score = 1234567,
+                                    Seed = { Value = 16 },
+                                }
+                            }
+                        },
+                        new SeedingResult
+                        {
+                            Mod = { Value = "DT" },
+                            Seed = { Value = 5 },
+                            Beatmaps =
+                            {
+                                new SeedingBeatmap
+                                {
+                                    BeatmapInfo = new BeatmapInfo { Metadata = new BeatmapMetadata { Title = "Test Title", Artist = "Test Artist" } },
+                                    Score = 234567,
+                                    Seed = { Value = 3 },
+                                },
+                                new SeedingBeatmap
+                                {
+                                    BeatmapInfo = new BeatmapInfo { Metadata = new BeatmapMetadata { Title = "Test Title", Artist = "Test Artist" } },
+                                    Score = 234567,
+                                    Seed = { Value = 6 },
+                                },
+                                new SeedingBeatmap
+                                {
+                                    BeatmapInfo = new BeatmapInfo { Metadata = new BeatmapMetadata { Title = "Test Title", Artist = "Test Artist" } },
+                                    Score = 234567,
+                                    Seed = { Value = 12 },
+                                }
+                            }
+                        }
+                    },
+                    Players =
+                    {
+                        new User { Username = "Hello", Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 12 } } },
+                        new User { Username = "Hello", Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 16 } } },
+                        new User { Username = "Hello", Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 20 } } },
+                        new User { Username = "Hello", Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 24 } } },
+                        new User { Username = "Hello", Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 30 } } },
+                    }
+                }
+            },
+            Team2 =
+            {
+                Value = new TournamentTeam
+                {
+                    FlagName = { Value = "US" },
+                    FullName = { Value = "United States" },
+                    Players =
+                    {
+                        new User { Username = "Hello" },
+                        new User { Username = "Hello" },
+                        new User { Username = "Hello" },
+                        new User { Username = "Hello" },
+                        new User { Username = "Hello" },
+                    }
+                }
+            },
+            Round =
+            {
+                Value = new TournamentRound { Name = { Value = "Quarterfinals" } }
+            }
+        };
     }
 }

From a3709ae2684d5dae521a6ba6c798505bddc75613 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Wed, 4 Mar 2020 13:39:37 +0800
Subject: [PATCH 0864/1142] Also comment out log locations in crash template

---
 .github/ISSUE_TEMPLATE/02-crash-issues.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/02-crash-issues.md b/.github/ISSUE_TEMPLATE/02-crash-issues.md
index 9c3ae33161..ada8de73c0 100644
--- a/.github/ISSUE_TEMPLATE/02-crash-issues.md
+++ b/.github/ISSUE_TEMPLATE/02-crash-issues.md
@@ -9,8 +9,10 @@ about: Issues regarding crashes or permanent freezes.
 **osu!lazer version:** 
 
 **Logs:**
+<!--
 *please attach logs here, which are located at:*
 - `%AppData%/osu/logs` *(on Windows),*
 - `~/.local/share/osu/logs` *(on Linux & macOS).*
+-->
 
 **Computer Specifications:** 

From f42523352735dff805a37713893107bd6ab7d2cd Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 4 Mar 2020 08:41:21 +0300
Subject: [PATCH 0865/1142] Basic UserCard implementation

---
 .../Visual/UserInterface/TestSceneUserCard.cs | 35 +++++++++
 .../UserInterfaceV2/Users/UserCard.cs         | 73 +++++++++++++++++++
 .../UserInterfaceV2/Users/UserGridCard.cs     | 18 +++++
 3 files changed, 126 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.cs
 create mode 100644 osu.Game/Graphics/UserInterfaceV2/Users/UserCard.cs
 create mode 100644 osu.Game/Graphics/UserInterfaceV2/Users/UserGridCard.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.cs
new file mode 100644
index 0000000000..96a5a1e9ca
--- /dev/null
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.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 System.Collections.Generic;
+using osu.Framework.Graphics;
+using osu.Game.Graphics.UserInterfaceV2.Users;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public class TestSceneUserCard : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(UserCard),
+            typeof(UserGridCard),
+        };
+
+        public TestSceneUserCard()
+        {
+            Add(new UserGridCard(new User
+            {
+                Username = @"flyte",
+                Id = 3103765,
+                Country = new Country { FlagName = @"JP" },
+                CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
+            })
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+            });
+        }
+    }
+}
diff --git a/osu.Game/Graphics/UserInterfaceV2/Users/UserCard.cs b/osu.Game/Graphics/UserInterfaceV2/Users/UserCard.cs
new file mode 100644
index 0000000000..a83a523f9a
--- /dev/null
+++ b/osu.Game/Graphics/UserInterfaceV2/Users/UserCard.cs
@@ -0,0 +1,73 @@
+// 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.Overlays;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics.UserInterface;
+using osu.Framework.Graphics.Cursor;
+using osu.Game.Graphics.Containers;
+using osu.Game.Users;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using System.Collections.Generic;
+using osu.Framework.Input.Events;
+
+namespace osu.Game.Graphics.UserInterfaceV2.Users
+{
+    public abstract class UserCard : OsuHoverContainer, IHasContextMenu
+    {
+        [Resolved(canBeNull:true)]
+        private UserProfileOverlay profileOverlay { get; set; }
+
+        protected override IEnumerable<Drawable> EffectTargets => null;
+
+        public User User { get; }
+
+        public UserCard(User user)
+        {
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
+
+            User = user;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            Action = () => profileOverlay?.ShowUser(User);
+
+            Masking = true;
+            BorderColour = colours.GreyVioletLighter;
+
+            Add(new DelayedLoadUnloadWrapper(() => new UserCoverBackground
+            {
+                RelativeSizeAxes = Axes.Both,
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                User = User,
+            }, 300, 5000)
+            {
+                RelativeSizeAxes = Axes.Both,
+            });
+        }
+
+        protected override bool OnHover(HoverEvent e)
+        {
+            BorderThickness = 2;
+            return base.OnHover(e);
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            BorderThickness = 0;
+            base.OnHoverLost(e);
+        }
+
+        public MenuItem[] ContextMenuItems => new MenuItem[]
+        {
+            new OsuMenuItem("View Profile", MenuItemType.Highlighted, Action),
+        };
+    }
+}
diff --git a/osu.Game/Graphics/UserInterfaceV2/Users/UserGridCard.cs b/osu.Game/Graphics/UserInterfaceV2/Users/UserGridCard.cs
new file mode 100644
index 0000000000..8a322a20f3
--- /dev/null
+++ b/osu.Game/Graphics/UserInterfaceV2/Users/UserGridCard.cs
@@ -0,0 +1,18 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Users;
+using osuTK;
+
+namespace osu.Game.Graphics.UserInterfaceV2.Users
+{
+    public class UserGridCard : UserCard
+    {
+        public UserGridCard(User user)
+            : base(user)
+        {
+            Size = new Vector2(290, 120);
+            CornerRadius = 10;
+        }
+    }
+}

From 1b5222f39638ee5fe0f9033902040d4e7646f716 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 4 Mar 2020 08:53:14 +0300
Subject: [PATCH 0866/1142] Baisc UserListCard implementation

---
 .../Visual/UserInterface/TestSceneUserCard.cs | 41 +++++++++++++++----
 .../UserInterfaceV2/Users/UserListCard.cs     | 19 +++++++++
 2 files changed, 53 insertions(+), 7 deletions(-)
 create mode 100644 osu.Game/Graphics/UserInterfaceV2/Users/UserListCard.cs

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.cs
index 96a5a1e9ca..9639aeb49e 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.cs
@@ -4,8 +4,10 @@
 using System;
 using System.Collections.Generic;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.UserInterfaceV2.Users;
 using osu.Game.Users;
+using osuTK;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
@@ -15,20 +17,45 @@ namespace osu.Game.Tests.Visual.UserInterface
         {
             typeof(UserCard),
             typeof(UserGridCard),
+            typeof(UserListCard)
         };
 
         public TestSceneUserCard()
         {
-            Add(new UserGridCard(new User
-            {
-                Username = @"flyte",
-                Id = 3103765,
-                Country = new Country { FlagName = @"JP" },
-                CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
-            })
+            Add(new FillFlowContainer
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
+                AutoSizeAxes = Axes.Y,
+                RelativeSizeAxes = Axes.X,
+                Spacing = new Vector2(0, 10),
+                Children = new Drawable[]
+                {
+                    new UserGridCard(new User
+                    {
+                        Username = @"flyte",
+                        Id = 3103765,
+                        Country = new Country { FlagName = @"JP" },
+                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
+                    })
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    },
+                    new UserListCard(new User
+                    {
+                        Username = @"peppy",
+                        Id = 2,
+                        Country = new Country { FlagName = @"AU" },
+                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
+                        IsSupporter = true,
+                        SupportLevel = 3,
+                    })
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    }
+                }
             });
         }
     }
diff --git a/osu.Game/Graphics/UserInterfaceV2/Users/UserListCard.cs b/osu.Game/Graphics/UserInterfaceV2/Users/UserListCard.cs
new file mode 100644
index 0000000000..c270690086
--- /dev/null
+++ b/osu.Game/Graphics/UserInterfaceV2/Users/UserListCard.cs
@@ -0,0 +1,19 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Users;
+using osu.Framework.Graphics;
+
+namespace osu.Game.Graphics.UserInterfaceV2.Users
+{
+    public class UserListCard : UserCard
+    {
+        public UserListCard(User user)
+            : base(user)
+        {
+            RelativeSizeAxes = Axes.X;
+            Height = 40;
+            CornerRadius = 6;
+        }
+    }
+}

From b7d34b399d9f6819c3e71d9b20a3718495e89cc1 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 4 Mar 2020 09:10:51 +0300
Subject: [PATCH 0867/1142] Adjust background presentation for UserListCard

---
 .../Visual/UserInterface/TestSceneUserCard.cs |  5 +++
 .../UserInterfaceV2/Users/UserCard.cs         | 37 +++++++++++++------
 .../UserInterfaceV2/Users/UserListCard.cs     | 11 ++++++
 3 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.cs
index 9639aeb49e..db934fc822 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.cs
@@ -3,9 +3,11 @@
 
 using System;
 using System.Collections.Generic;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.UserInterfaceV2.Users;
+using osu.Game.Overlays;
 using osu.Game.Users;
 using osuTK;
 
@@ -20,6 +22,9 @@ namespace osu.Game.Tests.Visual.UserInterface
             typeof(UserListCard)
         };
 
+        [Cached]
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
+
         public TestSceneUserCard()
         {
             Add(new FillFlowContainer
diff --git a/osu.Game/Graphics/UserInterfaceV2/Users/UserCard.cs b/osu.Game/Graphics/UserInterfaceV2/Users/UserCard.cs
index a83a523f9a..9a89c0118b 100644
--- a/osu.Game/Graphics/UserInterfaceV2/Users/UserCard.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/Users/UserCard.cs
@@ -13,17 +13,17 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using System.Collections.Generic;
 using osu.Framework.Input.Events;
+using osu.Framework.Graphics.Shapes;
 
 namespace osu.Game.Graphics.UserInterfaceV2.Users
 {
     public abstract class UserCard : OsuHoverContainer, IHasContextMenu
     {
-        [Resolved(canBeNull:true)]
-        private UserProfileOverlay profileOverlay { get; set; }
+        public User User { get; }
 
         protected override IEnumerable<Drawable> EffectTargets => null;
 
-        public User User { get; }
+        protected DelayedLoadUnloadWrapper Background;
 
         public UserCard(User user)
         {
@@ -33,23 +33,36 @@ namespace osu.Game.Graphics.UserInterfaceV2.Users
             User = user;
         }
 
+        [Resolved(canBeNull: true)]
+        private UserProfileOverlay profileOverlay { get; set; }
+
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
+        private void load(OsuColour colours, OverlayColourProvider colourProvider)
         {
             Action = () => profileOverlay?.ShowUser(User);
 
             Masking = true;
             BorderColour = colours.GreyVioletLighter;
 
-            Add(new DelayedLoadUnloadWrapper(() => new UserCoverBackground
+            AddRange(new Drawable[]
             {
-                RelativeSizeAxes = Axes.Both,
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                User = User,
-            }, 300, 5000)
-            {
-                RelativeSizeAxes = Axes.Both,
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colourProvider.Background5
+                },
+                Background = new DelayedLoadUnloadWrapper(() => new UserCoverBackground
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    User = User,
+                }, 300, 5000)
+                {
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    RelativeSizeAxes = Axes.Both,
+                }
             });
         }
 
diff --git a/osu.Game/Graphics/UserInterfaceV2/Users/UserListCard.cs b/osu.Game/Graphics/UserInterfaceV2/Users/UserListCard.cs
index c270690086..e445404d40 100644
--- a/osu.Game/Graphics/UserInterfaceV2/Users/UserListCard.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/Users/UserListCard.cs
@@ -3,6 +3,10 @@
 
 using osu.Game.Users;
 using osu.Framework.Graphics;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Extensions.Color4Extensions;
+using osuTK.Graphics;
 
 namespace osu.Game.Graphics.UserInterfaceV2.Users
 {
@@ -15,5 +19,12 @@ namespace osu.Game.Graphics.UserInterfaceV2.Users
             Height = 40;
             CornerRadius = 6;
         }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Background.Width = 0.5f;
+            Background.Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(1), Color4.White);
+        }
     }
 }

From 416b9e4e6f38d64113ed35654bf6435be44c0cda Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Wed, 4 Mar 2020 14:28:18 +0800
Subject: [PATCH 0868/1142] fix beatmap status display

---
 osu.Game/Overlays/BeatmapSet/AuthorInfo.cs | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs b/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
index 446a075ae4..e80034f494 100644
--- a/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
+++ b/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
@@ -59,7 +59,25 @@ namespace osu.Game.Overlays.BeatmapSet
 
             if (online.Ranked.HasValue)
             {
-                fields.Add(new Field("ranked", online.Ranked.Value, OsuFont.GetFont(weight: FontWeight.Bold)));
+                string verb = "ranked";
+
+                switch (online.Status)
+                {
+                    case BeatmapSetOnlineStatus.Ranked:
+                        verb = "ranked";
+                        break;
+                    case BeatmapSetOnlineStatus.Approved:
+                        verb = "approved";
+                        break;
+                    case BeatmapSetOnlineStatus.Qualified:
+                        verb = "qualified";
+                        break;
+                    case BeatmapSetOnlineStatus.Loved:
+                        verb = "loved";
+                        break;
+                }
+
+                fields.Add(new Field(verb, online.Ranked.Value, OsuFont.GetFont(weight: FontWeight.Bold)));
             }
             else if (online.LastUpdated.HasValue)
             {

From fbd0dfd71b6c889794197e6e747ef9a99a185273 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9CNate?= <nathandu@outlook.com>
Date: Wed, 4 Mar 2020 14:55:51 +0800
Subject: [PATCH 0869/1142] add blank lines

---
 osu.Game/Overlays/BeatmapSet/AuthorInfo.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs b/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
index e80034f494..f3bf0b8e5e 100644
--- a/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
+++ b/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
@@ -66,12 +66,15 @@ namespace osu.Game.Overlays.BeatmapSet
                     case BeatmapSetOnlineStatus.Ranked:
                         verb = "ranked";
                         break;
+
                     case BeatmapSetOnlineStatus.Approved:
                         verb = "approved";
                         break;
+
                     case BeatmapSetOnlineStatus.Qualified:
                         verb = "qualified";
                         break;
+
                     case BeatmapSetOnlineStatus.Loved:
                         verb = "loved";
                         break;

From c306d3de2e1839a8cdf058bc0448c80d8caf4ddd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Mar 2020 16:03:43 +0900
Subject: [PATCH 0870/1142] Fix typo in button

Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>
---
 osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs
index 68003a1c43..e68946aaf2 100644
--- a/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs
@@ -94,7 +94,7 @@ namespace osu.Game.Tournament.Screens.Editors
                         Origin = Anchor.CentreRight,
                         RelativeSizeAxes = Axes.None,
                         Width = 150,
-                        Text = "Delete SeeingResult",
+                        Text = "Delete result",
                         Action = () =>
                         {
                             Expire();

From 6ea3af1951562c7f0720745abb7441b755412dc0 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 4 Mar 2020 10:35:43 +0300
Subject: [PATCH 0871/1142] Implement layout for UserListCard

---
 .../Visual/UserInterface/TestSceneUserCard.cs |  2 +
 .../UserInterfaceV2/Users/UserCard.cs         | 76 ++++++++++++++++-
 .../UserInterfaceV2/Users/UserGridCard.cs     |  7 ++
 .../UserInterfaceV2/Users/UserListCard.cs     | 81 ++++++++++++++++++-
 4 files changed, 163 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.cs
index db934fc822..8134af8208 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.cs
@@ -55,6 +55,8 @@ namespace osu.Game.Tests.Visual.UserInterface
                         CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
                         IsSupporter = true,
                         SupportLevel = 3,
+                        IsOnline = false,
+                        LastVisit = DateTimeOffset.Now
                     })
                     {
                         Anchor = Anchor.Centre,
diff --git a/osu.Game/Graphics/UserInterfaceV2/Users/UserCard.cs b/osu.Game/Graphics/UserInterfaceV2/Users/UserCard.cs
index 9a89c0118b..916c0c2401 100644
--- a/osu.Game/Graphics/UserInterfaceV2/Users/UserCard.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/Users/UserCard.cs
@@ -14,6 +14,13 @@ using osu.Framework.Graphics.Containers;
 using System.Collections.Generic;
 using osu.Framework.Input.Events;
 using osu.Framework.Graphics.Shapes;
+using JetBrains.Annotations;
+using osu.Game.Users.Drawables;
+using osuTK;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays.Profile.Header.Components;
+using osu.Framework.Graphics.Sprites;
+using osuTK.Graphics;
 
 namespace osu.Game.Graphics.UserInterfaceV2.Users
 {
@@ -36,8 +43,11 @@ namespace osu.Game.Graphics.UserInterfaceV2.Users
         [Resolved(canBeNull: true)]
         private UserProfileOverlay profileOverlay { get; set; }
 
+        [Resolved]
+        private OsuColour colours { get; set; }
+
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, OverlayColourProvider colourProvider)
+        private void load(OverlayColourProvider colourProvider)
         {
             Action = () => profileOverlay?.ShowUser(User);
 
@@ -62,10 +72,72 @@ namespace osu.Game.Graphics.UserInterfaceV2.Users
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,
                     RelativeSizeAxes = Axes.Both,
-                }
+                },
+                CreateLayout()
             });
         }
 
+        [NotNull]
+        protected abstract Drawable CreateLayout();
+
+        protected UpdateableAvatar CreateAvatar() => new UpdateableAvatar
+        {
+            User = User,
+            Masking = true,
+            OpenOnClick = { Value = false }
+        };
+
+        protected UpdateableFlag CreateFlag() => new UpdateableFlag(User.Country)
+        {
+            Size = new Vector2(39, 26)
+        };
+
+        protected OsuSpriteText CreateUsername() => new OsuSpriteText
+        {
+            Font = OsuFont.GetFont(size: 20, weight: FontWeight.Bold, italics: true),
+            Text = User.Username,
+        };
+
+        protected SpriteIcon CreateStatusIcon() => new SpriteIcon
+        {
+            Icon = FontAwesome.Regular.Circle,
+            Size = new Vector2(25),
+            Colour = User.IsOnline ? colours.GreenLight : Color4.Black
+        };
+
+        protected FillFlowContainer CreateStatusMessage(bool rightAlignedChildren)
+        {
+            var status = new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Vertical
+            };
+
+            var alignment = rightAlignedChildren ? Anchor.x2 : Anchor.x0;
+
+            if (!User.IsOnline && User.LastVisit.HasValue)
+            {
+                status.Add(new TextFlowContainer(t => t.Font = OsuFont.GetFont(size: 15)).With(text =>
+                {
+                    text.Anchor = Anchor.y1 | alignment;
+                    text.Origin = Anchor.y1 | alignment;
+                    text.AutoSizeAxes = Axes.Both;
+                    text.AddText(@"Last seen ");
+                    text.AddText(new DrawableDate(User.LastVisit.Value, italic: false));
+                }));
+            }
+
+            status.Add(new OsuSpriteText
+            {
+                Anchor = Anchor.y1 | alignment,
+                Origin = Anchor.y1 | alignment,
+                Font = OsuFont.GetFont(size: 17),
+                Text = User.IsOnline ? @"Online" : @"Offline"
+            });
+
+            return status;
+        }
+
         protected override bool OnHover(HoverEvent e)
         {
             BorderThickness = 2;
diff --git a/osu.Game/Graphics/UserInterfaceV2/Users/UserGridCard.cs b/osu.Game/Graphics/UserInterfaceV2/Users/UserGridCard.cs
index 8a322a20f3..7390d33b4e 100644
--- a/osu.Game/Graphics/UserInterfaceV2/Users/UserGridCard.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/Users/UserGridCard.cs
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Users;
 using osuTK;
 
@@ -14,5 +16,10 @@ namespace osu.Game.Graphics.UserInterfaceV2.Users
             Size = new Vector2(290, 120);
             CornerRadius = 10;
         }
+
+        protected override Drawable CreateLayout() => new Container
+        {
+            RelativeSizeAxes = Axes.Both,
+        };
     }
 }
diff --git a/osu.Game/Graphics/UserInterfaceV2/Users/UserListCard.cs b/osu.Game/Graphics/UserInterfaceV2/Users/UserListCard.cs
index e445404d40..9be6ba9c65 100644
--- a/osu.Game/Graphics/UserInterfaceV2/Users/UserListCard.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/Users/UserListCard.cs
@@ -7,6 +7,9 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Extensions.Color4Extensions;
 using osuTK.Graphics;
+using osu.Framework.Graphics.Containers;
+using osuTK;
+using osu.Game.Overlays.Profile.Header.Components;
 
 namespace osu.Game.Graphics.UserInterfaceV2.Users
 {
@@ -24,7 +27,83 @@ namespace osu.Game.Graphics.UserInterfaceV2.Users
         private void load()
         {
             Background.Width = 0.5f;
-            Background.Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(1), Color4.White);
+            Background.Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(1), Color4.White.Opacity(User.IsOnline ? 0.6f : 0.7f));
+        }
+
+        protected override Drawable CreateLayout()
+        {
+            FillFlowContainer details;
+
+            var layout = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    details = new FillFlowContainer
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        AutoSizeAxes = Axes.Both,
+                        Direction = FillDirection.Horizontal,
+                        Spacing = new Vector2(10, 0),
+                        Children = new Drawable[]
+                        {
+                            CreateAvatar().With(avatar =>
+                            {
+                                avatar.Anchor = Anchor.CentreLeft;
+                                avatar.Origin = Anchor.CentreLeft;
+                                avatar.Size = new Vector2(40);
+                                avatar.Masking = false;
+                            }),
+                            CreateFlag().With(flag =>
+                            {
+                                flag.Anchor = Anchor.CentreLeft;
+                                flag.Origin = Anchor.CentreLeft;
+                            }),
+                            CreateUsername().With(username =>
+                            {
+                                username.Anchor = Anchor.CentreLeft;
+                                username.Origin = Anchor.CentreLeft;
+                            })
+                        }
+                    },
+                    new FillFlowContainer
+                    {
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
+                        AutoSizeAxes = Axes.Both,
+                        Direction = FillDirection.Horizontal,
+                        Spacing = new Vector2(10, 0),
+                        Margin = new MarginPadding { Right = 10 },
+                        Children = new Drawable[]
+                        {
+                            CreateStatusIcon().With(icon =>
+                            {
+                                icon.Anchor = Anchor.CentreRight;
+                                icon.Origin = Anchor.CentreRight;
+                            }),
+                            CreateStatusMessage(true).With(message =>
+                            {
+                                message.Anchor = Anchor.CentreRight;
+                                message.Origin = Anchor.CentreRight;
+                            })
+                        }
+                    }
+                }
+            };
+
+            if (User.IsSupporter)
+            {
+                details.Add(new SupporterIcon
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Height = 20,
+                    SupportLevel = User.SupportLevel
+                });
+            }
+
+            return layout;
         }
     }
 }

From 7464a486d980a4180aa86f3404a77e8234688bcd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Mar 2020 16:35:45 +0900
Subject: [PATCH 0872/1142] Fix DummyWorkingBeatmap's track completion
 attempting to change game-wide beatmap

---
 osu.Game/OsuGame.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 5781a7fbc4..69d5a9a583 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -428,11 +428,17 @@ namespace osu.Game
             }
         }
 
-        private void currentTrackCompleted() => Schedule(() =>
+        private void currentTrackCompleted()
         {
-            if (!Beatmap.Value.Track.Looping && !Beatmap.Disabled)
-                musicController.NextTrack();
-        });
+            if (Beatmap.Value is DummyWorkingBeatmap)
+                return;
+
+            Schedule(() =>
+            {
+                if (Beatmap.Value.Track.Looping && !Beatmap.Disabled)
+                    musicController.NextTrack();
+            });
+        }
 
         #endregion
 

From eaa77bce142cb905b8be09fdf5ecf2e5bd2e8242 Mon Sep 17 00:00:00 2001
From: mcendu <nathandu@outlook.com>
Date: Wed, 4 Mar 2020 16:43:35 +0800
Subject: [PATCH 0873/1142] Use ToString().ToLowerInvariant() *
 https://github.com/ppy/osu/pull/8128#issuecomment-594360083

---
 osu.Game/Overlays/BeatmapSet/AuthorInfo.cs | 23 +---------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs b/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
index f3bf0b8e5e..31c1439c8f 100644
--- a/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
+++ b/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
@@ -59,28 +59,7 @@ namespace osu.Game.Overlays.BeatmapSet
 
             if (online.Ranked.HasValue)
             {
-                string verb = "ranked";
-
-                switch (online.Status)
-                {
-                    case BeatmapSetOnlineStatus.Ranked:
-                        verb = "ranked";
-                        break;
-
-                    case BeatmapSetOnlineStatus.Approved:
-                        verb = "approved";
-                        break;
-
-                    case BeatmapSetOnlineStatus.Qualified:
-                        verb = "qualified";
-                        break;
-
-                    case BeatmapSetOnlineStatus.Loved:
-                        verb = "loved";
-                        break;
-                }
-
-                fields.Add(new Field(verb, online.Ranked.Value, OsuFont.GetFont(weight: FontWeight.Bold)));
+                fields.Add(new Field(online.Status.ToString().ToLowerInvariant(), online.Ranked.Value, OsuFont.GetFont(weight: FontWeight.Bold)));
             }
             else if (online.LastUpdated.HasValue)
             {

From 184d10a75a9f0c4cdc839d8b62d1540ac2650781 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Wed, 4 Mar 2020 15:45:22 +0700
Subject: [PATCH 0874/1142] Revert "Reduce social overlay/direct overlay
 paddings"

This reverts commit cb1129218135bd2b1e2d3a287d381c13e08725d6.
---
 osu.Game/Overlays/SearchableList/SearchableListOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs b/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs
index 72796df6d5..0783c64c20 100644
--- a/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs
+++ b/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Overlays.SearchableList
 {
     public abstract class SearchableListOverlay : FullscreenOverlay
     {
-        public const float WIDTH_PADDING = 10;
+        public const float WIDTH_PADDING = 80;
 
         protected SearchableListOverlay(OverlayColourScheme colourScheme)
             : base(colourScheme)

From a1dc59500699d1d83875c58a48bf9b0e489ec187 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Wed, 4 Mar 2020 15:46:35 +0700
Subject: [PATCH 0875/1142] Change scroll container padding

---
 osu.Game/Overlays/SearchableList/SearchableListOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs b/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs
index 0783c64c20..d6174e0733 100644
--- a/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs
+++ b/osu.Game/Overlays/SearchableList/SearchableListOverlay.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Overlays.SearchableList
                             {
                                 RelativeSizeAxes = Axes.X,
                                 AutoSizeAxes = Axes.Y,
-                                Padding = new MarginPadding { Horizontal = WIDTH_PADDING, Bottom = 50 },
+                                Padding = new MarginPadding { Horizontal = 10, Bottom = 50 },
                                 Direction = FillDirection.Vertical,
                             },
                         },

From 15e47d843295e1d22d9f13b5e72c546b362caed7 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 4 Mar 2020 12:20:49 +0300
Subject: [PATCH 0876/1142] Implement layout for UserGridCard

---
 .../Visual/UserInterface/TestSceneUserCard.cs | 47 ++++++---
 .../UserInterfaceV2/Users/UserCard.cs         |  1 -
 .../UserInterfaceV2/Users/UserGridCard.cs     | 95 ++++++++++++++++++-
 .../UserInterfaceV2/Users/UserListCard.cs     |  1 -
 4 files changed, 126 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.cs
index 8134af8208..2966ee242a 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.cs
@@ -36,16 +36,33 @@ namespace osu.Game.Tests.Visual.UserInterface
                 Spacing = new Vector2(0, 10),
                 Children = new Drawable[]
                 {
-                    new UserGridCard(new User
+                    new FillFlowContainer
                     {
-                        Username = @"flyte",
-                        Id = 3103765,
-                        Country = new Country { FlagName = @"JP" },
-                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
-                    })
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
+                        AutoSizeAxes = Axes.Both,
+                        Direction = FillDirection.Horizontal,
+                        Spacing = new Vector2(10),
+                        Children = new Drawable[]
+                        {
+                            new UserGridCard(new User
+                            {
+                                Username = @"flyte",
+                                Id = 3103765,
+                                Country = new Country { FlagName = @"JP" },
+                                CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg",
+                                IsOnline = true,
+                                IsSupporter = true,
+                                SupportLevel = 3,
+                            }),
+                            new UserGridCard(new User
+                            {
+                                Username = @"Evast",
+                                Id = 8195163,
+                                Country = new Country { FlagName = @"BY" },
+                                CoverUrl = @"https://assets.ppy.sh/user-profile-covers/8195163/4a8e2ad5a02a2642b631438cfa6c6bd7e2f9db289be881cb27df18331f64144c.jpeg",
+                                IsOnline = false,
+                                LastVisit = DateTimeOffset.Now
+                            })
+                        }
                     },
                     new UserListCard(new User
                     {
@@ -57,11 +74,15 @@ namespace osu.Game.Tests.Visual.UserInterface
                         SupportLevel = 3,
                         IsOnline = false,
                         LastVisit = DateTimeOffset.Now
-                    })
+                    }),
+                    new UserListCard(new User
                     {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                    }
+                        Username = @"chocomint",
+                        Id = 124493,
+                        Country = new Country { FlagName = @"KR" },
+                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c5.jpg",
+                        IsOnline = true,
+                    }),
                 }
             });
         }
diff --git a/osu.Game/Graphics/UserInterfaceV2/Users/UserCard.cs b/osu.Game/Graphics/UserInterfaceV2/Users/UserCard.cs
index 916c0c2401..dc26518692 100644
--- a/osu.Game/Graphics/UserInterfaceV2/Users/UserCard.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/Users/UserCard.cs
@@ -83,7 +83,6 @@ namespace osu.Game.Graphics.UserInterfaceV2.Users
         protected UpdateableAvatar CreateAvatar() => new UpdateableAvatar
         {
             User = User,
-            Masking = true,
             OpenOnClick = { Value = false }
         };
 
diff --git a/osu.Game/Graphics/UserInterfaceV2/Users/UserGridCard.cs b/osu.Game/Graphics/UserInterfaceV2/Users/UserGridCard.cs
index 7390d33b4e..b6e704e901 100644
--- a/osu.Game/Graphics/UserInterfaceV2/Users/UserGridCard.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/Users/UserGridCard.cs
@@ -1,8 +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 osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Overlays.Profile.Header.Components;
 using osu.Game.Users;
 using osuTK;
 
@@ -10,6 +12,8 @@ namespace osu.Game.Graphics.UserInterfaceV2.Users
 {
     public class UserGridCard : UserCard
     {
+        private const int margin = 10;
+
         public UserGridCard(User user)
             : base(user)
         {
@@ -17,9 +21,94 @@ namespace osu.Game.Graphics.UserInterfaceV2.Users
             CornerRadius = 10;
         }
 
-        protected override Drawable CreateLayout() => new Container
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            RelativeSizeAxes = Axes.Both,
-        };
+            Background.FadeTo(User.IsOnline ? 0.6f : 0.7f);
+        }
+
+        protected override Drawable CreateLayout()
+        {
+            FillFlowContainer details;
+
+            var layout = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Padding = new MarginPadding(margin),
+                Child = new GridContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    ColumnDimensions = new[]
+                    {
+                        new Dimension(GridSizeMode.AutoSize),
+                        new Dimension()
+                    },
+                    RowDimensions = new[]
+                    {
+                        new Dimension(GridSizeMode.AutoSize),
+                        new Dimension()
+                    },
+                    Content = new[]
+                    {
+                        new Drawable[]
+                        {
+                            CreateAvatar().With(avatar =>
+                            {
+                                avatar.Size = new Vector2(60);
+                                avatar.Margin = new MarginPadding { Bottom = margin };
+                                avatar.Masking = true;
+                                avatar.CornerRadius = 6;
+                            }),
+                            new FillFlowContainer
+                            {
+                                AutoSizeAxes = Axes.Both,
+                                Direction = FillDirection.Vertical,
+                                Spacing = new Vector2(0, 7),
+                                Margin = new MarginPadding { Left = margin },
+                                Children = new Drawable[]
+                                {
+                                    details = new FillFlowContainer
+                                    {
+                                        AutoSizeAxes = Axes.Both,
+                                        Direction = FillDirection.Horizontal,
+                                        Spacing = new Vector2(6),
+                                        Children = new Drawable[]
+                                        {
+                                            CreateFlag(),
+                                        }
+                                    },
+                                    CreateUsername(),
+                                }
+                            }
+                        },
+                        new Drawable[]
+                        {
+                            CreateStatusIcon().With(icon =>
+                            {
+                                icon.Anchor = Anchor.Centre;
+                                icon.Origin = Anchor.Centre;
+                            }),
+                            CreateStatusMessage(false).With(message =>
+                            {
+                                message.Anchor = Anchor.CentreLeft;
+                                message.Origin = Anchor.CentreLeft;
+                                message.Margin = new MarginPadding { Left = margin };
+                            })
+                        }
+                    }
+                }
+            };
+
+            if (User.IsSupporter)
+            {
+                details.Add(new SupporterIcon
+                {
+                    Height = 26,
+                    SupportLevel = User.SupportLevel
+                });
+            }
+
+            return layout;
+        }
     }
 }
diff --git a/osu.Game/Graphics/UserInterfaceV2/Users/UserListCard.cs b/osu.Game/Graphics/UserInterfaceV2/Users/UserListCard.cs
index 9be6ba9c65..685556035e 100644
--- a/osu.Game/Graphics/UserInterfaceV2/Users/UserListCard.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/Users/UserListCard.cs
@@ -53,7 +53,6 @@ namespace osu.Game.Graphics.UserInterfaceV2.Users
                                 avatar.Anchor = Anchor.CentreLeft;
                                 avatar.Origin = Anchor.CentreLeft;
                                 avatar.Size = new Vector2(40);
-                                avatar.Masking = false;
                             }),
                             CreateFlag().With(flag =>
                             {

From 8a437e1b5452bb14f5be2f1c66c20dd1af616467 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 4 Mar 2020 12:42:21 +0300
Subject: [PATCH 0877/1142] Add ability to send pm via context menu

---
 .../Visual/UserInterface/TestSceneUserCard.cs | 107 +++++++++---------
 .../UserInterfaceV2/Users/UserCard.cs         |  17 ++-
 2 files changed, 70 insertions(+), 54 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.cs
index 2966ee242a..0d5967b5a8 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.UserInterfaceV2.Users;
 using osu.Game.Overlays;
 using osu.Game.Users;
@@ -27,62 +28,66 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         public TestSceneUserCard()
         {
-            Add(new FillFlowContainer
+            Add(new OsuContextMenuContainer
             {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                AutoSizeAxes = Axes.Y,
-                RelativeSizeAxes = Axes.X,
-                Spacing = new Vector2(0, 10),
-                Children = new Drawable[]
+                RelativeSizeAxes = Axes.Both,
+                Child = new FillFlowContainer
                 {
-                    new FillFlowContainer
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    AutoSizeAxes = Axes.Y,
+                    RelativeSizeAxes = Axes.X,
+                    Spacing = new Vector2(0, 10),
+                    Children = new Drawable[]
                     {
-                        AutoSizeAxes = Axes.Both,
-                        Direction = FillDirection.Horizontal,
-                        Spacing = new Vector2(10),
-                        Children = new Drawable[]
+                        new FillFlowContainer
                         {
-                            new UserGridCard(new User
+                            AutoSizeAxes = Axes.Both,
+                            Direction = FillDirection.Horizontal,
+                            Spacing = new Vector2(10),
+                            Children = new Drawable[]
                             {
-                                Username = @"flyte",
-                                Id = 3103765,
-                                Country = new Country { FlagName = @"JP" },
-                                CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg",
-                                IsOnline = true,
-                                IsSupporter = true,
-                                SupportLevel = 3,
-                            }),
-                            new UserGridCard(new User
-                            {
-                                Username = @"Evast",
-                                Id = 8195163,
-                                Country = new Country { FlagName = @"BY" },
-                                CoverUrl = @"https://assets.ppy.sh/user-profile-covers/8195163/4a8e2ad5a02a2642b631438cfa6c6bd7e2f9db289be881cb27df18331f64144c.jpeg",
-                                IsOnline = false,
-                                LastVisit = DateTimeOffset.Now
-                            })
-                        }
-                    },
-                    new UserListCard(new User
-                    {
-                        Username = @"peppy",
-                        Id = 2,
-                        Country = new Country { FlagName = @"AU" },
-                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
-                        IsSupporter = true,
-                        SupportLevel = 3,
-                        IsOnline = false,
-                        LastVisit = DateTimeOffset.Now
-                    }),
-                    new UserListCard(new User
-                    {
-                        Username = @"chocomint",
-                        Id = 124493,
-                        Country = new Country { FlagName = @"KR" },
-                        CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c5.jpg",
-                        IsOnline = true,
-                    }),
+                                new UserGridCard(new User
+                                {
+                                    Username = @"flyte",
+                                    Id = 3103765,
+                                    Country = new Country { FlagName = @"JP" },
+                                    CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg",
+                                    IsOnline = true,
+                                    IsSupporter = true,
+                                    SupportLevel = 3,
+                                }),
+                                new UserGridCard(new User
+                                {
+                                    Username = @"Evast",
+                                    Id = 8195163,
+                                    Country = new Country { FlagName = @"BY" },
+                                    CoverUrl = @"https://assets.ppy.sh/user-profile-covers/8195163/4a8e2ad5a02a2642b631438cfa6c6bd7e2f9db289be881cb27df18331f64144c.jpeg",
+                                    IsOnline = false,
+                                    LastVisit = DateTimeOffset.Now
+                                })
+                            }
+                        },
+                        new UserListCard(new User
+                        {
+                            Username = @"peppy",
+                            Id = 2,
+                            Country = new Country { FlagName = @"AU" },
+                            CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
+                            IsSupporter = true,
+                            SupportLevel = 3,
+                            IsOnline = false,
+                            LastVisit = DateTimeOffset.Now
+                        }),
+                        new UserListCard(new User
+                        {
+                            Username = @"chocomint",
+                            Id = 124493,
+                            Country = new Country { FlagName = @"KR" },
+                            CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c5.jpg",
+                            IsOnline = true,
+                        }),
+                    }
                 }
             });
         }
diff --git a/osu.Game/Graphics/UserInterfaceV2/Users/UserCard.cs b/osu.Game/Graphics/UserInterfaceV2/Users/UserCard.cs
index dc26518692..4808990c70 100644
--- a/osu.Game/Graphics/UserInterfaceV2/Users/UserCard.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/Users/UserCard.cs
@@ -18,9 +18,9 @@ using JetBrains.Annotations;
 using osu.Game.Users.Drawables;
 using osuTK;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Overlays.Profile.Header.Components;
 using osu.Framework.Graphics.Sprites;
 using osuTK.Graphics;
+using osu.Game.Online.Chat;
 
 namespace osu.Game.Graphics.UserInterfaceV2.Users
 {
@@ -32,7 +32,7 @@ namespace osu.Game.Graphics.UserInterfaceV2.Users
 
         protected DelayedLoadUnloadWrapper Background;
 
-        public UserCard(User user)
+        protected UserCard(User user)
         {
             if (user == null)
                 throw new ArgumentNullException(nameof(user));
@@ -43,6 +43,12 @@ namespace osu.Game.Graphics.UserInterfaceV2.Users
         [Resolved(canBeNull: true)]
         private UserProfileOverlay profileOverlay { get; set; }
 
+        [Resolved(canBeNull: true)]
+        private ChannelManager channelManager { get; set; }
+
+        [Resolved(canBeNull: true)]
+        private ChatOverlay chatOverlay { get; set; }
+
         [Resolved]
         private OsuColour colours { get; set; }
 
@@ -54,7 +60,7 @@ namespace osu.Game.Graphics.UserInterfaceV2.Users
             Masking = true;
             BorderColour = colours.GreyVioletLighter;
 
-            AddRange(new Drawable[]
+            AddRange(new[]
             {
                 new Box
                 {
@@ -152,6 +158,11 @@ namespace osu.Game.Graphics.UserInterfaceV2.Users
         public MenuItem[] ContextMenuItems => new MenuItem[]
         {
             new OsuMenuItem("View Profile", MenuItemType.Highlighted, Action),
+            new OsuMenuItem("Send message", MenuItemType.Standard, () =>
+            {
+                channelManager?.OpenPrivateChannel(User);
+                chatOverlay?.Show();
+            })
         };
     }
 }

From bac35b2a68f15a0abe079f94a17883e6c040ef68 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Mar 2020 19:09:52 +0900
Subject: [PATCH 0878/1142] Handle beatmap track changing in a saner way

---
 osu.Game/OsuGame.cs | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 69d5a9a583..0be9e6cdaa 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -396,18 +396,27 @@ namespace osu.Game
 
         private void beatmapChanged(ValueChangedEvent<WorkingBeatmap> beatmap)
         {
-            var nextBeatmap = beatmap.NewValue;
-            if (nextBeatmap?.Track != null)
-                nextBeatmap.Track.Completed += currentTrackCompleted;
-
-            var oldBeatmap = beatmap.OldValue;
-            if (oldBeatmap?.Track != null)
-                oldBeatmap.Track.Completed -= currentTrackCompleted;
+            beatmap.OldValue?.CancelAsyncLoad();
 
             updateModDefaults();
 
-            oldBeatmap?.CancelAsyncLoad();
-            nextBeatmap?.BeginAsyncLoad();
+            var newBeatmap = beatmap.NewValue;
+
+            if (newBeatmap != null)
+            {
+                newBeatmap.Track.Completed += () => Scheduler.AddOnce(() => trackCompleted(newBeatmap));
+                newBeatmap.BeginAsyncLoad();
+            }
+
+            void trackCompleted(WorkingBeatmap b)
+            {
+                // the source of track completion is the audio thread, so the beatmap may have changed before a firing.
+                if (Beatmap.Value != b)
+                    return;
+
+                if (Beatmap.Value.Track.Looping && !Beatmap.Disabled)
+                    musicController.NextTrack();
+            }
         }
 
         private void modsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
@@ -428,18 +437,6 @@ namespace osu.Game
             }
         }
 
-        private void currentTrackCompleted()
-        {
-            if (Beatmap.Value is DummyWorkingBeatmap)
-                return;
-
-            Schedule(() =>
-            {
-                if (Beatmap.Value.Track.Looping && !Beatmap.Disabled)
-                    musicController.NextTrack();
-            });
-        }
-
         #endregion
 
         private ScheduledDelegate performFromMainMenuTask;

From 38d91ccd0d20dcd4f9f4e016f03da00da2ba8152 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Mar 2020 19:07:34 +0900
Subject: [PATCH 0879/1142] Add comment regarding no-longer-required schedule

---
 osu.Game/OsuGameBase.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index a890331f05..67aa4a8d4d 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -211,6 +211,10 @@ namespace osu.Game
             Audio.Tracks.AddAdjustment(AdjustableProperty.Volume, new BindableDouble(0.8));
 
             Beatmap = new NonNullableBindable<WorkingBeatmap>(defaultBeatmap);
+
+            // ScheduleAfterChildren is safety against something in the current frame accessing the previous beatmap's track
+            // and potentially causing a reload of it after just unloading.
+            // Note that the reason for this being added *has* been resolved, so it may be feasible to remover this if required.
             Beatmap.BindValueChanged(b => ScheduleAfterChildren(() =>
             {
                 // compare to last beatmap as sometimes the two may share a track representation (optimisation, see WorkingBeatmap.TransferTo)

From a62550b3239791678ab70613ad8ac522101e5788 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Mar 2020 20:14:18 +0900
Subject: [PATCH 0880/1142] Reapply filters on next change after a forced
 beatmap display

---
 osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs | 7 +++++++
 osu.Game/Screens/Select/Carousel/CarouselItem.cs    | 2 +-
 osu.Game/Screens/Select/FilterCriteria.cs           | 2 ++
 osu.Game/Screens/Select/SongSelect.cs               | 7 +++++--
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index 2ffb73f226..d78d407748 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -25,6 +25,13 @@ namespace osu.Game.Screens.Select.Carousel
         {
             base.Filter(criteria);
 
+            if (Beatmap.Equals(criteria.SelectedBeatmap))
+            {
+                // bypass filtering for selected beatmap
+                Filtered.Value = false;
+                return;
+            }
+
             bool match =
                 criteria.Ruleset == null ||
                 Beatmap.RulesetID == criteria.Ruleset.ID ||
diff --git a/osu.Game/Screens/Select/Carousel/CarouselItem.cs b/osu.Game/Screens/Select/Carousel/CarouselItem.cs
index 1108b72bd2..79c1a4cb6b 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselItem.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselItem.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.Select.Carousel
         /// <summary>
         /// This item is not in a hidden state.
         /// </summary>
-        public bool Visible => State.Value == CarouselItemState.Selected || (State.Value != CarouselItemState.Collapsed && !Filtered.Value);
+        public bool Visible => State.Value != CarouselItemState.Collapsed && !Filtered.Value;
 
         public virtual List<DrawableCarouselItem> Drawables
         {
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index 9fa57af01d..a5c4e2961d 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -15,6 +15,8 @@ namespace osu.Game.Screens.Select
         public GroupMode Group;
         public SortMode Sort;
 
+        public BeatmapInfo SelectedBeatmap;
+
         public OptionalRange<double> StarDifficulty;
         public OptionalRange<float> ApproachRate;
         public OptionalRange<float> DrainRate;
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 67626d1e4f..90ad7a7fdd 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -392,8 +392,11 @@ namespace osu.Game.Screens.Select
                 }
 
                 // Even if a ruleset mismatch was not the cause (ie. a text filter is applied),
-                // we still want to forcefully show the new beatmap, bypassing filters.
-                Carousel.SelectBeatmap(e.NewValue.BeatmapInfo);
+                // we still want to temporarily show the new beatmap, bypassing filters.
+                // This will be undone the next time the user changes the filter.
+                var criteria = FilterControl.CreateCriteria();
+                criteria.SelectedBeatmap = e.NewValue.BeatmapInfo;
+                Carousel.Filter(criteria);
             }
         }
 

From 6631b074421aabf4e50f5a061c10475864a8244a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 4 Mar 2020 14:58:15 +0300
Subject: [PATCH 0881/1142] Refactor to replace existing panels

---
 .../Online/TestSceneAccountCreationOverlay.cs |   2 +-
 .../Visual/Online/TestSceneSocialOverlay.cs   |   5 +-
 .../Visual/Online/TestSceneUserPanel.cs       |  25 +-
 .../Visual/UserInterface/TestSceneUserCard.cs |  95 ------
 .../Screens/Editors/TeamEditorScreen.cs       |   2 +-
 .../UserInterfaceV2/Users/UserCard.cs         | 168 ----------
 .../Sections/General/LoginSettings.cs         |   2 +-
 osu.Game/Overlays/Social/SocialGridPanel.cs   |  16 -
 osu.Game/Overlays/Social/SocialListPanel.cs   |  17 -
 osu.Game/Overlays/Social/SocialPanel.cs       |  61 ----
 osu.Game/Overlays/SocialOverlay.cs            |  13 +-
 .../UserGridPanel.cs}                         |  11 +-
 .../UserListPanel.cs}                         |   9 +-
 osu.Game/Users/UserPanel.cs                   | 305 ++++++++----------
 osu.Game/Users/UserStatus.cs                  |   4 +-
 15 files changed, 175 insertions(+), 560 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.cs
 delete mode 100644 osu.Game/Graphics/UserInterfaceV2/Users/UserCard.cs
 delete mode 100644 osu.Game/Overlays/Social/SocialGridPanel.cs
 delete mode 100644 osu.Game/Overlays/Social/SocialListPanel.cs
 delete mode 100644 osu.Game/Overlays/Social/SocialPanel.cs
 rename osu.Game/{Graphics/UserInterfaceV2/Users/UserGridCard.cs => Users/UserGridPanel.cs} (93%)
 rename osu.Game/{Graphics/UserInterfaceV2/Users/UserListCard.cs => Users/UserListPanel.cs} (94%)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
index 31eab7f74e..a53a818065 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Tests.Visual.Online
             API.Logout();
 
             localUser = API.LocalUser.GetBoundCopy();
-            localUser.BindValueChanged(user => { userPanelArea.Child = new UserPanel(user.NewValue) { Width = 200 }; }, true);
+            localUser.BindValueChanged(user => { userPanelArea.Child = new UserGridPanel(user.NewValue) { Width = 200 }; }, true);
 
             AddStep("logout", API.Logout);
         }
diff --git a/osu.Game.Tests/Visual/Online/TestSceneSocialOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneSocialOverlay.cs
index dbd7544b38..24341cbd05 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneSocialOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneSocialOverlay.cs
@@ -18,10 +18,9 @@ namespace osu.Game.Tests.Visual.Online
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(UserPanel),
-            typeof(SocialPanel),
             typeof(FilterControl),
-            typeof(SocialGridPanel),
-            typeof(SocialListPanel)
+            typeof(UserGridPanel),
+            typeof(UserListPanel)
         };
 
         public TestSceneSocialOverlay()
diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
index 54f06d6ad2..f4c96ac251 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
+using System.Collections.Generic;
 using NUnit.Framework;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -13,6 +15,13 @@ namespace osu.Game.Tests.Visual.Online
     [TestFixture]
     public class TestSceneUserPanel : OsuTestScene
     {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(UserPanel),
+            typeof(UserListPanel),
+            typeof(UserGridPanel),
+        };
+
         private readonly UserPanel peppy;
 
         public TestSceneUserPanel()
@@ -23,18 +32,19 @@ namespace osu.Game.Tests.Visual.Online
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
-                AutoSizeAxes = Axes.Both,
+                AutoSizeAxes = Axes.Y,
+                RelativeSizeAxes = Axes.X,
                 Spacing = new Vector2(10f),
                 Children = new[]
                 {
-                    flyte = new UserPanel(new User
+                    flyte = new UserGridPanel(new User
                     {
                         Username = @"flyte",
                         Id = 3103765,
                         Country = new Country { FlagName = @"JP" },
                         CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
                     }) { Width = 300 },
-                    peppy = new UserPanel(new User
+                    peppy = new UserGridPanel(new User
                     {
                         Username = @"peppy",
                         Id = 2,
@@ -43,6 +53,15 @@ namespace osu.Game.Tests.Visual.Online
                         IsSupporter = true,
                         SupportLevel = 3,
                     }) { Width = 300 },
+                    new UserListPanel(new User
+                    {
+                        Username = @"Evast",
+                        Id = 8195163,
+                        Country = new Country { FlagName = @"BY" },
+                        CoverUrl = @"https://assets.ppy.sh/user-profile-covers/8195163/4a8e2ad5a02a2642b631438cfa6c6bd7e2f9db289be881cb27df18331f64144c.jpeg",
+                        IsOnline = false,
+                        LastVisit = DateTimeOffset.Now
+                    })
                 },
             });
 
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.cs
deleted file mode 100644
index 0d5967b5a8..0000000000
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneUserCard.cs
+++ /dev/null
@@ -1,95 +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 System;
-using System.Collections.Generic;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics.Cursor;
-using osu.Game.Graphics.UserInterfaceV2.Users;
-using osu.Game.Overlays;
-using osu.Game.Users;
-using osuTK;
-
-namespace osu.Game.Tests.Visual.UserInterface
-{
-    public class TestSceneUserCard : OsuTestScene
-    {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(UserCard),
-            typeof(UserGridCard),
-            typeof(UserListCard)
-        };
-
-        [Cached]
-        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
-
-        public TestSceneUserCard()
-        {
-            Add(new OsuContextMenuContainer
-            {
-                RelativeSizeAxes = Axes.Both,
-                Child = new FillFlowContainer
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    AutoSizeAxes = Axes.Y,
-                    RelativeSizeAxes = Axes.X,
-                    Spacing = new Vector2(0, 10),
-                    Children = new Drawable[]
-                    {
-                        new FillFlowContainer
-                        {
-                            AutoSizeAxes = Axes.Both,
-                            Direction = FillDirection.Horizontal,
-                            Spacing = new Vector2(10),
-                            Children = new Drawable[]
-                            {
-                                new UserGridCard(new User
-                                {
-                                    Username = @"flyte",
-                                    Id = 3103765,
-                                    Country = new Country { FlagName = @"JP" },
-                                    CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg",
-                                    IsOnline = true,
-                                    IsSupporter = true,
-                                    SupportLevel = 3,
-                                }),
-                                new UserGridCard(new User
-                                {
-                                    Username = @"Evast",
-                                    Id = 8195163,
-                                    Country = new Country { FlagName = @"BY" },
-                                    CoverUrl = @"https://assets.ppy.sh/user-profile-covers/8195163/4a8e2ad5a02a2642b631438cfa6c6bd7e2f9db289be881cb27df18331f64144c.jpeg",
-                                    IsOnline = false,
-                                    LastVisit = DateTimeOffset.Now
-                                })
-                            }
-                        },
-                        new UserListCard(new User
-                        {
-                            Username = @"peppy",
-                            Id = 2,
-                            Country = new Country { FlagName = @"AU" },
-                            CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
-                            IsSupporter = true,
-                            SupportLevel = 3,
-                            IsOnline = false,
-                            LastVisit = DateTimeOffset.Now
-                        }),
-                        new UserListCard(new User
-                        {
-                            Username = @"chocomint",
-                            Id = 124493,
-                            Country = new Country { FlagName = @"KR" },
-                            CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c5.jpg",
-                            IsOnline = true,
-                        }),
-                    }
-                }
-            });
-        }
-    }
-}
diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index ca8bce1cca..bbbc948811 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -311,7 +311,7 @@ namespace osu.Game.Tournament.Screens.Editors
 
                     private void updatePanel()
                     {
-                        drawableContainer.Child = new UserPanel(user) { Width = 300 };
+                        drawableContainer.Child = new UserGridPanel(user) { Width = 300 };
                     }
                 }
             }
diff --git a/osu.Game/Graphics/UserInterfaceV2/Users/UserCard.cs b/osu.Game/Graphics/UserInterfaceV2/Users/UserCard.cs
deleted file mode 100644
index 4808990c70..0000000000
--- a/osu.Game/Graphics/UserInterfaceV2/Users/UserCard.cs
+++ /dev/null
@@ -1,168 +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 System;
-using osu.Framework.Allocation;
-using osu.Game.Overlays;
-using osu.Framework.Graphics.UserInterface;
-using osu.Game.Graphics.UserInterface;
-using osu.Framework.Graphics.Cursor;
-using osu.Game.Graphics.Containers;
-using osu.Game.Users;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using System.Collections.Generic;
-using osu.Framework.Input.Events;
-using osu.Framework.Graphics.Shapes;
-using JetBrains.Annotations;
-using osu.Game.Users.Drawables;
-using osuTK;
-using osu.Game.Graphics.Sprites;
-using osu.Framework.Graphics.Sprites;
-using osuTK.Graphics;
-using osu.Game.Online.Chat;
-
-namespace osu.Game.Graphics.UserInterfaceV2.Users
-{
-    public abstract class UserCard : OsuHoverContainer, IHasContextMenu
-    {
-        public User User { get; }
-
-        protected override IEnumerable<Drawable> EffectTargets => null;
-
-        protected DelayedLoadUnloadWrapper Background;
-
-        protected UserCard(User user)
-        {
-            if (user == null)
-                throw new ArgumentNullException(nameof(user));
-
-            User = user;
-        }
-
-        [Resolved(canBeNull: true)]
-        private UserProfileOverlay profileOverlay { get; set; }
-
-        [Resolved(canBeNull: true)]
-        private ChannelManager channelManager { get; set; }
-
-        [Resolved(canBeNull: true)]
-        private ChatOverlay chatOverlay { get; set; }
-
-        [Resolved]
-        private OsuColour colours { get; set; }
-
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
-        {
-            Action = () => profileOverlay?.ShowUser(User);
-
-            Masking = true;
-            BorderColour = colours.GreyVioletLighter;
-
-            AddRange(new[]
-            {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = colourProvider.Background5
-                },
-                Background = new DelayedLoadUnloadWrapper(() => new UserCoverBackground
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    User = User,
-                }, 300, 5000)
-                {
-                    Anchor = Anchor.CentreRight,
-                    Origin = Anchor.CentreRight,
-                    RelativeSizeAxes = Axes.Both,
-                },
-                CreateLayout()
-            });
-        }
-
-        [NotNull]
-        protected abstract Drawable CreateLayout();
-
-        protected UpdateableAvatar CreateAvatar() => new UpdateableAvatar
-        {
-            User = User,
-            OpenOnClick = { Value = false }
-        };
-
-        protected UpdateableFlag CreateFlag() => new UpdateableFlag(User.Country)
-        {
-            Size = new Vector2(39, 26)
-        };
-
-        protected OsuSpriteText CreateUsername() => new OsuSpriteText
-        {
-            Font = OsuFont.GetFont(size: 20, weight: FontWeight.Bold, italics: true),
-            Text = User.Username,
-        };
-
-        protected SpriteIcon CreateStatusIcon() => new SpriteIcon
-        {
-            Icon = FontAwesome.Regular.Circle,
-            Size = new Vector2(25),
-            Colour = User.IsOnline ? colours.GreenLight : Color4.Black
-        };
-
-        protected FillFlowContainer CreateStatusMessage(bool rightAlignedChildren)
-        {
-            var status = new FillFlowContainer
-            {
-                AutoSizeAxes = Axes.Both,
-                Direction = FillDirection.Vertical
-            };
-
-            var alignment = rightAlignedChildren ? Anchor.x2 : Anchor.x0;
-
-            if (!User.IsOnline && User.LastVisit.HasValue)
-            {
-                status.Add(new TextFlowContainer(t => t.Font = OsuFont.GetFont(size: 15)).With(text =>
-                {
-                    text.Anchor = Anchor.y1 | alignment;
-                    text.Origin = Anchor.y1 | alignment;
-                    text.AutoSizeAxes = Axes.Both;
-                    text.AddText(@"Last seen ");
-                    text.AddText(new DrawableDate(User.LastVisit.Value, italic: false));
-                }));
-            }
-
-            status.Add(new OsuSpriteText
-            {
-                Anchor = Anchor.y1 | alignment,
-                Origin = Anchor.y1 | alignment,
-                Font = OsuFont.GetFont(size: 17),
-                Text = User.IsOnline ? @"Online" : @"Offline"
-            });
-
-            return status;
-        }
-
-        protected override bool OnHover(HoverEvent e)
-        {
-            BorderThickness = 2;
-            return base.OnHover(e);
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            BorderThickness = 0;
-            base.OnHoverLost(e);
-        }
-
-        public MenuItem[] ContextMenuItems => new MenuItem[]
-        {
-            new OsuMenuItem("View Profile", MenuItemType.Highlighted, Action),
-            new OsuMenuItem("Send message", MenuItemType.Standard, () =>
-            {
-                channelManager?.OpenPrivateChannel(User);
-                chatOverlay?.Show();
-            })
-        };
-    }
-}
diff --git a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
index bf0e073350..3ab64786a2 100644
--- a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
@@ -143,7 +143,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
                                         },
                                     },
                                 },
-                                panel = new UserPanel(api.LocalUser.Value)
+                                panel = new UserGridPanel(api.LocalUser.Value)
                                 {
                                     RelativeSizeAxes = Axes.X,
                                     Action = RequestHide
diff --git a/osu.Game/Overlays/Social/SocialGridPanel.cs b/osu.Game/Overlays/Social/SocialGridPanel.cs
deleted file mode 100644
index 6f707d640b..0000000000
--- a/osu.Game/Overlays/Social/SocialGridPanel.cs
+++ /dev/null
@@ -1,16 +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.Game.Users;
-
-namespace osu.Game.Overlays.Social
-{
-    public class SocialGridPanel : SocialPanel
-    {
-        public SocialGridPanel(User user)
-            : base(user)
-        {
-            Width = 300;
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Social/SocialListPanel.cs b/osu.Game/Overlays/Social/SocialListPanel.cs
deleted file mode 100644
index 1ba91e9204..0000000000
--- a/osu.Game/Overlays/Social/SocialListPanel.cs
+++ /dev/null
@@ -1,17 +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.Graphics;
-using osu.Game.Users;
-
-namespace osu.Game.Overlays.Social
-{
-    public class SocialListPanel : SocialPanel
-    {
-        public SocialListPanel(User user)
-            : base(user)
-        {
-            RelativeSizeAxes = Axes.X;
-        }
-    }
-}
diff --git a/osu.Game/Overlays/Social/SocialPanel.cs b/osu.Game/Overlays/Social/SocialPanel.cs
deleted file mode 100644
index 555527670a..0000000000
--- a/osu.Game/Overlays/Social/SocialPanel.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osuTK;
-using osuTK.Graphics;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Effects;
-using osu.Framework.Input.Events;
-using osu.Game.Users;
-
-namespace osu.Game.Overlays.Social
-{
-    public class SocialPanel : UserPanel
-    {
-        private const double hover_transition_time = 400;
-
-        public SocialPanel(User user)
-            : base(user)
-        {
-        }
-
-        private readonly EdgeEffectParameters edgeEffectNormal = new EdgeEffectParameters
-        {
-            Type = EdgeEffectType.Shadow,
-            Offset = new Vector2(0f, 1f),
-            Radius = 2f,
-            Colour = Color4.Black.Opacity(0.25f),
-        };
-
-        private readonly EdgeEffectParameters edgeEffectHovered = new EdgeEffectParameters
-        {
-            Type = EdgeEffectType.Shadow,
-            Offset = new Vector2(0f, 5f),
-            Radius = 10f,
-            Colour = Color4.Black.Opacity(0.3f),
-        };
-
-        protected override bool OnHover(HoverEvent e)
-        {
-            Content.TweenEdgeEffectTo(edgeEffectHovered, hover_transition_time, Easing.OutQuint);
-            Content.MoveToY(-4, hover_transition_time, Easing.OutQuint);
-
-            return base.OnHover(e);
-        }
-
-        protected override void OnHoverLost(HoverLostEvent e)
-        {
-            Content.TweenEdgeEffectTo(edgeEffectNormal, hover_transition_time, Easing.OutQuint);
-            Content.MoveToY(0, hover_transition_time, Easing.OutQuint);
-
-            base.OnHoverLost(e);
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            this.FadeInFromZero(200, Easing.Out);
-        }
-    }
-}
diff --git a/osu.Game/Overlays/SocialOverlay.cs b/osu.Game/Overlays/SocialOverlay.cs
index 54c978738d..5a9dd54d53 100644
--- a/osu.Game/Overlays/SocialOverlay.cs
+++ b/osu.Game/Overlays/SocialOverlay.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Overlays
     public class SocialOverlay : SearchableListOverlay<SocialTab, SocialSortCriteria, SortDirection>
     {
         private readonly LoadingSpinner loading;
-        private FillFlowContainer<SocialPanel> panels;
+        private FillFlowContainer<UserPanel> panels;
 
         protected override Color4 BackgroundColour => OsuColour.FromHex(@"60284b");
         protected override Color4 TrianglesColourLight => OsuColour.FromHex(@"672b51");
@@ -158,7 +158,7 @@ namespace osu.Game.Overlays
             if (Filter.DisplayStyleControl.Dropdown.Current.Value == SortDirection.Descending)
                 sortedUsers = sortedUsers.Reverse();
 
-            var newPanels = new FillFlowContainer<SocialPanel>
+            var newPanels = new FillFlowContainer<UserPanel>
             {
                 RelativeSizeAxes = Axes.X,
                 AutoSizeAxes = Axes.Y,
@@ -166,20 +166,21 @@ namespace osu.Game.Overlays
                 Margin = new MarginPadding { Top = 10 },
                 ChildrenEnumerable = sortedUsers.Select(u =>
                 {
-                    SocialPanel panel;
+                    UserPanel panel;
 
                     switch (Filter.DisplayStyleControl.DisplayStyle.Value)
                     {
                         case PanelDisplayStyle.Grid:
-                            panel = new SocialGridPanel(u)
+                            panel = new UserGridPanel(u)
                             {
                                 Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre
+                                Origin = Anchor.TopCentre,
+                                Width = 290,
                             };
                             break;
 
                         default:
-                            panel = new SocialListPanel(u);
+                            panel = new UserListPanel(u);
                             break;
                     }
 
diff --git a/osu.Game/Graphics/UserInterfaceV2/Users/UserGridCard.cs b/osu.Game/Users/UserGridPanel.cs
similarity index 93%
rename from osu.Game/Graphics/UserInterfaceV2/Users/UserGridCard.cs
rename to osu.Game/Users/UserGridPanel.cs
index b6e704e901..f9c5c2b0cc 100644
--- a/osu.Game/Graphics/UserInterfaceV2/Users/UserGridCard.cs
+++ b/osu.Game/Users/UserGridPanel.cs
@@ -5,26 +5,25 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Overlays.Profile.Header.Components;
-using osu.Game.Users;
 using osuTK;
 
-namespace osu.Game.Graphics.UserInterfaceV2.Users
+namespace osu.Game.Users
 {
-    public class UserGridCard : UserCard
+    public class UserGridPanel : UserPanel
     {
         private const int margin = 10;
 
-        public UserGridCard(User user)
+        public UserGridPanel(User user)
             : base(user)
         {
-            Size = new Vector2(290, 120);
+            Height = 120;
             CornerRadius = 10;
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            Background.FadeTo(User.IsOnline ? 0.6f : 0.7f);
+            Background.FadeTo(0.6f);
         }
 
         protected override Drawable CreateLayout()
diff --git a/osu.Game/Graphics/UserInterfaceV2/Users/UserListCard.cs b/osu.Game/Users/UserListPanel.cs
similarity index 94%
rename from osu.Game/Graphics/UserInterfaceV2/Users/UserListCard.cs
rename to osu.Game/Users/UserListPanel.cs
index 685556035e..087de13706 100644
--- a/osu.Game/Graphics/UserInterfaceV2/Users/UserListCard.cs
+++ b/osu.Game/Users/UserListPanel.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 osu.Game.Users;
 using osu.Framework.Graphics;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Colour;
@@ -11,11 +10,11 @@ using osu.Framework.Graphics.Containers;
 using osuTK;
 using osu.Game.Overlays.Profile.Header.Components;
 
-namespace osu.Game.Graphics.UserInterfaceV2.Users
+namespace osu.Game.Users
 {
-    public class UserListCard : UserCard
+    public class UserListPanel : UserPanel
     {
-        public UserListCard(User user)
+        public UserListPanel(User user)
             : base(user)
         {
             RelativeSizeAxes = Axes.X;
@@ -27,7 +26,7 @@ namespace osu.Game.Graphics.UserInterfaceV2.Users
         private void load()
         {
             Background.Width = 0.5f;
-            Background.Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(1), Color4.White.Opacity(User.IsOnline ? 0.6f : 0.7f));
+            Background.Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(1), Color4.White.Opacity(0.6f));
         }
 
         protected override Drawable CreateLayout()
diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index 6f34466e94..5a5f18dcfe 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -3,10 +3,8 @@
 
 using System;
 using osuTK;
-using osuTK.Graphics;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -16,32 +14,18 @@ using osu.Game.Overlays;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterface;
 using osu.Framework.Graphics.Cursor;
-using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics.Containers;
-using osu.Game.Overlays.Profile.Header.Components;
 using osu.Game.Users.Drawables;
+using JetBrains.Annotations;
+using osu.Framework.Input.Events;
 
 namespace osu.Game.Users
 {
-    public class UserPanel : OsuClickableContainer, IHasContextMenu
+    public abstract class UserPanel : OsuClickableContainer, IHasContextMenu
     {
-        private const float height = 100;
-        private const float content_padding = 10;
-        private const float status_height = 30;
-
         public readonly User User;
 
-        [Resolved(canBeNull: true)]
-        private OsuColour colours { get; set; }
-
-        private Container statusBar;
-        private Box statusBg;
-        private OsuSpriteText statusMessage;
-
-        private Container content;
-        protected override Container<Drawable> Content => content;
-
         public readonly Bindable<UserStatus> Status = new Bindable<UserStatus>();
 
         public readonly IBindable<UserActivity> Activity = new Bindable<UserActivity>();
@@ -50,164 +34,63 @@ namespace osu.Game.Users
 
         protected Action ViewProfile;
 
-        public UserPanel(User user)
+        protected DelayedLoadUnloadWrapper Background;
+
+        private SpriteIcon statusIcon;
+        private OsuSpriteText statusMessage;
+        private TextFlowContainer lastVisitMessage;
+
+        protected UserPanel(User user)
         {
             if (user == null)
                 throw new ArgumentNullException(nameof(user));
 
             User = user;
-
-            Height = height - status_height;
         }
 
-        [BackgroundDependencyLoader(permitNulls: true)]
-        private void load(UserProfileOverlay profile)
+        [Resolved(canBeNull: true)]
+        private UserProfileOverlay profileOverlay { get; set; }
+
+        [Resolved]
+        private OsuColour colours { get; set; }
+
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            if (colours == null)
-                throw new InvalidOperationException($"{nameof(colours)} not initialized!");
+            Action = () => profileOverlay?.ShowUser(User);
 
-            FillFlowContainer infoContainer;
+            Masking = true;
+            BorderColour = colours.GreyVioletLighter;
 
-            AddInternal(content = new Container
+            AddRange(new[]
             {
-                RelativeSizeAxes = Axes.Both,
-                Masking = true,
-                CornerRadius = 5,
-                EdgeEffect = new EdgeEffectParameters
+                new Box
                 {
-                    Type = EdgeEffectType.Shadow,
-                    Colour = Color4.Black.Opacity(0.25f),
-                    Radius = 4,
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colours.Gray1
                 },
-
-                Children = new Drawable[]
+                Background = new DelayedLoadUnloadWrapper(() => new UserCoverBackground
                 {
-                    new DelayedLoadUnloadWrapper(() => new UserCoverBackground
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        User = User,
-                    }, 300, 5000)
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = Color4.Black.Opacity(0.7f),
-                    },
-                    new Container
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Padding = new MarginPadding { Top = content_padding, Horizontal = content_padding },
-                        Children = new Drawable[]
-                        {
-                            new UpdateableAvatar
-                            {
-                                Size = new Vector2(height - status_height - content_padding * 2),
-                                User = User,
-                                Masking = true,
-                                CornerRadius = 5,
-                                OpenOnClick = { Value = false },
-                                EdgeEffect = new EdgeEffectParameters
-                                {
-                                    Type = EdgeEffectType.Shadow,
-                                    Colour = Color4.Black.Opacity(0.25f),
-                                    Radius = 4,
-                                },
-                            },
-                            new Container
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Padding = new MarginPadding { Left = height - status_height - content_padding },
-                                Children = new Drawable[]
-                                {
-                                    new OsuSpriteText
-                                    {
-                                        Text = User.Username,
-                                        Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 18, italics: true),
-                                    },
-                                    infoContainer = new FillFlowContainer
-                                    {
-                                        Anchor = Anchor.BottomLeft,
-                                        Origin = Anchor.BottomLeft,
-                                        AutoSizeAxes = Axes.X,
-                                        Height = 20f,
-                                        Direction = FillDirection.Horizontal,
-                                        Spacing = new Vector2(5f, 0f),
-                                        Children = new Drawable[]
-                                        {
-                                            new UpdateableFlag(User.Country)
-                                            {
-                                                Width = 30f,
-                                                RelativeSizeAxes = Axes.Y,
-                                            },
-                                        },
-                                    },
-                                },
-                            },
-                        },
-                    },
-                    statusBar = new Container
-                    {
-                        Anchor = Anchor.BottomLeft,
-                        Origin = Anchor.BottomLeft,
-                        RelativeSizeAxes = Axes.X,
-                        Alpha = 0f,
-                        Children = new Drawable[]
-                        {
-                            statusBg = new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Alpha = 0.5f,
-                            },
-                            new FillFlowContainer
-                            {
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                AutoSizeAxes = Axes.Both,
-                                Spacing = new Vector2(5f, 0f),
-                                Children = new Drawable[]
-                                {
-                                    new SpriteIcon
-                                    {
-                                        Anchor = Anchor.CentreLeft,
-                                        Origin = Anchor.CentreLeft,
-                                        Icon = FontAwesome.Regular.Circle,
-                                        Shadow = true,
-                                        Size = new Vector2(14),
-                                    },
-                                    statusMessage = new OsuSpriteText
-                                    {
-                                        Anchor = Anchor.CentreLeft,
-                                        Origin = Anchor.CentreLeft,
-                                        Font = OsuFont.GetFont(weight: FontWeight.SemiBold),
-                                    },
-                                },
-                            },
-                        },
-                    },
-                }
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    User = User,
+                }, 300, 5000)
+                {
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    RelativeSizeAxes = Axes.Both,
+                },
+                CreateLayout()
             });
 
-            if (User.IsSupporter)
-            {
-                infoContainer.Add(new SupporterIcon
-                {
-                    Height = 20f,
-                    SupportLevel = User.SupportLevel
-                });
-            }
-
             Status.ValueChanged += status => displayStatus(status.NewValue, Activity.Value);
             Activity.ValueChanged += activity => displayStatus(Status.Value, activity.NewValue);
 
             base.Action = ViewProfile = () =>
             {
                 Action?.Invoke();
-                profile?.ShowUser(User);
+                profileOverlay?.ShowUser(User);
             };
         }
 
@@ -217,33 +100,105 @@ namespace osu.Game.Users
             Status.TriggerChange();
         }
 
+        protected override bool OnHover(HoverEvent e)
+        {
+            BorderThickness = 2;
+            return base.OnHover(e);
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            BorderThickness = 0;
+            base.OnHoverLost(e);
+        }
+
+        [NotNull]
+        protected abstract Drawable CreateLayout();
+
+        protected UpdateableAvatar CreateAvatar() => new UpdateableAvatar
+        {
+            User = User,
+            OpenOnClick = { Value = false }
+        };
+
+        protected UpdateableFlag CreateFlag() => new UpdateableFlag(User.Country)
+        {
+            Size = new Vector2(39, 26)
+        };
+
+        protected OsuSpriteText CreateUsername() => new OsuSpriteText
+        {
+            Font = OsuFont.GetFont(size: 20, weight: FontWeight.Bold, italics: true),
+            Text = User.Username,
+        };
+
+        protected SpriteIcon CreateStatusIcon() => statusIcon = new SpriteIcon
+        {
+            Icon = FontAwesome.Regular.Circle,
+            Size = new Vector2(25)
+        };
+
+        protected FillFlowContainer CreateStatusMessage(bool rightAlignedChildren)
+        {
+            var statusContainer = new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Vertical
+            };
+
+            var alignment = rightAlignedChildren ? Anchor.x2 : Anchor.x0;
+
+            statusContainer.Add(lastVisitMessage = new TextFlowContainer(t => t.Font = OsuFont.GetFont(size: 15)).With(text =>
+            {
+                text.Anchor = Anchor.y1 | alignment;
+                text.Origin = Anchor.y1 | alignment;
+                text.AutoSizeAxes = Axes.Both;
+                text.Alpha = 0;
+
+                if (User.LastVisit.HasValue)
+                {
+                    text.AddText(@"Last seen ");
+                    text.AddText(new DrawableDate(User.LastVisit.Value, italic: false));
+                }
+            }));
+
+            statusContainer.Add(statusMessage = new OsuSpriteText
+            {
+                Anchor = Anchor.y1 | alignment,
+                Origin = Anchor.y1 | alignment,
+                Font = OsuFont.GetFont(size: 17)
+            });
+
+            return statusContainer;
+        }
+
         private void displayStatus(UserStatus status, UserActivity activity = null)
         {
-            const float transition_duration = 500;
+            if (status != null)
+            {
+                if (activity != null && !(status is UserStatusOffline))
+                {
+                    statusMessage.Text = activity.Status;
+                    statusIcon.FadeColour(activity.GetAppropriateColour(colours), 500, Easing.OutQuint);
+                }
+                else
+                {
+                    lastVisitMessage.FadeTo(status is UserStatusOffline && User.LastVisit.HasValue ? 1 : 0);
+                    statusMessage.Text = status.Message;
+                    statusIcon.FadeColour(status.GetAppropriateColour(colours), 500, Easing.OutQuint);
+                }
 
-            if (status == null)
-            {
-                statusBar.ResizeHeightTo(0f, transition_duration, Easing.OutQuint);
-                statusBar.FadeOut(transition_duration, Easing.OutQuint);
-                this.ResizeHeightTo(height - status_height, transition_duration, Easing.OutQuint);
-            }
-            else
-            {
-                statusBar.ResizeHeightTo(status_height, transition_duration, Easing.OutQuint);
-                statusBar.FadeIn(transition_duration, Easing.OutQuint);
-                this.ResizeHeightTo(height, transition_duration, Easing.OutQuint);
+                return;
             }
 
-            if (status is UserStatusOnline && activity != null)
+            // Set local status according to web if it's null
+            if (User.IsOnline)
             {
-                statusMessage.Text = activity.Status;
-                statusBg.FadeColour(activity.GetAppropriateColour(colours), 500, Easing.OutQuint);
-            }
-            else
-            {
-                statusMessage.Text = status?.Message;
-                statusBg.FadeColour(status?.GetAppropriateColour(colours) ?? colours.Gray5, 500, Easing.OutQuint);
+                Status.Value = new UserStatusOnline();
+                return;
             }
+
+            Status.Value = new UserStatusOffline();
         }
 
         public MenuItem[] ContextMenuItems => new MenuItem[]
diff --git a/osu.Game/Users/UserStatus.cs b/osu.Game/Users/UserStatus.cs
index cf372560af..21c18413f4 100644
--- a/osu.Game/Users/UserStatus.cs
+++ b/osu.Game/Users/UserStatus.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Users
     public class UserStatusOnline : UserStatus
     {
         public override string Message => @"Online";
-        public override Color4 GetAppropriateColour(OsuColour colours) => colours.BlueDarker;
+        public override Color4 GetAppropriateColour(OsuColour colours) => colours.GreenLight;
     }
 
     public abstract class UserStatusBusy : UserStatusOnline
@@ -26,7 +26,7 @@ namespace osu.Game.Users
     public class UserStatusOffline : UserStatus
     {
         public override string Message => @"Offline";
-        public override Color4 GetAppropriateColour(OsuColour colours) => colours.Gray7;
+        public override Color4 GetAppropriateColour(OsuColour colours) => Color4.Black;
     }
 
     public class UserStatusDoNotDisturb : UserStatus

From 0b98bcc856582671025a333601c907198c0672b0 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 4 Mar 2020 15:22:08 +0300
Subject: [PATCH 0882/1142] Fix incorrect click action

---
 osu.Game/Users/UserPanel.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index 5a5f18dcfe..7692f70de0 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -57,8 +57,6 @@ namespace osu.Game.Users
         [BackgroundDependencyLoader]
         private void load()
         {
-            Action = () => profileOverlay?.ShowUser(User);
-
             Masking = true;
             BorderColour = colours.GreyVioletLighter;
 

From 11ffe6a072e935cbcfeaef5546754c0359770470 Mon Sep 17 00:00:00 2001
From: McEndu <nathandu@outlook.com>
Date: Wed, 4 Mar 2020 21:45:01 +0800
Subject: [PATCH 0883/1142] Remove LD_LIBRARY_PATH from vscode launch.json

---
 .vscode/launch.json | 42 +-----------------------------------------
 1 file changed, 1 insertion(+), 41 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 6480612b2e..4e8af405a2 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -11,11 +11,6 @@
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build osu! (Debug)",
-            "linux": {
-                "env": {
-                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Desktop/bin/Debug/netcoreapp3.1:${env:LD_LIBRARY_PATH}"
-                }
-            },
             "console": "internalConsole"
         },
         {
@@ -28,11 +23,6 @@
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build osu! (Release)",
-            "linux": {
-                "env": {
-                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Desktop/bin/Release/netcoreapp3.1:${env:LD_LIBRARY_PATH}"
-                }
-            },
             "console": "internalConsole"
         },
         {
@@ -45,11 +35,6 @@
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build tests (Debug)",
-            "linux": {
-                "env": {
-                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Game.Tests/bin/Debug/netcoreapp3.1:${env:LD_LIBRARY_PATH}"
-                }
-            },
             "console": "internalConsole"
         },
         {
@@ -62,11 +47,6 @@
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build tests (Release)",
-            "linux": {
-                "env": {
-                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Game.Tests/bin/Release/netcoreapp3.1:${env:LD_LIBRARY_PATH}"
-                }
-            },
             "console": "internalConsole"
         },
         {
@@ -80,11 +60,6 @@
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build osu! (Debug)",
-            "linux": {
-                "env": {
-                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Desktop/bin/Debug/netcoreapp3.1:${env:LD_LIBRARY_PATH}"
-                }
-            },
             "console": "internalConsole"
         },
         {
@@ -98,11 +73,6 @@
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build osu! (Release)",
-            "linux": {
-                "env": {
-                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Desktop/bin/Release/netcoreapp3.1:${env:LD_LIBRARY_PATH}"
-                }
-            },
             "console": "internalConsole"
         },
         {
@@ -116,11 +86,6 @@
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build tournament tests (Debug)",
-            "linux": {
-                "env": {
-                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Game.Tournament.Tests/bin/Debug/netcoreapp3.1:${env:LD_LIBRARY_PATH}"
-                }
-            },
             "console": "internalConsole"
         },
         {
@@ -134,11 +99,6 @@
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build tournament tests (Release)",
-            "linux": {
-                "env": {
-                    "LD_LIBRARY_PATH": "${workspaceRoot}/osu.Game.Tournament.Tests/bin/Debug/netcoreapp3.1:${env:LD_LIBRARY_PATH}"
-                }
-            },
             "console": "internalConsole"
         },
         {
@@ -169,4 +129,4 @@
             "externalConsole": false
         }
     ]
-}
\ No newline at end of file
+}

From f8776a0be4924acfc5673b9683d4ef8fab702390 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 4 Mar 2020 22:59:49 +0900
Subject: [PATCH 0884/1142] Display all difficulties from overriding selection

---
 osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs | 2 +-
 osu.Game/Screens/Select/FilterCriteria.cs           | 2 +-
 osu.Game/Screens/Select/SongSelect.cs               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index d78d407748..c110608a0e 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Screens.Select.Carousel
         {
             base.Filter(criteria);
 
-            if (Beatmap.Equals(criteria.SelectedBeatmap))
+            if (Beatmap.BeatmapSet.Equals(criteria.SelectedBeatmapSet))
             {
                 // bypass filtering for selected beatmap
                 Filtered.Value = false;
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index a5c4e2961d..18be4fcac8 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Screens.Select
         public GroupMode Group;
         public SortMode Sort;
 
-        public BeatmapInfo SelectedBeatmap;
+        public BeatmapSetInfo SelectedBeatmapSet;
 
         public OptionalRange<double> StarDifficulty;
         public OptionalRange<float> ApproachRate;
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 90ad7a7fdd..6577ed8506 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -395,7 +395,7 @@ namespace osu.Game.Screens.Select
                 // we still want to temporarily show the new beatmap, bypassing filters.
                 // This will be undone the next time the user changes the filter.
                 var criteria = FilterControl.CreateCriteria();
-                criteria.SelectedBeatmap = e.NewValue.BeatmapInfo;
+                criteria.SelectedBeatmapSet = e.NewValue.BeatmapInfo.BeatmapSet;
                 Carousel.Filter(criteria);
             }
         }

From 9aacc3f5ae1b27cf4564f9f1bf53bd8af0485f27 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 4 Mar 2020 19:24:52 +0100
Subject: [PATCH 0885/1142]  Replace Scores property with DisplayScores method

 Also adds null checks to prevent crashes in tests.
---
 .../Overlays/BeatmapSet/Scores/ScoreTable.cs  | 32 ++++++++++---------
 .../BeatmapSet/Scores/ScoresContainer.cs      |  5 ++-
 .../Scores/TopScoreStatisticsSection.cs       |  2 +-
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index af6bf8299f..4755522b9c 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -52,25 +52,27 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             highAccuracyColour = colours.GreenLight;
         }
 
-        public IReadOnlyList<ScoreInfo> Scores
+        private bool showPerformancePoints;
+
+        public void DisplayScores(IReadOnlyList<ScoreInfo> scores, bool showPerformanceColumn)
         {
-            set
-            {
-                Content = null;
-                backgroundFlow.Clear();
+            if (!scores.Any())
+                return;
 
-                if (value?.Any() != true)
-                    return;
+            showPerformancePoints = showPerformanceColumn;
 
-                for (int i = 0; i < value.Count; i++)
-                    backgroundFlow.Add(new ScoreTableRowBackground(i, value[i], row_height));
+            for (int i = 0; i < scores.Count; i++)
+                backgroundFlow.Add(new ScoreTableRowBackground(i, scores[i], row_height));
 
-                Columns = createHeaders(value.First());
-                Content = value.Select((s, i) => createContent(i, s)).ToArray().ToRectangular();
-            }
+            Columns = createHeaders(scores.FirstOrDefault());
+            Content = scores.Select((s, i) => createContent(i, s)).ToArray().ToRectangular();
         }
 
-        public bool IsBeatmapRanked { get; set; }
+        public void ClearScores()
+        {
+            Content = null;
+            backgroundFlow.Clear();
+        }
 
         private TableColumn[] createHeaders(ScoreInfo score)
         {
@@ -90,7 +92,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
 
             columns.Add(new TableColumn(score.SortedStatistics.LastOrDefault().Key.GetDescription(), Anchor.CentreLeft, new Dimension(GridSizeMode.Distributed, minSize: 45, maxSize: 95)));
 
-            if (IsBeatmapRanked)
+            if (showPerformancePoints)
                 columns.Add(new TableColumn("pp", Anchor.CentreLeft, new Dimension(GridSizeMode.Absolute, 30)));
 
             columns.Add(new TableColumn("mods", Anchor.CentreLeft, new Dimension(GridSizeMode.AutoSize)));
@@ -151,7 +153,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 });
             }
 
-            if (IsBeatmapRanked)
+            if (showPerformancePoints)
             {
                 content.Add(new OsuSpriteText
                 {
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index 5a931fffcb..be1f8c2111 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
 
                 if (value?.Scores.Any() != true)
                 {
-                    scoreTable.Scores = null;
+                    scoreTable.ClearScores();
                     scoreTable.Hide();
                     return;
                 }
@@ -61,8 +61,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 var scoreInfos = value.Scores.Select(s => s.CreateScoreInfo(rulesets)).ToList();
                 var topScore = scoreInfos.First();
 
-                scoreTable.Scores = scoreInfos;
-                scoreTable.IsBeatmapRanked = topScore.Beatmap.Status == BeatmapSetOnlineStatus.Ranked;
+                scoreTable.DisplayScores(scoreInfos, topScore.Beatmap?.Status == BeatmapSetOnlineStatus.Ranked);
                 scoreTable.Show();
 
                 var userScore = value.UserScore;
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
index 9ecc40eed2..a92346e0fe 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/TopScoreStatisticsSection.cs
@@ -97,7 +97,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 totalScoreColumn.Text = $@"{value.TotalScore:N0}";
                 accuracyColumn.Text = value.DisplayAccuracy;
                 maxComboColumn.Text = $@"{value.MaxCombo:N0}x";
-                ppColumn.Alpha = value.Beatmap.Status == BeatmapSetOnlineStatus.Ranked ? 1 : 0;
+                ppColumn.Alpha = value.Beatmap?.Status == BeatmapSetOnlineStatus.Ranked ? 1 : 0;
                 ppColumn.Text = $@"{value.PP:N0}";
 
                 statisticsColumns.ChildrenEnumerable = value.SortedStatistics.Select(kvp => createStatisticsColumn(kvp.Key, kvp.Value));

From 5628c5102dc791fa44c96e5c2480dcc40c726eaf Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 4 Mar 2020 20:01:15 +0100
Subject: [PATCH 0886/1142] Remove old scores before adding new ones

---
 osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 4755522b9c..097ca27bf7 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -56,6 +56,8 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
 
         public void DisplayScores(IReadOnlyList<ScoreInfo> scores, bool showPerformanceColumn)
         {
+            ClearScores();
+
             if (!scores.Any())
                 return;
 

From 55a0586b13903999e5fd3ec04f8622ed077446c6 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 4 Mar 2020 23:03:02 +0300
Subject: [PATCH 0887/1142] Move exception handling below all the cases

---
 osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs b/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs
index 1025fc8146..37652a7ecb 100644
--- a/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs
+++ b/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs
@@ -22,9 +22,6 @@ namespace osu.Game.Overlays.Home.Friends
         {
             switch (Value.Status)
             {
-                default:
-                    throw new ArgumentException($@"{Value.Status} status does not provide a colour in {nameof(GetBarColour)}.");
-
                 case FriendsOnlineStatus.All:
                     return Color4.White;
 
@@ -33,6 +30,9 @@ namespace osu.Game.Overlays.Home.Friends
 
                 case FriendsOnlineStatus.Offline:
                     return Color4.Black;
+
+                default:
+                    throw new ArgumentException($@"{Value.Status} status does not provide a colour in {nameof(GetBarColour)}.");
             }
         }
     }

From 63219a2357ebe94d9b96c4a74ac17bdc85e57a42 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 4 Mar 2020 23:06:16 +0300
Subject: [PATCH 0888/1142] Adjust properties naming

---
 .../Overlays/Changelog/ChangelogUpdateStreamItem.cs  |  6 +++---
 .../Overlays/Home/Friends/FriendsOnlineStatusItem.cs |  4 ++--
 osu.Game/Overlays/OverlayUpdateStreamItem.cs         | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs
index 79824db572..9590aefa49 100644
--- a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs
@@ -17,11 +17,11 @@ namespace osu.Game.Overlays.Changelog
                 Width *= 2;
         }
 
-        protected override string GetMainText => Value.DisplayName;
+        protected override string MainText => Value.DisplayName;
 
-        protected override string GetAdditionalText => Value.LatestBuild.DisplayVersion;
+        protected override string AdditionalText => Value.LatestBuild.DisplayVersion;
 
-        protected override string GetInfoText => Value.LatestBuild.Users > 0 ? $"{"user".ToQuantity(Value.LatestBuild.Users, "N0")} online" : null;
+        protected override string InfoText => Value.LatestBuild.Users > 0 ? $"{"user".ToQuantity(Value.LatestBuild.Users, "N0")} online" : null;
 
         protected override Color4 GetBarColour(OsuColour colours) => Value.Colour;
     }
diff --git a/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs b/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs
index 37652a7ecb..5dd7ca2c18 100644
--- a/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs
+++ b/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs
@@ -14,9 +14,9 @@ namespace osu.Game.Overlays.Home.Friends
         {
         }
 
-        protected override string GetMainText => Value.Status.ToString();
+        protected override string MainText => Value.Status.ToString();
 
-        protected override string GetAdditionalText => Value.Count.ToString();
+        protected override string AdditionalText => Value.Count.ToString();
 
         protected override Color4 GetBarColour(OsuColour colours)
         {
diff --git a/osu.Game/Overlays/OverlayUpdateStreamItem.cs b/osu.Game/Overlays/OverlayUpdateStreamItem.cs
index 459daeb3a5..7bccb8da25 100644
--- a/osu.Game/Overlays/OverlayUpdateStreamItem.cs
+++ b/osu.Game/Overlays/OverlayUpdateStreamItem.cs
@@ -58,17 +58,17 @@ namespace osu.Game.Overlays
                     {
                         new OsuSpriteText
                         {
-                            Text = GetMainText,
+                            Text = MainText,
                             Font = OsuFont.GetFont(size: 12, weight: FontWeight.Black),
                         },
                         new OsuSpriteText
                         {
-                            Text = GetAdditionalText,
+                            Text = AdditionalText,
                             Font = OsuFont.GetFont(size: 16, weight: FontWeight.Regular),
                         },
                         new OsuSpriteText
                         {
-                            Text = GetInfoText,
+                            Text = InfoText,
                             Font = OsuFont.GetFont(size: 10),
                             Colour = colourProvider.Foreground1
                         },
@@ -88,11 +88,11 @@ namespace osu.Game.Overlays
             SelectedItem.BindValueChanged(_ => updateState(), true);
         }
 
-        protected abstract string GetMainText { get; }
+        protected abstract string MainText { get; }
 
-        protected abstract string GetAdditionalText { get; }
+        protected abstract string AdditionalText { get; }
 
-        protected virtual string GetInfoText => string.Empty;
+        protected virtual string InfoText => string.Empty;
 
         protected abstract Color4 GetBarColour(OsuColour colours);
 

From bd03dd9b707bba167a2ae8697626a3f6da50641a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 4 Mar 2020 23:08:58 +0300
Subject: [PATCH 0889/1142] Adjust class naming

---
 .../TestSceneFriendsOnlineStatusControl.cs             |  4 ++--
 .../Overlays/Changelog/ChangelogUpdateStreamControl.cs |  4 ++--
 .../Overlays/Changelog/ChangelogUpdateStreamItem.cs    |  2 +-
 .../Home/Friends/FriendsOnlineStatusControl.cs         |  4 ++--
 .../Overlays/Home/Friends/FriendsOnlineStatusItem.cs   |  2 +-
 ...yUpdateStreamControl.cs => OverlayStreamControl.cs} | 10 +++++-----
 ...OverlayUpdateStreamItem.cs => OverlayStreamItem.cs} |  4 ++--
 7 files changed, 15 insertions(+), 15 deletions(-)
 rename osu.Game/Overlays/{OverlayUpdateStreamControl.cs => OverlayStreamControl.cs} (84%)
 rename osu.Game/Overlays/{OverlayUpdateStreamItem.cs => OverlayStreamItem.cs} (97%)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
index 45f8a029a8..0d841dfef1 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
@@ -19,8 +19,8 @@ namespace osu.Game.Tests.Visual.UserInterface
         {
             typeof(FriendsOnlineStatusControl),
             typeof(FriendsOnlineStatusItem),
-            typeof(OverlayUpdateStreamControl<>),
-            typeof(OverlayUpdateStreamItem<>),
+            typeof(OverlayStreamControl<>),
+            typeof(OverlayStreamItem<>),
             typeof(FriendsBundle)
         };
 
diff --git a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
index 555f0904d6..509a6dabae 100644
--- a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamControl.cs
@@ -5,8 +5,8 @@ using osu.Game.Online.API.Requests.Responses;
 
 namespace osu.Game.Overlays.Changelog
 {
-    public class ChangelogUpdateStreamControl : OverlayUpdateStreamControl<APIUpdateStream>
+    public class ChangelogUpdateStreamControl : OverlayStreamControl<APIUpdateStream>
     {
-        protected override OverlayUpdateStreamItem<APIUpdateStream> CreateStreamItem(APIUpdateStream value) => new ChangelogUpdateStreamItem(value);
+        protected override OverlayStreamItem<APIUpdateStream> CreateStreamItem(APIUpdateStream value) => new ChangelogUpdateStreamItem(value);
     }
 }
diff --git a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs
index 9590aefa49..f8e1ac0c84 100644
--- a/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogUpdateStreamItem.cs
@@ -8,7 +8,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Changelog
 {
-    public class ChangelogUpdateStreamItem : OverlayUpdateStreamItem<APIUpdateStream>
+    public class ChangelogUpdateStreamItem : OverlayStreamItem<APIUpdateStream>
     {
         public ChangelogUpdateStreamItem(APIUpdateStream stream)
             : base(stream)
diff --git a/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusControl.cs b/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusControl.cs
index a92de9dbeb..196f01ab4a 100644
--- a/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusControl.cs
+++ b/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusControl.cs
@@ -7,9 +7,9 @@ using osu.Game.Users;
 
 namespace osu.Game.Overlays.Home.Friends
 {
-    public class FriendsOnlineStatusControl : OverlayUpdateStreamControl<FriendsBundle>
+    public class FriendsOnlineStatusControl : OverlayStreamControl<FriendsBundle>
     {
-        protected override OverlayUpdateStreamItem<FriendsBundle> CreateStreamItem(FriendsBundle value) => new FriendsOnlineStatusItem(value);
+        protected override OverlayStreamItem<FriendsBundle> CreateStreamItem(FriendsBundle value) => new FriendsOnlineStatusItem(value);
 
         public void Populate(List<User> users)
         {
diff --git a/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs b/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs
index 5dd7ca2c18..d9b780ce46 100644
--- a/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs
+++ b/osu.Game/Overlays/Home/Friends/FriendsOnlineStatusItem.cs
@@ -7,7 +7,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Home.Friends
 {
-    public class FriendsOnlineStatusItem : OverlayUpdateStreamItem<FriendsBundle>
+    public class FriendsOnlineStatusItem : OverlayStreamItem<FriendsBundle>
     {
         public FriendsOnlineStatusItem(FriendsBundle value)
             : base(value)
diff --git a/osu.Game/Overlays/OverlayUpdateStreamControl.cs b/osu.Game/Overlays/OverlayStreamControl.cs
similarity index 84%
rename from osu.Game/Overlays/OverlayUpdateStreamControl.cs
rename to osu.Game/Overlays/OverlayStreamControl.cs
index 0fdf6c0111..8b6aca6d5d 100644
--- a/osu.Game/Overlays/OverlayUpdateStreamControl.cs
+++ b/osu.Game/Overlays/OverlayStreamControl.cs
@@ -10,9 +10,9 @@ using JetBrains.Annotations;
 
 namespace osu.Game.Overlays
 {
-    public abstract class OverlayUpdateStreamControl<T> : TabControl<T>
+    public abstract class OverlayStreamControl<T> : TabControl<T>
     {
-        protected OverlayUpdateStreamControl()
+        protected OverlayStreamControl()
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
@@ -28,7 +28,7 @@ namespace osu.Game.Overlays
         });
 
         [NotNull]
-        protected abstract OverlayUpdateStreamItem<T> CreateStreamItem(T value);
+        protected abstract OverlayStreamItem<T> CreateStreamItem(T value);
 
         protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
         {
@@ -39,7 +39,7 @@ namespace osu.Game.Overlays
 
         protected override bool OnHover(HoverEvent e)
         {
-            foreach (var streamBadge in TabContainer.Children.OfType<OverlayUpdateStreamItem<T>>())
+            foreach (var streamBadge in TabContainer.Children.OfType<OverlayStreamItem<T>>())
                 streamBadge.UserHoveringArea = true;
 
             return base.OnHover(e);
@@ -47,7 +47,7 @@ namespace osu.Game.Overlays
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
-            foreach (var streamBadge in TabContainer.Children.OfType<OverlayUpdateStreamItem<T>>())
+            foreach (var streamBadge in TabContainer.Children.OfType<OverlayStreamItem<T>>())
                 streamBadge.UserHoveringArea = false;
 
             base.OnHoverLost(e);
diff --git a/osu.Game/Overlays/OverlayUpdateStreamItem.cs b/osu.Game/Overlays/OverlayStreamItem.cs
similarity index 97%
rename from osu.Game/Overlays/OverlayUpdateStreamItem.cs
rename to osu.Game/Overlays/OverlayStreamItem.cs
index 7bccb8da25..630d3a0a22 100644
--- a/osu.Game/Overlays/OverlayUpdateStreamItem.cs
+++ b/osu.Game/Overlays/OverlayStreamItem.cs
@@ -15,7 +15,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Overlays
 {
-    public abstract class OverlayUpdateStreamItem<T> : TabItem<T>
+    public abstract class OverlayStreamItem<T> : TabItem<T>
     {
         public readonly Bindable<T> SelectedItem = new Bindable<T>();
 
@@ -36,7 +36,7 @@ namespace osu.Game.Overlays
         private FillFlowContainer<SpriteText> text;
         private ExpandingBar expandingBar;
 
-        protected OverlayUpdateStreamItem(T value)
+        protected OverlayStreamItem(T value)
             : base(value)
         {
             Height = 60;

From 997be65be2329d3a3376f1ca16914622e767da0f Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Wed, 4 Mar 2020 21:19:26 +0100
Subject: [PATCH 0890/1142] Improve colouring logic

---
 .../Historical/DrawableMostPlayedBeatmap.cs   | 17 +++++++++-----
 .../Profile/Sections/ProfileItemContainer.cs  | 22 ++++++++++++++++---
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs b/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
index dc8492562a..5b7c5efbe2 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/DrawableMostPlayedBeatmap.cs
@@ -37,10 +37,8 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colours, OverlayColourProvider colourProvider)
+        private void load(OverlayColourProvider colourProvider)
         {
-            ProfileItemContainer container;
-
             AddRangeInternal(new Drawable[]
             {
                 new UpdateableBeatmapSetCover
@@ -63,7 +61,7 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                             CornerRadius = corner_radius,
                             Children = new Drawable[]
                             {
-                                container = new ProfileItemContainer
+                                new MostPlayedBeatmapContainer
                                 {
                                     Child = new Container
                                     {
@@ -108,9 +106,16 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
                     }
                 }
             });
+        }
 
-            container.IdleColour = colourProvider.Background4;
-            container.HoverColour = colourProvider.Background3;
+        private class MostPlayedBeatmapContainer : ProfileItemContainer
+        {
+            [BackgroundDependencyLoader]
+            private void load(OverlayColourProvider colourProvider)
+            {
+                IdleColour = colourProvider.Background4;
+                HoverColour = colourProvider.Background3;
+            }
         }
 
         private class MostPlayedBeatmapMetadataContainer : BeatmapMetadataContainer
diff --git a/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs b/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs
index a48f21f52b..1ab9ed3f82 100644
--- a/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs
@@ -21,13 +21,29 @@ namespace osu.Game.Overlays.Profile.Sections
 
         private Color4 idleColour;
 
-        public Color4 IdleColour
+        protected Color4 IdleColour
         {
             get => idleColour;
-            set => idleColour = background.Colour = value;
+            set
+            {
+                idleColour = value;
+                if (!IsHovered)
+                    background.Colour = value;
+            }
         }
 
-        public Color4 HoverColour { get; set; }
+        private Color4 hoverColour;
+
+        protected Color4 HoverColour
+        {
+            get => hoverColour;
+            set
+            {
+                hoverColour = value;
+                if (IsHovered)
+                    background.Colour = value;
+            }
+        }
 
         public ProfileItemContainer()
         {

From e3e66991b08c4f26b0b8f46a4ef8c414f775a6b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 4 Mar 2020 22:02:36 +0100
Subject: [PATCH 0891/1142] Move initialisation logic to [SetUp]

---
 .../Visual/Online/TestSceneUserPanel.cs        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
index 54f06d6ad2..597ca00fb8 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
@@ -13,13 +13,16 @@ namespace osu.Game.Tests.Visual.Online
     [TestFixture]
     public class TestSceneUserPanel : OsuTestScene
     {
-        private readonly UserPanel peppy;
+        private readonly Bindable<UserActivity> activity = new Bindable<UserActivity>();
 
-        public TestSceneUserPanel()
+        private UserPanel peppy;
+
+        [SetUp]
+        public void SetUp() => Schedule(() =>
         {
             UserPanel flyte;
 
-            Add(new FillFlowContainer
+            Child = new FillFlowContainer
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
@@ -44,11 +47,12 @@ namespace osu.Game.Tests.Visual.Online
                         SupportLevel = 3,
                     }) { Width = 300 },
                 },
-            });
+            };
 
             flyte.Status.Value = new UserStatusOnline();
             peppy.Status.Value = null;
-        }
+            peppy.Activity.BindTo(activity);
+        });
 
         [Test]
         public void UserStatusesTests()
@@ -62,10 +66,6 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void UserActivitiesTests()
         {
-            Bindable<UserActivity> activity = new Bindable<UserActivity>();
-
-            peppy.Activity.BindTo(activity);
-
             AddStep("idle", () => { activity.Value = null; });
             AddStep("spectating", () => { activity.Value = new UserActivity.Spectating(); });
             AddStep("solo", () => { activity.Value = new UserActivity.SoloGame(null, null); });

From 5b25b5dfabf972d05f4829fd55b363c575be4421 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 4 Mar 2020 22:04:49 +0100
Subject: [PATCH 0892/1142] Change brace style

---
 .../Visual/Online/TestSceneUserPanel.cs       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
index 597ca00fb8..55017db479 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
@@ -57,21 +57,21 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void UserStatusesTests()
         {
-            AddStep("online", () => { peppy.Status.Value = new UserStatusOnline(); });
-            AddStep(@"do not disturb", () => { peppy.Status.Value = new UserStatusDoNotDisturb(); });
-            AddStep(@"offline", () => { peppy.Status.Value = new UserStatusOffline(); });
-            AddStep(@"null status", () => { peppy.Status.Value = null; });
+            AddStep("online", () => peppy.Status.Value = new UserStatusOnline());
+            AddStep(@"do not disturb", () => peppy.Status.Value = new UserStatusDoNotDisturb());
+            AddStep(@"offline", () => peppy.Status.Value = new UserStatusOffline());
+            AddStep(@"null status", () => peppy.Status.Value = null);
         }
 
         [Test]
         public void UserActivitiesTests()
         {
-            AddStep("idle", () => { activity.Value = null; });
-            AddStep("spectating", () => { activity.Value = new UserActivity.Spectating(); });
-            AddStep("solo", () => { activity.Value = new UserActivity.SoloGame(null, null); });
-            AddStep("choosing", () => { activity.Value = new UserActivity.ChoosingBeatmap(); });
-            AddStep("editing", () => { activity.Value = new UserActivity.Editing(null); });
-            AddStep("modding", () => { activity.Value = new UserActivity.Modding(); });
+            AddStep("idle", () => activity.Value = null);
+            AddStep("spectating", () => activity.Value = new UserActivity.Spectating());
+            AddStep("solo", () => activity.Value = new UserActivity.SoloGame(null, null));
+            AddStep("choosing", () => activity.Value = new UserActivity.ChoosingBeatmap());
+            AddStep("editing", () => activity.Value = new UserActivity.Editing(null));
+            AddStep("modding", () => activity.Value = new UserActivity.Modding());
         }
     }
 }

From 1bd49d50c771846168209054257ae132e854e8e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 4 Mar 2020 22:05:08 +0100
Subject: [PATCH 0893/1142] Remove unnecessary raw string prefixes

---
 osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
index 55017db479..f128584b1a 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
@@ -58,9 +58,9 @@ namespace osu.Game.Tests.Visual.Online
         public void UserStatusesTests()
         {
             AddStep("online", () => peppy.Status.Value = new UserStatusOnline());
-            AddStep(@"do not disturb", () => peppy.Status.Value = new UserStatusDoNotDisturb());
-            AddStep(@"offline", () => peppy.Status.Value = new UserStatusOffline());
-            AddStep(@"null status", () => peppy.Status.Value = null);
+            AddStep("do not disturb", () => peppy.Status.Value = new UserStatusDoNotDisturb());
+            AddStep("offline", () => peppy.Status.Value = new UserStatusOffline());
+            AddStep("null status", () => peppy.Status.Value = null);
         }
 
         [Test]

From 5fa2638e81619fe0ba9fa726561972ea9886ac1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 4 Mar 2020 22:05:48 +0100
Subject: [PATCH 0894/1142] Rename tests to adhere to convention

---
 osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
index f128584b1a..ad5dfb371a 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
@@ -55,7 +55,7 @@ namespace osu.Game.Tests.Visual.Online
         });
 
         [Test]
-        public void UserStatusesTests()
+        public void TestUserStatus()
         {
             AddStep("online", () => peppy.Status.Value = new UserStatusOnline());
             AddStep("do not disturb", () => peppy.Status.Value = new UserStatusDoNotDisturb());
@@ -64,7 +64,7 @@ namespace osu.Game.Tests.Visual.Online
         }
 
         [Test]
-        public void UserActivitiesTests()
+        public void TestUserActivity()
         {
             AddStep("idle", () => activity.Value = null);
             AddStep("spectating", () => activity.Value = new UserActivity.Spectating());

From afa3ce494da1856810c549bf84efa262f59d259f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 4 Mar 2020 22:07:02 +0100
Subject: [PATCH 0895/1142] Set online status in activity test

The test would check nothing otherwise.
---
 osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
index ad5dfb371a..fae3e9b17b 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
@@ -66,6 +66,8 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestUserActivity()
         {
+            AddStep("set online status", () => peppy.Status.Value = new UserStatusOnline());
+
             AddStep("idle", () => activity.Value = null);
             AddStep("spectating", () => activity.Value = new UserActivity.Spectating());
             AddStep("solo", () => activity.Value = new UserActivity.SoloGame(null, null));

From b8889318dbcc6d7b6c8c28c08d4b063b7918f6cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 4 Mar 2020 22:13:31 +0100
Subject: [PATCH 0896/1142] Pass rulesets to solo game status

---
 osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
index fae3e9b17b..80fcef2ed2 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
@@ -2,9 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Rulesets;
 using osu.Game.Users;
 using osuTK;
 
@@ -17,6 +19,9 @@ namespace osu.Game.Tests.Visual.Online
 
         private UserPanel peppy;
 
+        [Resolved]
+        private RulesetStore rulesetStore { get; set; }
+
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
@@ -70,10 +75,15 @@ namespace osu.Game.Tests.Visual.Online
 
             AddStep("idle", () => activity.Value = null);
             AddStep("spectating", () => activity.Value = new UserActivity.Spectating());
-            AddStep("solo", () => activity.Value = new UserActivity.SoloGame(null, null));
+            AddStep("solo (osu!)", () => activity.Value = soloGameStatusForRuleset(0));
+            AddStep("solo (osu!taiko)", () => activity.Value = soloGameStatusForRuleset(1));
+            AddStep("solo (osu!catch)", () => activity.Value = soloGameStatusForRuleset(2));
+            AddStep("solo (osu!mania)", () => activity.Value = soloGameStatusForRuleset(3));
             AddStep("choosing", () => activity.Value = new UserActivity.ChoosingBeatmap());
             AddStep("editing", () => activity.Value = new UserActivity.Editing(null));
             AddStep("modding", () => activity.Value = new UserActivity.Modding());
         }
+
+        private UserActivity soloGameStatusForRuleset(int rulesetId) => new UserActivity.SoloGame(null, rulesetStore.GetRuleset(rulesetId));
     }
 }

From d297bf69578cc58b276c89e213943f00d00e90b3 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 5 Mar 2020 01:41:55 +0300
Subject: [PATCH 0897/1142] Adjust background presentation

---
 osu.Game/Users/UserGridPanel.cs | 2 +-
 osu.Game/Users/UserListPanel.cs | 2 +-
 osu.Game/Users/UserPanel.cs     | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Users/UserGridPanel.cs b/osu.Game/Users/UserGridPanel.cs
index f9c5c2b0cc..4bd40b3e76 100644
--- a/osu.Game/Users/UserGridPanel.cs
+++ b/osu.Game/Users/UserGridPanel.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Users
         [BackgroundDependencyLoader]
         private void load()
         {
-            Background.FadeTo(0.6f);
+            Background.FadeTo(0.4f);
         }
 
         protected override Drawable CreateLayout()
diff --git a/osu.Game/Users/UserListPanel.cs b/osu.Game/Users/UserListPanel.cs
index 087de13706..1c3ae20577 100644
--- a/osu.Game/Users/UserListPanel.cs
+++ b/osu.Game/Users/UserListPanel.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Users
         private void load()
         {
             Background.Width = 0.5f;
-            Background.Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(1), Color4.White.Opacity(0.6f));
+            Background.Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(1), Color4.White.Opacity(0.3f));
         }
 
         protected override Drawable CreateLayout()
diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index 7692f70de0..2606d669b7 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -51,6 +51,9 @@ namespace osu.Game.Users
         [Resolved(canBeNull: true)]
         private UserProfileOverlay profileOverlay { get; set; }
 
+        [Resolved(canBeNull: true)]
+        private OverlayColourProvider colourProvider { get; set; }
+
         [Resolved]
         private OsuColour colours { get; set; }
 
@@ -58,14 +61,14 @@ namespace osu.Game.Users
         private void load()
         {
             Masking = true;
-            BorderColour = colours.GreyVioletLighter;
+            BorderColour = colourProvider?.Light1 ?? colours.GreyVioletLighter;
 
             AddRange(new[]
             {
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = colours.Gray1
+                    Colour = colourProvider?.Background4 ?? colours.Gray1
                 },
                 Background = new DelayedLoadUnloadWrapper(() => new UserCoverBackground
                 {

From 06b2c70a04a76239127642573878d49322082ad1 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 5 Mar 2020 01:45:49 +0300
Subject: [PATCH 0898/1142] Simplify alignment setting for status message

---
 osu.Game/Users/UserPanel.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index 2606d669b7..265406c6d3 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -68,7 +68,7 @@ namespace osu.Game.Users
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = colourProvider?.Background4 ?? colours.Gray1
+                    Colour = colourProvider?.Background5 ?? colours.Gray1
                 },
                 Background = new DelayedLoadUnloadWrapper(() => new UserCoverBackground
                 {
@@ -147,12 +147,12 @@ namespace osu.Game.Users
                 Direction = FillDirection.Vertical
             };
 
-            var alignment = rightAlignedChildren ? Anchor.x2 : Anchor.x0;
+            var alignment = rightAlignedChildren ? Anchor.CentreRight : Anchor.CentreLeft;
 
             statusContainer.Add(lastVisitMessage = new TextFlowContainer(t => t.Font = OsuFont.GetFont(size: 15)).With(text =>
             {
-                text.Anchor = Anchor.y1 | alignment;
-                text.Origin = Anchor.y1 | alignment;
+                text.Anchor = alignment;
+                text.Origin = alignment;
                 text.AutoSizeAxes = Axes.Both;
                 text.Alpha = 0;
 
@@ -165,8 +165,8 @@ namespace osu.Game.Users
 
             statusContainer.Add(statusMessage = new OsuSpriteText
             {
-                Anchor = Anchor.y1 | alignment,
-                Origin = Anchor.y1 | alignment,
+                Anchor = alignment,
+                Origin = alignment,
                 Font = OsuFont.GetFont(size: 17)
             });
 

From 22d43c26aace948380c694a68ce640202aca0425 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 5 Mar 2020 02:00:46 +0300
Subject: [PATCH 0899/1142] Adjust some text values

---
 osu.Game/Users/UserPanel.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index 265406c6d3..c06306c7b0 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -129,7 +129,7 @@ namespace osu.Game.Users
 
         protected OsuSpriteText CreateUsername() => new OsuSpriteText
         {
-            Font = OsuFont.GetFont(size: 20, weight: FontWeight.Bold, italics: true),
+            Font = OsuFont.GetFont(size: 19, weight: FontWeight.Bold, italics: true),
             Text = User.Username,
         };
 
@@ -149,7 +149,7 @@ namespace osu.Game.Users
 
             var alignment = rightAlignedChildren ? Anchor.CentreRight : Anchor.CentreLeft;
 
-            statusContainer.Add(lastVisitMessage = new TextFlowContainer(t => t.Font = OsuFont.GetFont(size: 15)).With(text =>
+            statusContainer.Add(lastVisitMessage = new TextFlowContainer(t => t.Font = OsuFont.GetFont(size: 15, weight: FontWeight.SemiBold)).With(text =>
             {
                 text.Anchor = alignment;
                 text.Origin = alignment;
@@ -159,7 +159,10 @@ namespace osu.Game.Users
                 if (User.LastVisit.HasValue)
                 {
                     text.AddText(@"Last seen ");
-                    text.AddText(new DrawableDate(User.LastVisit.Value, italic: false));
+                    text.AddText(new DrawableDate(User.LastVisit.Value, italic: false)
+                    {
+                        Shadow = false
+                    });
                 }
             }));
 
@@ -167,7 +170,7 @@ namespace osu.Game.Users
             {
                 Anchor = alignment,
                 Origin = alignment,
-                Font = OsuFont.GetFont(size: 17)
+                Font = OsuFont.GetFont(size: 17, weight: FontWeight.SemiBold)
             });
 
             return statusContainer;

From 2e996eeb7e6f36082fad19f37dd655d1825a1007 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 5 Mar 2020 02:10:38 +0300
Subject: [PATCH 0900/1142] Refactor displayStatus function and add comments

---
 osu.Game/Users/UserPanel.cs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index c06306c7b0..9d577bcc2a 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -180,22 +180,23 @@ namespace osu.Game.Users
         {
             if (status != null)
             {
+                // Set status message based on activity (if we have one) and status is not offline
                 if (activity != null && !(status is UserStatusOffline))
                 {
                     statusMessage.Text = activity.Status;
                     statusIcon.FadeColour(activity.GetAppropriateColour(colours), 500, Easing.OutQuint);
+                    return;
                 }
-                else
-                {
-                    lastVisitMessage.FadeTo(status is UserStatusOffline && User.LastVisit.HasValue ? 1 : 0);
-                    statusMessage.Text = status.Message;
-                    statusIcon.FadeColour(status.GetAppropriateColour(colours), 500, Easing.OutQuint);
-                }
+
+                // Otherwise use only status
+                lastVisitMessage.FadeTo(status is UserStatusOffline && User.LastVisit.HasValue ? 1 : 0);
+                statusMessage.Text = status.Message;
+                statusIcon.FadeColour(status.GetAppropriateColour(colours), 500, Easing.OutQuint);
 
                 return;
             }
 
-            // Set local status according to web if it's null
+            // Fallback to web status if local one is null
             if (User.IsOnline)
             {
                 Status.Value = new UserStatusOnline();

From 13752ffe9d86836affa22126bdf381e3b5cb9d33 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 5 Mar 2020 02:31:19 +0300
Subject: [PATCH 0901/1142] Revisit UserGridPanel layout

---
 osu.Game/Users/UserGridPanel.cs | 58 ++++++++++++++++++++++++---------
 1 file changed, 42 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Users/UserGridPanel.cs b/osu.Game/Users/UserGridPanel.cs
index 4bd40b3e76..b0ce557a19 100644
--- a/osu.Game/Users/UserGridPanel.cs
+++ b/osu.Game/Users/UserGridPanel.cs
@@ -45,6 +45,7 @@ namespace osu.Game.Users
                     RowDimensions = new[]
                     {
                         new Dimension(GridSizeMode.AutoSize),
+                        new Dimension(GridSizeMode.Absolute, margin),
                         new Dimension()
                     },
                     Content = new[]
@@ -54,32 +55,57 @@ namespace osu.Game.Users
                             CreateAvatar().With(avatar =>
                             {
                                 avatar.Size = new Vector2(60);
-                                avatar.Margin = new MarginPadding { Bottom = margin };
                                 avatar.Masking = true;
                                 avatar.CornerRadius = 6;
                             }),
-                            new FillFlowContainer
+                            new Container
                             {
-                                AutoSizeAxes = Axes.Both,
-                                Direction = FillDirection.Vertical,
-                                Spacing = new Vector2(0, 7),
-                                Margin = new MarginPadding { Left = margin },
-                                Children = new Drawable[]
+                                RelativeSizeAxes = Axes.Both,
+                                Padding = new MarginPadding { Left = margin },
+                                Child = new GridContainer
                                 {
-                                    details = new FillFlowContainer
+                                    RelativeSizeAxes = Axes.Both,
+                                    ColumnDimensions = new[]
                                     {
-                                        AutoSizeAxes = Axes.Both,
-                                        Direction = FillDirection.Horizontal,
-                                        Spacing = new Vector2(6),
-                                        Children = new Drawable[]
-                                        {
-                                            CreateFlag(),
-                                        }
+                                        new Dimension()
                                     },
-                                    CreateUsername(),
+                                    RowDimensions = new[]
+                                    {
+                                        new Dimension(GridSizeMode.AutoSize),
+                                        new Dimension()
+                                    },
+                                    Content = new[]
+                                    {
+                                        new Drawable[]
+                                        {
+                                            details = new FillFlowContainer
+                                            {
+                                                AutoSizeAxes = Axes.Both,
+                                                Direction = FillDirection.Horizontal,
+                                                Spacing = new Vector2(6),
+                                                Children = new Drawable[]
+                                                {
+                                                    CreateFlag(),
+                                                }
+                                            }
+                                        },
+                                        new Drawable[]
+                                        {
+                                            CreateUsername().With(username =>
+                                            {
+                                                username.Anchor = Anchor.CentreLeft;
+                                                username.Origin = Anchor.CentreLeft;
+                                            })
+                                        }
+                                    }
                                 }
                             }
                         },
+                        new[]
+                        {
+                            Empty(),
+                            Empty()
+                        },
                         new Drawable[]
                         {
                             CreateStatusIcon().With(icon =>

From 6b1fdcf9a2f7a3d798f33f3870396416b838eb0a Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 5 Mar 2020 02:38:30 +0300
Subject: [PATCH 0902/1142] Minor adjustments

---
 osu.Game/Users/UserGridPanel.cs | 2 +-
 osu.Game/Users/UserPanel.cs     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Users/UserGridPanel.cs b/osu.Game/Users/UserGridPanel.cs
index b0ce557a19..e62a834d6d 100644
--- a/osu.Game/Users/UserGridPanel.cs
+++ b/osu.Game/Users/UserGridPanel.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Users
         [BackgroundDependencyLoader]
         private void load()
         {
-            Background.FadeTo(0.4f);
+            Background.FadeTo(0.3f);
         }
 
         protected override Drawable CreateLayout()
diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index 9d577bcc2a..f0a7895547 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -130,6 +130,7 @@ namespace osu.Game.Users
         protected OsuSpriteText CreateUsername() => new OsuSpriteText
         {
             Font = OsuFont.GetFont(size: 19, weight: FontWeight.Bold, italics: true),
+            Shadow = false,
             Text = User.Username,
         };
 

From 6b44021f4d0c61163190088ae68433d4694e3452 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 5 Mar 2020 03:33:14 +0300
Subject: [PATCH 0903/1142] Change username text size back to 20

---
 osu.Game/Users/UserPanel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index f0a7895547..a900a55dab 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -129,7 +129,7 @@ namespace osu.Game.Users
 
         protected OsuSpriteText CreateUsername() => new OsuSpriteText
         {
-            Font = OsuFont.GetFont(size: 19, weight: FontWeight.Bold, italics: true),
+            Font = OsuFont.GetFont(size: 20, weight: FontWeight.Bold, italics: true),
             Shadow = false,
             Text = User.Username,
         };

From ce3786cfd912b2cff9e7431e13cb7761352de8af Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Mar 2020 10:11:27 +0900
Subject: [PATCH 0904/1142] Rename to ModTestScene (is no longer a sandbox)

---
 .../Mods/TestSceneOsuModDifficultyAdjust.cs                 | 2 +-
 .../Visual/{ModSandboxTestScene.cs => ModTestScene.cs}      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename osu.Game/Tests/Visual/{ModSandboxTestScene.cs => ModTestScene.cs} (95%)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index 20cb9ef05d..c2a7a5003f 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -12,7 +12,7 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests.Mods
 {
-    public class TestSceneOsuModDifficultyAdjust : ModSandboxTestScene
+    public class TestSceneOsuModDifficultyAdjust : ModTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(OsuModDifficultyAdjust)).ToList();
 
diff --git a/osu.Game/Tests/Visual/ModSandboxTestScene.cs b/osu.Game/Tests/Visual/ModTestScene.cs
similarity index 95%
rename from osu.Game/Tests/Visual/ModSandboxTestScene.cs
rename to osu.Game/Tests/Visual/ModTestScene.cs
index 8a9cdf009b..1ff061dfac 100644
--- a/osu.Game/Tests/Visual/ModSandboxTestScene.cs
+++ b/osu.Game/Tests/Visual/ModTestScene.cs
@@ -13,16 +13,16 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game.Tests.Visual
 {
-    public abstract class ModSandboxTestScene : PlayerTestScene
+    public abstract class ModTestScene : PlayerTestScene
     {
         protected sealed override bool HasCustomSteps => true;
 
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
-            typeof(ModSandboxTestScene)
+            typeof(ModTestScene)
         };
 
-        protected ModSandboxTestScene(Ruleset ruleset)
+        protected ModTestScene(Ruleset ruleset)
             : base(ruleset)
         {
         }

From 2a581ef24786102d41709f08cde6747060418ed1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Mar 2020 10:15:17 +0900
Subject: [PATCH 0905/1142] Remove required types

---
 .../Mods/TestSceneOsuModDifficultyAdjust.cs                  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index c2a7a5003f..4a284022e2 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -1,9 +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 System.Collections.Generic;
-using System.Linq;
 using NUnit.Framework;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Scoring;
@@ -14,8 +11,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
 {
     public class TestSceneOsuModDifficultyAdjust : ModTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(OsuModDifficultyAdjust)).ToList();
-
         public TestSceneOsuModDifficultyAdjust()
             : base(new OsuRuleset())
         {

From 0f1f1d1a6b91ce361913fbf2aa8bb6fe8a23fa01 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Mar 2020 10:18:37 +0900
Subject: [PATCH 0906/1142] Remove unused "name" parameter

---
 .../Mods/TestSceneOsuModDifficultyAdjust.cs               | 6 +++---
 osu.Game/Tests/Visual/ModTestScene.cs                     | 8 +-------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index 4a284022e2..8ff55c9728 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -17,21 +17,21 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         }
 
         [Test]
-        public void TestNoAdjustment() => CreateModTest(new ModTestCaseData("no adjustment", new OsuModDifficultyAdjust())
+        public void TestNoAdjustment() => CreateModTest(new ModTestCaseData(new OsuModDifficultyAdjust())
         {
             Autoplay = true,
             PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
         });
 
         [Test]
-        public void TestCircleSize10() => CreateModTest(new ModTestCaseData("cs = 10", new OsuModDifficultyAdjust { CircleSize = { Value = 10 } })
+        public void TestCircleSize10() => CreateModTest(new ModTestCaseData(new OsuModDifficultyAdjust { CircleSize = { Value = 10 } })
         {
             Autoplay = true,
             PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
         });
 
         [Test]
-        public void TestApproachRate10() => CreateModTest(new ModTestCaseData("ar = 10", new OsuModDifficultyAdjust { ApproachRate = { Value = 10 } })
+        public void TestApproachRate10() => CreateModTest(new ModTestCaseData(new OsuModDifficultyAdjust { ApproachRate = { Value = 10 } })
         {
             Autoplay = true,
             PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
diff --git a/osu.Game/Tests/Visual/ModTestScene.cs b/osu.Game/Tests/Visual/ModTestScene.cs
index 1ff061dfac..04f93fc683 100644
--- a/osu.Game/Tests/Visual/ModTestScene.cs
+++ b/osu.Game/Tests/Visual/ModTestScene.cs
@@ -97,19 +97,13 @@ namespace osu.Game.Tests.Visual
             [CanBeNull]
             public Func<bool> PassCondition;
 
-            /// <summary>
-            /// The name of this test case, displayed in the test browser.
-            /// </summary>
-            public readonly string Name;
-
             /// <summary>
             /// The <see cref="Mod"/> this test case tests.
             /// </summary>
             public readonly Mod Mod;
 
-            public ModTestCaseData(string name, Mod mod)
+            public ModTestCaseData(Mod mod)
             {
-                Name = name;
                 Mod = mod;
             }
         }

From 3b19467eadbcdf0bec89b240a7d981a599391acd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Mar 2020 10:19:42 +0900
Subject: [PATCH 0907/1142] ModTestCaseData -> ModTestData

---
 .../Mods/TestSceneOsuModDifficultyAdjust.cs            |  6 +++---
 osu.Game/Tests/Visual/ModTestScene.cs                  | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index 8ff55c9728..427f25fe11 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -17,21 +17,21 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         }
 
         [Test]
-        public void TestNoAdjustment() => CreateModTest(new ModTestCaseData(new OsuModDifficultyAdjust())
+        public void TestNoAdjustment() => CreateModTest(new ModTestData(new OsuModDifficultyAdjust())
         {
             Autoplay = true,
             PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
         });
 
         [Test]
-        public void TestCircleSize10() => CreateModTest(new ModTestCaseData(new OsuModDifficultyAdjust { CircleSize = { Value = 10 } })
+        public void TestCircleSize10() => CreateModTest(new ModTestData(new OsuModDifficultyAdjust { CircleSize = { Value = 10 } })
         {
             Autoplay = true,
             PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
         });
 
         [Test]
-        public void TestApproachRate10() => CreateModTest(new ModTestCaseData(new OsuModDifficultyAdjust { ApproachRate = { Value = 10 } })
+        public void TestApproachRate10() => CreateModTest(new ModTestData(new OsuModDifficultyAdjust { ApproachRate = { Value = 10 } })
         {
             Autoplay = true,
             PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
diff --git a/osu.Game/Tests/Visual/ModTestScene.cs b/osu.Game/Tests/Visual/ModTestScene.cs
index 04f93fc683..a8b40a5a68 100644
--- a/osu.Game/Tests/Visual/ModTestScene.cs
+++ b/osu.Game/Tests/Visual/ModTestScene.cs
@@ -27,11 +27,11 @@ namespace osu.Game.Tests.Visual
         {
         }
 
-        private ModTestCaseData currentTest;
+        private ModTestData currentTest;
 
-        protected void CreateModTest(ModTestCaseData testCaseData) => CreateTest(() =>
+        protected void CreateModTest(ModTestData testData) => CreateTest(() =>
         {
-            AddStep("set test data", () => currentTest = testCaseData);
+            AddStep("set test data", () => currentTest = testData);
         });
 
         public override void TearDownSteps()
@@ -78,7 +78,7 @@ namespace osu.Game.Tests.Visual
             }
         }
 
-        protected class ModTestCaseData
+        protected class ModTestData
         {
             /// <summary>
             /// Whether to use a replay to simulate an auto-play. True by default.
@@ -102,7 +102,7 @@ namespace osu.Game.Tests.Visual
             /// </summary>
             public readonly Mod Mod;
 
-            public ModTestCaseData(Mod mod)
+            public ModTestData(Mod mod)
             {
                 Mod = mod;
             }

From fadebcdc03188cb171f453153530e55c6be6c7a9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Mar 2020 10:21:25 +0900
Subject: [PATCH 0908/1142] Move all sets to object initialiser for code
 formatting reasons

---
 .../Mods/TestSceneOsuModDifficultyAdjust.cs              | 9 ++++++---
 osu.Game/Tests/Visual/ModTestScene.cs                    | 7 +------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index 427f25fe11..e4b1e30bcd 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -17,22 +17,25 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         }
 
         [Test]
-        public void TestNoAdjustment() => CreateModTest(new ModTestData(new OsuModDifficultyAdjust())
+        public void TestNoAdjustment() => CreateModTest(new ModTestData()
         {
+            Mod = new OsuModDifficultyAdjust(),
             Autoplay = true,
             PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
         });
 
         [Test]
-        public void TestCircleSize10() => CreateModTest(new ModTestData(new OsuModDifficultyAdjust { CircleSize = { Value = 10 } })
+        public void TestCircleSize10() => CreateModTest(new ModTestData
         {
+            Mod = new OsuModDifficultyAdjust { CircleSize = { Value = 10 } },
             Autoplay = true,
             PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
         });
 
         [Test]
-        public void TestApproachRate10() => CreateModTest(new ModTestData(new OsuModDifficultyAdjust { ApproachRate = { Value = 10 } })
+        public void TestApproachRate10() => CreateModTest(new ModTestData
         {
+            Mod = new OsuModDifficultyAdjust { ApproachRate = { Value = 10 } },
             Autoplay = true,
             PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
         });
diff --git a/osu.Game/Tests/Visual/ModTestScene.cs b/osu.Game/Tests/Visual/ModTestScene.cs
index a8b40a5a68..3d12001cca 100644
--- a/osu.Game/Tests/Visual/ModTestScene.cs
+++ b/osu.Game/Tests/Visual/ModTestScene.cs
@@ -100,12 +100,7 @@ namespace osu.Game.Tests.Visual
             /// <summary>
             /// The <see cref="Mod"/> this test case tests.
             /// </summary>
-            public readonly Mod Mod;
-
-            public ModTestData(Mod mod)
-            {
-                Mod = mod;
-            }
+            public Mod Mod;
         }
     }
 }

From 5200633f9fa19b8f6994ed6b7ef0ec51d18befdf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Mar 2020 11:25:07 +0900
Subject: [PATCH 0909/1142] Centralise TestPlayer implementations as much as
 possible

---
 .../TestSceneAutoJuiceStream.cs               |  3 +-
 .../TestSceneOsuFlashlight.cs                 |  4 +-
 .../TestSceneSkinFallbacks.cs                 |  5 +-
 .../TestSceneSpinnerRotation.cs               |  5 +-
 .../TestSceneSwellJudgements.cs               | 27 ----------
 .../TestSceneTaikoSuddenDeath.cs              | 18 ++-----
 .../Background/TestSceneUserDimBackgrounds.cs | 10 ++--
 .../Visual/Gameplay/TestSceneAutoplay.cs      | 24 +++------
 .../Gameplay/TestSceneGameplayRewinding.cs    | 49 ++++---------------
 .../Visual/Gameplay/TestScenePause.cs         |  7 +--
 .../Gameplay/TestScenePauseWhenInactive.cs    |  5 +-
 .../Visual/Gameplay/TestScenePlayerLoader.cs  | 13 +----
 osu.Game/Tests/Visual/PlayerTestScene.cs      |  5 +-
 osu.Game/Tests/Visual/TestPlayer.cs           | 28 +++++++++++
 14 files changed, 63 insertions(+), 140 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
index 74a9c05bf9..ed7bfb9a44 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs
@@ -7,7 +7,6 @@ using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
-using osu.Game.Screens.Play;
 using osu.Game.Tests.Visual;
 using osuTK;
 
@@ -51,7 +50,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             return beatmap;
         }
 
-        protected override Player CreatePlayer(Ruleset ruleset)
+        protected override TestPlayer CreatePlayer(Ruleset ruleset)
         {
             SelectedMods.Value = SelectedMods.Value.Concat(new[] { ruleset.GetAutoplayMod() }).ToArray();
             return base.CreatePlayer(ruleset);
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuFlashlight.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuFlashlight.cs
index 412effe176..19736a7709 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuFlashlight.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuFlashlight.cs
@@ -3,13 +3,13 @@
 
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu.Mods;
-using osu.Game.Screens.Play;
+using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
     public class TestSceneOsuFlashlight : TestSceneOsuPlayer
     {
-        protected override Player CreatePlayer(Ruleset ruleset)
+        protected override TestPlayer CreatePlayer(Ruleset ruleset)
         {
             SelectedMods.Value = new Mod[] { new OsuModAutoplay(), new OsuModFlashlight(), };
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
index 4da1b1dae0..d39e24fc1f 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSkinFallbacks.cs
@@ -18,7 +18,6 @@ using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
-using osu.Game.Screens.Play;
 using osu.Game.Skinning;
 using osu.Game.Storyboards;
 using osu.Game.Tests.Visual;
@@ -56,7 +55,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         private void checkNextHitObject(string skin) =>
             AddUntilStep($"check skin from {skin}", () =>
             {
-                var firstObject = ((TestPlayer)Player).DrawableRuleset.Playfield.HitObjectContainer.AliveObjects.OfType<DrawableHitCircle>().FirstOrDefault();
+                var firstObject = Player.DrawableRuleset.Playfield.HitObjectContainer.AliveObjects.OfType<DrawableHitCircle>().FirstOrDefault();
 
                 if (firstObject == null)
                     return false;
@@ -75,7 +74,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [Resolved]
         private AudioManager audio { get; set; }
 
-        protected override Player CreatePlayer(Ruleset ruleset) => new SkinProvidingPlayer(testUserSkin);
+        protected override TestPlayer CreatePlayer(Ruleset ruleset) => new SkinProvidingPlayer(testUserSkin);
 
         protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null) => new CustomSkinWorkingBeatmap(beatmap, storyboard, Clock, audio, testBeatmapSkin);
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index 5cf571d961..ea006ec607 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -11,7 +11,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
-using osu.Game.Tests.Visual;
 using osuTK;
 using System.Collections.Generic;
 using System.Linq;
@@ -44,7 +43,7 @@ namespace osu.Game.Rulesets.Osu.Tests
             base.SetUpSteps();
 
             AddUntilStep("wait for track to start running", () => track.IsRunning);
-            AddStep("retrieve spinner", () => drawableSpinner = (DrawableSpinner)((TestPlayer)Player).DrawableRuleset.Playfield.AllHitObjects.First());
+            AddStep("retrieve spinner", () => drawableSpinner = (DrawableSpinner)Player.DrawableRuleset.Playfield.AllHitObjects.First());
         }
 
         [Test]
@@ -89,7 +88,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         {
             AddStep($"seek to {time}", () => track.Seek(time));
 
-            AddUntilStep("wait for seek to finish", () => Precision.AlmostEquals(time, ((TestPlayer)Player).DrawableRuleset.FrameStableClock.CurrentTime, 100));
+            AddUntilStep("wait for seek to finish", () => Precision.AlmostEquals(time, Player.DrawableRuleset.FrameStableClock.CurrentTime, 100));
         }
 
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new Beatmap
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneSwellJudgements.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneSwellJudgements.cs
index ccacc50de1..303f0163b1 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneSwellJudgements.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneSwellJudgements.cs
@@ -1,23 +1,16 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Objects;
-using osu.Game.Screens.Play;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Taiko.Tests
 {
     public class TestSceneSwellJudgements : PlayerTestScene
     {
-        protected new TestPlayer Player => (TestPlayer)base.Player;
-
         public TestSceneSwellJudgements()
             : base(new TaikoRuleset())
         {
@@ -49,25 +42,5 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
             return beatmap;
         }
-
-        protected override Player CreatePlayer(Ruleset ruleset) => new TestPlayer();
-
-        protected class TestPlayer : Player
-        {
-            public readonly List<JudgementResult> Results = new List<JudgementResult>();
-
-            public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
-
-            public TestPlayer()
-                : base(false, false)
-            {
-            }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                ScoreProcessor.NewJudgement += r => Results.Add(r);
-            }
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoSuddenDeath.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoSuddenDeath.cs
index 140433a523..2ab041e191 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoSuddenDeath.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoSuddenDeath.cs
@@ -4,11 +4,9 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Beatmaps;
 using osu.Game.Rulesets.Taiko.Mods;
 using osu.Game.Rulesets.Taiko.Objects;
-using osu.Game.Screens.Play;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Taiko.Tests
@@ -22,10 +20,10 @@ namespace osu.Game.Rulesets.Taiko.Tests
 
         protected override bool AllowFail => true;
 
-        protected override Player CreatePlayer(Ruleset ruleset)
+        protected override TestPlayer CreatePlayer(Ruleset ruleset)
         {
             SelectedMods.Value = SelectedMods.Value.Concat(new[] { new TaikoModSuddenDeath() }).ToArray();
-            return new ScoreAccessiblePlayer();
+            return base.CreatePlayer(ruleset);
         }
 
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) =>
@@ -49,20 +47,10 @@ namespace osu.Game.Rulesets.Taiko.Tests
             AddStep("Setup judgements", () =>
             {
                 judged = false;
-                ((ScoreAccessiblePlayer)Player).ScoreProcessor.NewJudgement += b => judged = true;
+                Player.ScoreProcessor.NewJudgement += b => judged = true;
             });
             AddUntilStep("swell judged", () => judged);
             AddAssert("not failed", () => !Player.HasFailed);
         }
-
-        private class ScoreAccessiblePlayer : TestPlayer
-        {
-            public ScoreAccessiblePlayer()
-                : base(false, false)
-            {
-            }
-
-            public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
-        }
     }
 }
diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index 6d014ca1ca..06a155e78b 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Tests.Visual.Background
 
         private DummySongSelect songSelect;
         private TestPlayerLoader playerLoader;
-        private TestPlayer player;
+        private LoadBlockingTestPlayer player;
         private BeatmapManager manager;
         private RulesetStore rulesets;
 
@@ -81,7 +81,7 @@ namespace osu.Game.Tests.Visual.Background
         public void PlayerLoaderSettingsHoverTest()
         {
             setupUserSettings();
-            AddStep("Start player loader", () => songSelect.Push(playerLoader = new TestPlayerLoader(player = new TestPlayer { BlockLoad = true })));
+            AddStep("Start player loader", () => songSelect.Push(playerLoader = new TestPlayerLoader(player = new LoadBlockingTestPlayer { BlockLoad = true })));
             AddUntilStep("Wait for Player Loader to load", () => playerLoader?.IsLoaded ?? false);
             AddAssert("Background retained from song select", () => songSelect.IsBackgroundCurrent());
             AddStep("Trigger background preview", () =>
@@ -268,7 +268,7 @@ namespace osu.Game.Tests.Visual.Background
         {
             setupUserSettings();
 
-            AddStep("Start player loader", () => songSelect.Push(playerLoader = new TestPlayerLoader(player = new TestPlayer(allowPause))));
+            AddStep("Start player loader", () => songSelect.Push(playerLoader = new TestPlayerLoader(player = new LoadBlockingTestPlayer(allowPause))));
 
             AddUntilStep("Wait for Player Loader to load", () => playerLoader.IsLoaded);
             AddStep("Move mouse to center of screen", () => InputManager.MoveMouseTo(playerLoader.ScreenPos));
@@ -347,7 +347,7 @@ namespace osu.Game.Tests.Visual.Background
             public bool IsBlurCorrect() => ((FadeAccessibleBackground)Background).CurrentBlur == new Vector2(BACKGROUND_BLUR);
         }
 
-        private class TestPlayer : Visual.TestPlayer
+        private class LoadBlockingTestPlayer : TestPlayer
         {
             protected override BackgroundScreen CreateBackground() => new FadeAccessibleBackground(Beatmap.Value);
 
@@ -360,7 +360,7 @@ namespace osu.Game.Tests.Visual.Background
             public readonly Bindable<bool> ReplacesBackground = new Bindable<bool>();
             public readonly Bindable<bool> IsPaused = new Bindable<bool>();
 
-            public TestPlayer(bool allowPause = true)
+            public LoadBlockingTestPlayer(bool allowPause = true)
                 : base(allowPause)
             {
             }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
index 4daab8d137..756f31e0bf 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
@@ -5,7 +5,6 @@ using System.ComponentModel;
 using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Storyboards;
 
@@ -14,20 +13,22 @@ namespace osu.Game.Tests.Visual.Gameplay
     [Description("Player instantiated with an autoplay mod.")]
     public class TestSceneAutoplay : TestSceneAllRulesetPlayers
     {
+        protected new TestPlayer Player => (TestPlayer)base.Player;
+
         private ClockBackedTestWorkingBeatmap.TrackVirtualManual track;
 
         protected override Player CreatePlayer(Ruleset ruleset)
         {
             SelectedMods.Value = SelectedMods.Value.Concat(new[] { ruleset.GetAutoplayMod() }).ToArray();
-            return new ScoreAccessiblePlayer();
+            return new TestPlayer(false, false);
         }
 
         protected override void AddCheckSteps()
         {
-            AddUntilStep("score above zero", () => ((ScoreAccessiblePlayer)Player).ScoreProcessor.TotalScore.Value > 0);
-            AddUntilStep("key counter counted keys", () => ((ScoreAccessiblePlayer)Player).HUDOverlay.KeyCounter.Children.Any(kc => kc.CountPresses > 2));
+            AddUntilStep("score above zero", () => Player.ScoreProcessor.TotalScore.Value > 0);
+            AddUntilStep("key counter counted keys", () => Player.HUDOverlay.KeyCounter.Children.Any(kc => kc.CountPresses > 2));
             AddStep("rewind", () => track.Seek(-10000));
-            AddUntilStep("key counter reset", () => ((ScoreAccessiblePlayer)Player).HUDOverlay.KeyCounter.Children.All(kc => kc.CountPresses == 0));
+            AddUntilStep("key counter reset", () => Player.HUDOverlay.KeyCounter.Children.All(kc => kc.CountPresses == 0));
         }
 
         protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
@@ -38,18 +39,5 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             return working;
         }
-
-        private class ScoreAccessiblePlayer : TestPlayer
-        {
-            public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
-            public new HUDOverlay HUDOverlay => base.HUDOverlay;
-
-            public new GameplayClockContainer GameplayClockContainer => base.GameplayClockContainer;
-
-            public ScoreAccessiblePlayer()
-                : base(false, false)
-            {
-            }
-        }
     }
 }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
index 78c3b22fb9..310746d179 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.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.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -11,12 +10,8 @@ using osu.Framework.Utils;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
-using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Objects;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Rulesets.UI;
-using osu.Game.Screens.Play;
 using osu.Game.Storyboards;
 using osuTK;
 
@@ -24,8 +19,6 @@ namespace osu.Game.Tests.Visual.Gameplay
 {
     public class TestSceneGameplayRewinding : PlayerTestScene
     {
-        private RulesetExposingPlayer player => (RulesetExposingPlayer)Player;
-
         [Resolved]
         private AudioManager audioManager { get; set; }
 
@@ -48,13 +41,13 @@ namespace osu.Game.Tests.Visual.Gameplay
         {
             AddUntilStep("wait for track to start running", () => track.IsRunning);
             addSeekStep(3000);
-            AddAssert("all judged", () => player.DrawableRuleset.Playfield.AllHitObjects.All(h => h.Judged));
-            AddUntilStep("key counter counted keys", () => player.HUDOverlay.KeyCounter.Children.All(kc => kc.CountPresses >= 7));
-            AddStep("clear results", () => player.AppliedResults.Clear());
+            AddAssert("all judged", () => Player.DrawableRuleset.Playfield.AllHitObjects.All(h => h.Judged));
+            AddUntilStep("key counter counted keys", () => Player.HUDOverlay.KeyCounter.Children.All(kc => kc.CountPresses >= 7));
+            AddStep("clear results", () => Player.Results.Clear());
             addSeekStep(0);
-            AddAssert("none judged", () => player.DrawableRuleset.Playfield.AllHitObjects.All(h => !h.Judged));
-            AddUntilStep("key counters reset", () => player.HUDOverlay.KeyCounter.Children.All(kc => kc.CountPresses == 0));
-            AddAssert("no results triggered", () => player.AppliedResults.Count == 0);
+            AddAssert("none judged", () => Player.DrawableRuleset.Playfield.AllHitObjects.All(h => !h.Judged));
+            AddUntilStep("key counters reset", () => Player.HUDOverlay.KeyCounter.Children.All(kc => kc.CountPresses == 0));
+            AddAssert("no results triggered", () => Player.Results.Count == 0);
         }
 
         private void addSeekStep(double time)
@@ -62,13 +55,13 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep($"seek to {time}", () => track.Seek(time));
 
             // Allow a few frames of lenience
-            AddUntilStep("wait for seek to finish", () => Precision.AlmostEquals(time, player.DrawableRuleset.FrameStableClock.CurrentTime, 100));
+            AddUntilStep("wait for seek to finish", () => Precision.AlmostEquals(time, Player.DrawableRuleset.FrameStableClock.CurrentTime, 100));
         }
 
-        protected override Player CreatePlayer(Ruleset ruleset)
+        protected override TestPlayer CreatePlayer(Ruleset ruleset)
         {
             SelectedMods.Value = SelectedMods.Value.Concat(new[] { ruleset.GetAutoplayMod() }).ToArray();
-            return new RulesetExposingPlayer();
+            return base.CreatePlayer(ruleset);
         }
 
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
@@ -89,29 +82,5 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             return beatmap;
         }
-
-        private class RulesetExposingPlayer : Player
-        {
-            public readonly List<JudgementResult> AppliedResults = new List<JudgementResult>();
-
-            public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
-
-            public new HUDOverlay HUDOverlay => base.HUDOverlay;
-
-            public new GameplayClockContainer GameplayClockContainer => base.GameplayClockContainer;
-
-            public new DrawableRuleset DrawableRuleset => base.DrawableRuleset;
-
-            public RulesetExposingPlayer()
-                : base(false, false)
-            {
-            }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                ScoreProcessor.NewJudgement += r => AppliedResults.Add(r);
-            }
-        }
     }
 }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index ad5bab4681..944e6ca6be 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -11,7 +11,6 @@ using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
 using osuTK;
 using osuTK.Input;
@@ -282,14 +281,10 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         protected override bool AllowFail => true;
 
-        protected override Player CreatePlayer(Ruleset ruleset) => new PausePlayer();
+        protected override TestPlayer CreatePlayer(Ruleset ruleset) => new PausePlayer();
 
         protected class PausePlayer : TestPlayer
         {
-            public new HealthProcessor HealthProcessor => base.HealthProcessor;
-
-            public new HUDOverlay HUDOverlay => base.HUDOverlay;
-
             public bool FailOverlayVisible => FailOverlay.State.Value == Visibility.Visible;
 
             public bool PauseOverlayVisible => PauseOverlay.State.Value == Visibility.Visible;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs
index 3513b6c25a..a83320048b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePauseWhenInactive.cs
@@ -9,15 +9,12 @@ using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Screens.Play;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [HeadlessTest] // we alter unsafe properties on the game host to test inactive window state.
     public class TestScenePauseWhenInactive : PlayerTestScene
     {
-        protected new TestPlayer Player => (TestPlayer)base.Player;
-
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {
             var beatmap = (Beatmap)base.CreateBeatmap(ruleset);
@@ -46,6 +43,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("time of pause is after gameplay start time", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= Player.DrawableRuleset.GameplayStartTime);
         }
 
-        protected override Player CreatePlayer(Ruleset ruleset) => new TestPlayer(true, true, true);
+        protected override TestPlayer CreatePlayer(Ruleset ruleset) => new TestPlayer(true, true, true);
     }
 }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 100f99d130..175f909a5a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -9,7 +9,6 @@ using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Utils;
@@ -307,17 +306,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             public ScoreRank AdjustRank(ScoreRank rank, double accuracy) => rank;
         }
 
-        private class TestPlayer : Visual.TestPlayer
-        {
-            public new Bindable<IReadOnlyList<Mod>> Mods => base.Mods;
-
-            public TestPlayer(bool allowPause = true, bool showResults = true)
-                : base(allowPause, showResults)
-            {
-            }
-        }
-
-        protected class SlowLoadPlayer : Visual.TestPlayer
+        protected class SlowLoadPlayer : TestPlayer
         {
             public readonly ManualResetEventSlim AllowLoad = new ManualResetEventSlim(false);
 
diff --git a/osu.Game/Tests/Visual/PlayerTestScene.cs b/osu.Game/Tests/Visual/PlayerTestScene.cs
index 7c5ba7d30f..eee31fe014 100644
--- a/osu.Game/Tests/Visual/PlayerTestScene.cs
+++ b/osu.Game/Tests/Visual/PlayerTestScene.cs
@@ -8,7 +8,6 @@ using osu.Framework.Testing;
 using osu.Game.Configuration;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Screens.Play;
 
 namespace osu.Game.Tests.Visual
 {
@@ -16,7 +15,7 @@ namespace osu.Game.Tests.Visual
     {
         private readonly Ruleset ruleset;
 
-        protected Player Player;
+        protected TestPlayer Player;
 
         protected PlayerTestScene(Ruleset ruleset)
         {
@@ -69,6 +68,6 @@ namespace osu.Game.Tests.Visual
             LoadScreen(Player);
         }
 
-        protected virtual Player CreatePlayer(Ruleset ruleset) => new TestPlayer(false, false);
+        protected virtual TestPlayer CreatePlayer(Ruleset ruleset) => new TestPlayer(false, false);
     }
 }
diff --git a/osu.Game/Tests/Visual/TestPlayer.cs b/osu.Game/Tests/Visual/TestPlayer.cs
index 8e3821f1a0..f016d29f38 100644
--- a/osu.Game/Tests/Visual/TestPlayer.cs
+++ b/osu.Game/Tests/Visual/TestPlayer.cs
@@ -1,23 +1,51 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play;
 
 namespace osu.Game.Tests.Visual
 {
+    /// <summary>
+    /// A player that exposes many components that would otherwise not be available, for testing purposes.
+    /// </summary>
     public class TestPlayer : Player
     {
         protected override bool PauseOnFocusLost { get; }
 
         public new DrawableRuleset DrawableRuleset => base.DrawableRuleset;
 
+        /// <summary>
+        /// Mods from *player* (not OsuScreen).
+        /// </summary>
+        public new Bindable<IReadOnlyList<Mod>> Mods => base.Mods;
+
+        public new HUDOverlay HUDOverlay => base.HUDOverlay;
+
         public new GameplayClockContainer GameplayClockContainer => base.GameplayClockContainer;
 
+        public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
+
+        public new HealthProcessor HealthProcessor => base.HealthProcessor;
+
+        public readonly List<JudgementResult> Results = new List<JudgementResult>();
+
         public TestPlayer(bool allowPause = true, bool showResults = true, bool pauseOnFocusLost = false)
             : base(allowPause, showResults)
         {
             PauseOnFocusLost = pauseOnFocusLost;
         }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            ScoreProcessor.NewJudgement += r => Results.Add(r);
+        }
     }
 }

From 26ce0d05d6f45f07cb6214b3f1036200f98513e6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Mar 2020 11:33:30 +0900
Subject: [PATCH 0910/1142] Use autoplay mod rather than local replay provider

---
 .../Mods/TestSceneOsuModDifficultyAdjust.cs   | 22 ++--------
 osu.Game/Tests/Visual/ModTestScene.cs         | 41 ++++++++-----------
 osu.Game/Tests/Visual/TestReplayPlayer.cs     | 24 -----------
 3 files changed, 21 insertions(+), 66 deletions(-)
 delete mode 100644 osu.Game/Tests/Visual/TestReplayPlayer.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index e4b1e30bcd..0a98f49526 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -3,8 +3,6 @@
 
 using NUnit.Framework;
 using osu.Game.Rulesets.Osu.Mods;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Scoring;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests.Mods
@@ -17,11 +15,11 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         }
 
         [Test]
-        public void TestNoAdjustment() => CreateModTest(new ModTestData()
+        public void TestNoAdjustment() => CreateModTest(new ModTestData
         {
             Mod = new OsuModDifficultyAdjust(),
             Autoplay = true,
-            PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
+            PassCondition = () => Player.ScoreProcessor.JudgedHits >= 2
         });
 
         [Test]
@@ -29,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         {
             Mod = new OsuModDifficultyAdjust { CircleSize = { Value = 10 } },
             Autoplay = true,
-            PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
+            PassCondition = () => Player.ScoreProcessor.JudgedHits >= 2
         });
 
         [Test]
@@ -37,19 +35,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         {
             Mod = new OsuModDifficultyAdjust { ApproachRate = { Value = 10 } },
             Autoplay = true,
-            PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
+            PassCondition = () => Player.ScoreProcessor.JudgedHits >= 2
         });
-
-        protected override TestPlayer CreateReplayPlayer(Score score, bool allowFail) => new ScoreAccessibleTestPlayer(score, allowFail);
-
-        private class ScoreAccessibleTestPlayer : TestPlayer
-        {
-            public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
-
-            public ScoreAccessibleTestPlayer(Score score, bool allowFail)
-                : base(score, allowFail)
-            {
-            }
-        }
     }
 }
diff --git a/osu.Game/Tests/Visual/ModTestScene.cs b/osu.Game/Tests/Visual/ModTestScene.cs
index 3d12001cca..9abe543bf6 100644
--- a/osu.Game/Tests/Visual/ModTestScene.cs
+++ b/osu.Game/Tests/Visual/ModTestScene.cs
@@ -3,13 +3,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using JetBrains.Annotations;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Scoring;
-using osu.Game.Screens.Play;
 
 namespace osu.Game.Tests.Visual
 {
@@ -27,52 +24,48 @@ namespace osu.Game.Tests.Visual
         {
         }
 
-        private ModTestData currentTest;
+        private ModTestData currentTestData;
 
         protected void CreateModTest(ModTestData testData) => CreateTest(() =>
         {
-            AddStep("set test data", () => currentTest = testData);
+            AddStep("set test data", () => currentTestData = testData);
         });
 
         public override void TearDownSteps()
         {
             AddUntilStep("test passed", () =>
             {
-                if (currentTest == null)
+                if (currentTestData == null)
                     return true;
 
-                return currentTest.PassCondition?.Invoke() ?? false;
+                return currentTestData.PassCondition?.Invoke() ?? false;
             });
 
             base.TearDownSteps();
         }
 
-        protected sealed override IBeatmap CreateBeatmap(RulesetInfo ruleset) => currentTest?.Beatmap ?? base.CreateBeatmap(ruleset);
+        protected sealed override IBeatmap CreateBeatmap(RulesetInfo ruleset) => currentTestData?.Beatmap ?? base.CreateBeatmap(ruleset);
 
-        protected sealed override Player CreatePlayer(Ruleset ruleset)
+        protected sealed override TestPlayer CreatePlayer(Ruleset ruleset)
         {
-            SelectedMods.Value = SelectedMods.Value.Append(currentTest.Mod).ToArray();
+            var mods = new List<Mod>(SelectedMods.Value);
 
-            var score = currentTest.Autoplay
-                ? ruleset.GetAutoplayMod().CreateReplayScore(Beatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo, SelectedMods.Value))
-                : null;
+            if (currentTestData.Mod != null)
+                mods.Add(currentTestData.Mod);
+            if (currentTestData.Autoplay)
+                mods.Add(ruleset.GetAutoplayMod());
 
-            return CreateReplayPlayer(score, AllowFail);
+            SelectedMods.Value = mods;
+
+            return new ModTestPlayer(AllowFail);
         }
 
-        /// <summary>
-        /// Creates the <see cref="TestPlayer"/> for a test case.
-        /// </summary>
-        /// <param name="score">The <see cref="Score"/>.</param>
-        /// <param name="allowFail">Whether the player can fail.</param>
-        protected virtual TestPlayer CreateReplayPlayer(Score score, bool allowFail) => new TestPlayer(score, allowFail);
-
-        protected class TestPlayer : TestReplayPlayer
+        protected class ModTestPlayer : TestPlayer
         {
             protected override bool AllowFail { get; }
 
-            public TestPlayer(Score score, bool allowFail)
-                : base(score, false, false)
+            public ModTestPlayer(bool allowFail)
+                : base(false, false)
             {
                 AllowFail = allowFail;
             }
diff --git a/osu.Game/Tests/Visual/TestReplayPlayer.cs b/osu.Game/Tests/Visual/TestReplayPlayer.cs
deleted file mode 100644
index e99fcc1e37..0000000000
--- a/osu.Game/Tests/Visual/TestReplayPlayer.cs
+++ /dev/null
@@ -1,24 +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.Game.Rulesets.UI;
-using osu.Game.Scoring;
-using osu.Game.Screens.Play;
-
-namespace osu.Game.Tests.Visual
-{
-    public class TestReplayPlayer : ReplayPlayer
-    {
-        protected override bool PauseOnFocusLost { get; }
-
-        public new DrawableRuleset DrawableRuleset => base.DrawableRuleset;
-
-        public new GameplayClockContainer GameplayClockContainer => base.GameplayClockContainer;
-
-        public TestReplayPlayer(Score score, bool allowPause = true, bool showResults = true, bool pauseOnFocusLost = false)
-            : base(score, allowPause, showResults)
-        {
-            PauseOnFocusLost = pauseOnFocusLost;
-        }
-    }
-}

From 9a12909f09a377f9348a496f0e95a52c2b51cedf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Mar 2020 11:53:04 +0900
Subject: [PATCH 0911/1142] Test ModDifficultyAdjust is actually taking effect

---
 .../Mods/TestSceneOsuModDifficultyAdjust.cs   | 51 +++++++++++++++++--
 1 file changed, 48 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index 0a98f49526..69415b70e3 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -1,8 +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.Linq;
 using NUnit.Framework;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Framework.Utils;
+using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests.Mods
@@ -19,7 +25,15 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         {
             Mod = new OsuModDifficultyAdjust(),
             Autoplay = true,
-            PassCondition = () => Player.ScoreProcessor.JudgedHits >= 2
+            PassCondition = checkSomeHit
+        });
+
+        [Test]
+        public void TestCircleSize1() => CreateModTest(new ModTestData
+        {
+            Mod = new OsuModDifficultyAdjust { CircleSize = { Value = 1 } },
+            Autoplay = true,
+            PassCondition = () => checkSomeHit() && checkObjectsScale(0.78f)
         });
 
         [Test]
@@ -27,7 +41,15 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         {
             Mod = new OsuModDifficultyAdjust { CircleSize = { Value = 10 } },
             Autoplay = true,
-            PassCondition = () => Player.ScoreProcessor.JudgedHits >= 2
+            PassCondition = () => checkSomeHit() && checkObjectsScale(0.15f)
+        });
+
+        [Test]
+        public void TestApproachRate1() => CreateModTest(new ModTestData
+        {
+            Mod = new OsuModDifficultyAdjust { ApproachRate = { Value = 1 } },
+            Autoplay = true,
+            PassCondition = () => checkSomeHit() && checkObjectsPreempt(1680)
         });
 
         [Test]
@@ -35,7 +57,30 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         {
             Mod = new OsuModDifficultyAdjust { ApproachRate = { Value = 10 } },
             Autoplay = true,
-            PassCondition = () => Player.ScoreProcessor.JudgedHits >= 2
+            PassCondition = () => checkSomeHit() && checkObjectsPreempt(450)
         });
+
+        private bool checkObjectsPreempt(double target)
+        {
+            var objects = Player.ChildrenOfType<DrawableHitCircle>();
+            if (!objects.Any())
+                return false;
+
+            return objects.All(o => o.HitObject.TimePreempt == target);
+        }
+
+        private bool checkObjectsScale(float target)
+        {
+            var objects = Player.ChildrenOfType<DrawableHitCircle>();
+            if (!objects.Any())
+                return false;
+
+            return objects.All(o => Precision.AlmostEquals(o.ChildrenOfType<ShakeContainer>().First().Children.OfType<Container>().Single().Scale.X, target));
+        }
+
+        private bool checkSomeHit()
+        {
+            return Player.ScoreProcessor.JudgedHits >= 2;
+        }
     }
 }

From 7229131d369c19ac8b54ab840c125e3bc83ee9a6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Mar 2020 13:18:42 +0900
Subject: [PATCH 0912/1142] Fix song select max displayable star difficulty
 getting stuck at wrong maximum

---
 osu.Game/Configuration/OsuConfigManager.cs | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index ce959e9057..c5d68e4efe 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Bindables;
 using osu.Framework.Configuration;
 using osu.Framework.Configuration.Tracking;
 using osu.Framework.Extensions;
@@ -126,6 +127,34 @@ namespace osu.Game.Configuration
         public OsuConfigManager(Storage storage)
             : base(storage)
         {
+            Migrate();
+        }
+
+        public void Migrate()
+        {
+            // arrives as 2020.123.0
+            var rawVersion = Get<string>(OsuSetting.Version);
+
+            if (rawVersion.Length < 6)
+                return;
+
+            var pieces = rawVersion.Split('.');
+
+            if (!int.TryParse(pieces[0], out int year)) return;
+            if (!int.TryParse(pieces[1], out int monthDay)) return;
+            if (!int.TryParse(pieces[2], out int minor)) return;
+
+            int combined = (year * 10000) + monthDay;
+
+            if (combined < 20200305)
+            {
+                // the maximum value of this setting was changed.
+                // if we don't manually increase this, it causes song select to filter out beatmaps the user expects to see.
+                var maxStars = (BindableDouble)GetOriginalBindable<double>(OsuSetting.DisplayStarsMaximum);
+
+                if (maxStars.Value == 10)
+                    maxStars.Value = maxStars.MaxValue;
+            }
         }
 
         public override TrackedSettings CreateTrackedSettings() => new TrackedSettings

From 6477a7b73e1d7ede6f77cfb76b15e63d1be20bdb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Mar 2020 13:34:04 +0900
Subject: [PATCH 0913/1142] Centralise creation of UpdateManagers

---
 osu.Android/OsuGameAndroid.cs |  7 +------
 osu.Desktop/OsuGameDesktop.cs | 19 ++++++++++++-------
 osu.Game/OsuGame.cs           |  4 ++++
 osu.iOS/OsuGameIOS.cs         |  7 -------
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/osu.Android/OsuGameAndroid.cs b/osu.Android/OsuGameAndroid.cs
index a91c010809..84f215f930 100644
--- a/osu.Android/OsuGameAndroid.cs
+++ b/osu.Android/OsuGameAndroid.cs
@@ -30,11 +30,6 @@ namespace osu.Android
             }
         }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            Add(new SimpleUpdateManager());
-        }
+        protected override UpdateManager CreateUpdateManager() => new SimpleUpdateManager();
     }
 }
\ No newline at end of file
diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index f70cc24159..f05ee48914 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -47,20 +47,25 @@ namespace osu.Desktop
             return null;
         }
 
+        protected override UpdateManager CreateUpdateManager()
+        {
+            switch (RuntimeInfo.OS)
+            {
+                case RuntimeInfo.Platform.Windows:
+                    return new SquirrelUpdateManager();
+
+                default:
+                    return new SimpleUpdateManager();
+            }
+        }
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
             if (!noVersionOverlay)
-            {
                 LoadComponentAsync(versionManager = new VersionManager { Depth = int.MinValue }, Add);
 
-                if (RuntimeInfo.OS == RuntimeInfo.Platform.Windows)
-                    Add(new SquirrelUpdateManager());
-                else
-                    Add(new SimpleUpdateManager());
-            }
-
             LoadComponentAsync(new DiscordRichPresence(), Add);
         }
 
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 5781a7fbc4..916464ff53 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -43,6 +43,7 @@ using osu.Game.Overlays.Volume;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
 using osu.Game.Screens.Select;
+using osu.Game.Updater;
 using osu.Game.Utils;
 using LogLevel = osu.Framework.Logging.LogLevel;
 
@@ -390,6 +391,8 @@ namespace osu.Game
 
         protected virtual Loader CreateLoader() => new Loader();
 
+        protected virtual UpdateManager CreateUpdateManager() => new UpdateManager();
+
         protected override Container CreateScalingContainer() => new ScalingContainer(ScalingMode.Everything);
 
         #region Beatmap progression
@@ -528,6 +531,7 @@ namespace osu.Game
 
             AddRange(new Drawable[]
             {
+                CreateUpdateManager(),
                 new VolumeControlReceptor
                 {
                     RelativeSizeAxes = Axes.Both,
diff --git a/osu.iOS/OsuGameIOS.cs b/osu.iOS/OsuGameIOS.cs
index e5ff4aec95..3a16f81530 100644
--- a/osu.iOS/OsuGameIOS.cs
+++ b/osu.iOS/OsuGameIOS.cs
@@ -11,12 +11,5 @@ namespace osu.iOS
     public class OsuGameIOS : OsuGame
     {
         public override Version AssemblyVersion => new Version(NSBundle.MainBundle.InfoDictionary["CFBundleVersion"].ToString());
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            Add(new UpdateManager());
-        }
     }
 }

From 74b5e76c0ebec3360fb998f4743e461329a12083 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Mar 2020 13:39:55 +0900
Subject: [PATCH 0914/1142] Fix dependency initialisation ordering

---
 osu.Game/OsuGame.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 916464ff53..50aefb4dd2 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -531,7 +531,6 @@ namespace osu.Game
 
             AddRange(new Drawable[]
             {
-                CreateUpdateManager(),
                 new VolumeControlReceptor
                 {
                     RelativeSizeAxes = Axes.Both,
@@ -632,6 +631,7 @@ namespace osu.Game
             chatOverlay.State.ValueChanged += state => channelManager.HighPollRate.Value = state.NewValue == Visibility.Visible;
 
             Add(externalLinkOpener = new ExternalLinkOpener());
+            Add(CreateUpdateManager()); // dependency on notification overlay
 
             // side overlays which cancel each other.
             var singleDisplaySideOverlays = new OverlayContainer[] { Settings, notifications };

From 1e6710020e3adc3da750730ab6f66802dc50488f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Mar 2020 13:46:25 +0900
Subject: [PATCH 0915/1142] Remove minor version for now

---
 osu.Game/Configuration/OsuConfigManager.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index c5d68e4efe..5b20700086 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -142,7 +142,6 @@ namespace osu.Game.Configuration
 
             if (!int.TryParse(pieces[0], out int year)) return;
             if (!int.TryParse(pieces[1], out int monthDay)) return;
-            if (!int.TryParse(pieces[2], out int minor)) return;
 
             int combined = (year * 10000) + monthDay;
 

From 1e1e8cbcb5915ad1d0db77d34926ebc54d0218aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Mar 2020 14:46:38 +0900
Subject: [PATCH 0916/1142] Always update version

---
 osu.Game/Updater/UpdateManager.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index 48505a9891..f7a7795d9b 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -34,12 +34,12 @@ namespace osu.Game.Updater
 
             if (game.IsDeployedBuild && version != lastVersion)
             {
-                config.Set(OsuSetting.Version, version);
-
                 // only show a notification if we've previously saved a version to the config file (ie. not the first run).
                 if (!string.IsNullOrEmpty(lastVersion))
                     Notifications.Post(new UpdateCompleteNotification(version));
             }
+
+            config.Set(OsuSetting.Version, version);
         }
 
         private class UpdateCompleteNotification : SimpleNotification

From a311ace62656d854b8136c93ad7f7dcb91e1e9ce Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Mar 2020 14:46:07 +0900
Subject: [PATCH 0917/1142] Add migration test

---
 .../Visual/Navigation/OsuGameTestScene.cs     | 23 +++++++----
 .../Navigation/TestSettingsMigration.cs       | 41 +++++++++++++++++++
 osu.Game/OsuGameBase.cs                       |  2 +-
 osu.Game/Tests/Visual/OsuTestScene.cs         |  2 +-
 4 files changed, 58 insertions(+), 10 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Navigation/TestSettingsMigration.cs

diff --git a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
index 70d71d0952..b0bfb64d61 100644
--- a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
+++ b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
@@ -62,14 +62,7 @@ namespace osu.Game.Tests.Visual.Navigation
                 var frameworkConfig = host.Dependencies.Get<FrameworkConfigManager>();
                 frameworkConfig.GetBindable<double>(FrameworkSetting.CursorSensitivity).Disabled = false;
 
-                Game = new TestOsuGame(LocalStorage, API);
-                Game.SetHost(host);
-
-                // todo: this can be removed once we can run audio tracks without a device present
-                // see https://github.com/ppy/osu/issues/1302
-                Game.LocalConfig.Set(OsuSetting.IntroSequence, IntroSequence.Circles);
-
-                Add(Game);
+                CreateGame();
             });
 
             AddUntilStep("Wait for load", () => Game.IsLoaded);
@@ -78,6 +71,18 @@ namespace osu.Game.Tests.Visual.Navigation
             ConfirmAtMainMenu();
         }
 
+        protected void CreateGame()
+        {
+            Game = new TestOsuGame(LocalStorage, API);
+            Game.SetHost(host);
+
+            // todo: this can be removed once we can run audio tracks without a device present
+            // see https://github.com/ppy/osu/issues/1302
+            Game.LocalConfig.Set(OsuSetting.IntroSequence, IntroSequence.Circles);
+
+            Add(Game);
+        }
+
         protected void PushAndConfirm(Func<Screen> newScreen)
         {
             Screen screen = null;
@@ -103,6 +108,8 @@ namespace osu.Game.Tests.Visual.Navigation
 
             public new Bindable<RulesetInfo> Ruleset => base.Ruleset;
 
+            public override string Version => "test game";
+
             protected override Loader CreateLoader() => new TestLoader();
 
             public new void PerformFromScreen(Action<IScreen> action, IEnumerable<Type> validScreens = null) => base.PerformFromScreen(action, validScreens);
diff --git a/osu.Game.Tests/Visual/Navigation/TestSettingsMigration.cs b/osu.Game.Tests/Visual/Navigation/TestSettingsMigration.cs
new file mode 100644
index 0000000000..c0b77b580e
--- /dev/null
+++ b/osu.Game.Tests/Visual/Navigation/TestSettingsMigration.cs
@@ -0,0 +1,41 @@
+// 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.Utils;
+using osu.Game.Configuration;
+
+namespace osu.Game.Tests.Visual.Navigation
+{
+    public class TestSettingsMigration : OsuGameTestScene
+    {
+        public override void RecycleLocalStorage()
+        {
+            base.RecycleLocalStorage();
+
+            using (var config = new OsuConfigManager(LocalStorage))
+            {
+                config.Set(OsuSetting.Version, "2020.101.0");
+                config.Set(OsuSetting.DisplayStarsMaximum, 10.0);
+            }
+        }
+
+        [Test]
+        public void TestDisplayStarsMigration()
+        {
+            AddAssert("config has migrated value", () => Precision.AlmostEquals(Game.LocalConfig.Get<double>(OsuSetting.DisplayStarsMaximum), 10.1));
+
+            AddStep("set value again", () => Game.LocalConfig.Set<double>(OsuSetting.DisplayStarsMaximum, 10));
+
+            AddStep("force save config", () => Game.LocalConfig.Save());
+
+            AddStep("remove game", () => Remove(Game));
+
+            AddStep("create game again", CreateGame);
+
+            AddUntilStep("Wait for load", () => Game.IsLoaded);
+
+            AddAssert("config did not migrate value", () => Precision.AlmostEquals(Game.LocalConfig.Get<double>(OsuSetting.DisplayStarsMaximum), 10));
+        }
+    }
+}
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index a890331f05..33333e592e 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -97,7 +97,7 @@ namespace osu.Game
 
         public bool IsDeployedBuild => AssemblyVersion.Major > 0;
 
-        public string Version
+        public virtual string Version
         {
             get
             {
diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index b203557fab..f102e2ece3 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -104,7 +104,7 @@ namespace osu.Game.Tests.Visual
             base.Content.Add(content = new DrawSizePreservingFillContainer());
         }
 
-        public void RecycleLocalStorage()
+        public virtual void RecycleLocalStorage()
         {
             if (localStorage?.IsValueCreated == true)
             {

From 507af4fa72cb9c7e98733eb5925198ab4caac756 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Mar 2020 15:35:27 +0900
Subject: [PATCH 0918/1142] Add comment about rationale behind always updating
 version in config

---
 osu.Game/Updater/UpdateManager.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Updater/UpdateManager.cs b/osu.Game/Updater/UpdateManager.cs
index f7a7795d9b..28a295215f 100644
--- a/osu.Game/Updater/UpdateManager.cs
+++ b/osu.Game/Updater/UpdateManager.cs
@@ -39,6 +39,8 @@ namespace osu.Game.Updater
                     Notifications.Post(new UpdateCompleteNotification(version));
             }
 
+            // debug / local compilations will reset to a non-release string.
+            // can be useful to check when an install has transitioned between release and otherwise (see OsuConfigManager's migrations).
             config.Set(OsuSetting.Version, version);
         }
 

From 5b8037ea7d2b69e29ae82eb54aba16e2bd07efe9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Mar 2020 15:36:36 +0900
Subject: [PATCH 0919/1142] Add note about early migration return on
 non-release transitions

---
 osu.Game/Configuration/OsuConfigManager.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 5b20700086..21de654670 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -140,6 +140,8 @@ namespace osu.Game.Configuration
 
             var pieces = rawVersion.Split('.');
 
+            // on a fresh install or when coming from a non-release build, execution will end here.
+            // we don't want to run migrations in such cases.
             if (!int.TryParse(pieces[0], out int year)) return;
             if (!int.TryParse(pieces[1], out int monthDay)) return;
 

From 646c8fe077eca5b6630b397e38fc5b3c6330e7ac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Mar 2020 15:40:48 +0900
Subject: [PATCH 0920/1142] Add note about version override

---
 osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
index b0bfb64d61..ea8a06e990 100644
--- a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
+++ b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
@@ -108,6 +108,7 @@ namespace osu.Game.Tests.Visual.Navigation
 
             public new Bindable<RulesetInfo> Ruleset => base.Ruleset;
 
+            // if we don't do this, when running under nUnit the version that gets populated is that of nUnit.
             public override string Version => "test game";
 
             protected override Loader CreateLoader() => new TestLoader();

From 9307caa3bfb60e7636033fe78311549da1653487 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 5 Mar 2020 16:58:07 +0900
Subject: [PATCH 0921/1142] Fix typos

---
 osu.Game/OsuGame.cs     | 2 +-
 osu.Game/OsuGameBase.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 0be9e6cdaa..e54bbaabb2 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -410,7 +410,7 @@ namespace osu.Game
 
             void trackCompleted(WorkingBeatmap b)
             {
-                // the source of track completion is the audio thread, so the beatmap may have changed before a firing.
+                // the source of track completion is the audio thread, so the beatmap may have changed before firing.
                 if (Beatmap.Value != b)
                     return;
 
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 67aa4a8d4d..1048b37348 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -214,7 +214,7 @@ namespace osu.Game
 
             // ScheduleAfterChildren is safety against something in the current frame accessing the previous beatmap's track
             // and potentially causing a reload of it after just unloading.
-            // Note that the reason for this being added *has* been resolved, so it may be feasible to remover this if required.
+            // Note that the reason for this being added *has* been resolved, so it may be feasible to removed this if required.
             Beatmap.BindValueChanged(b => ScheduleAfterChildren(() =>
             {
                 // compare to last beatmap as sometimes the two may share a track representation (optimisation, see WorkingBeatmap.TransferTo)

From 0c1775b52281517e8f6f0518fc930b42b0f26aca Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 5 Mar 2020 17:12:14 +0900
Subject: [PATCH 0922/1142] Fix incorrect condition and add test

---
 .../Visual/Navigation/OsuGameTestScene.cs        |  2 ++
 .../Navigation/TestSceneScreenNavigation.cs      | 16 ++++++++++++++++
 osu.Game/OsuGame.cs                              | 10 +++++-----
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
index 70d71d0952..e984806dc9 100644
--- a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
+++ b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
@@ -97,6 +97,8 @@ namespace osu.Game.Tests.Visual.Navigation
 
             public new SettingsPanel Settings => base.Settings;
 
+            public new MusicController MusicController => base.MusicController;
+
             public new OsuConfigManager LocalConfig => base.LocalConfig;
 
             public new Bindable<WorkingBeatmap> Beatmap => base.Beatmap;
diff --git a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
index 8258cc9465..9d603ac471 100644
--- a/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
@@ -114,6 +114,22 @@ namespace osu.Game.Tests.Visual.Navigation
             AddAssert("Options overlay was closed", () => Game.Settings.State.Value == Visibility.Hidden);
         }
 
+        [Test]
+        public void TestWaitForNextTrackInMenu()
+        {
+            bool trackCompleted = false;
+
+            AddUntilStep("Wait for music controller", () => Game.MusicController.IsLoaded);
+            AddStep("Seek close to end", () =>
+            {
+                Game.MusicController.SeekTo(Game.Beatmap.Value.Track.Length - 1000);
+                Game.Beatmap.Value.Track.Completed += () => trackCompleted = true;
+            });
+
+            AddUntilStep("Track was completed", () => trackCompleted);
+            AddUntilStep("Track was restarted", () => Game.Beatmap.Value.Track.IsRunning);
+        }
+
         private void pushEscape() =>
             AddStep("Press escape", () => pressAndRelease(Key.Escape));
 
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index e54bbaabb2..19602d524e 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -414,8 +414,8 @@ namespace osu.Game
                 if (Beatmap.Value != b)
                     return;
 
-                if (Beatmap.Value.Track.Looping && !Beatmap.Disabled)
-                    musicController.NextTrack();
+                if (!Beatmap.Value.Track.Looping && !Beatmap.Disabled)
+                    MusicController.NextTrack();
             }
         }
 
@@ -588,7 +588,7 @@ namespace osu.Game
 
             loadComponentSingleFile(new OnScreenDisplay(), Add, true);
 
-            loadComponentSingleFile(musicController = new MusicController(), Add, true);
+            loadComponentSingleFile(MusicController = new MusicController(), Add, true);
 
             loadComponentSingleFile(notifications = new NotificationOverlay
             {
@@ -896,7 +896,7 @@ namespace osu.Game
 
         private ScalingContainer screenContainer;
 
-        private MusicController musicController;
+        protected MusicController MusicController { get; private set; }
 
         protected override bool OnExiting()
         {
@@ -954,7 +954,7 @@ namespace osu.Game
             {
                 OverlayActivationMode.Value = newOsuScreen.InitialOverlayActivationMode;
 
-                musicController.AllowRateAdjustments = newOsuScreen.AllowRateAdjustments;
+                MusicController.AllowRateAdjustments = newOsuScreen.AllowRateAdjustments;
 
                 if (newOsuScreen.HideOverlaysOnEnter)
                     CloseAllOverlays();

From 371a54364508eb84a37f1e098bded8584e2c1d8c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Mar 2020 20:25:38 +0900
Subject: [PATCH 0923/1142] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 1c4a6ffe75..97f7a7edb1 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.304.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.302.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.305.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 4d59b709aa..855bda3679 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.304.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.302.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.305.0" />
     <PackageReference Include="Sentry" Version="2.1.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 6897d3e625..e2c4c09047 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.304.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.302.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.305.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
@@ -79,7 +79,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.302.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.305.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 332f56a7f8f62fa426e1f153cb184a7030658961 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Mar 2020 20:34:24 +0900
Subject: [PATCH 0924/1142] Fix nullref in tests

---
 osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index c110608a0e..8c264ce974 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Screens.Select.Carousel
         {
             base.Filter(criteria);
 
-            if (Beatmap.BeatmapSet.Equals(criteria.SelectedBeatmapSet))
+            if (Beatmap.BeatmapSet?.Equals(criteria.SelectedBeatmapSet) == true)
             {
                 // bypass filtering for selected beatmap
                 Filtered.Value = false;

From 0477ef6c130052d0dc95d7fc78e0c2cc2e8a9a30 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Mar 2020 21:45:19 +0900
Subject: [PATCH 0925/1142] Force a selection after filtering to ensure correct
 difficulty is selected

---
 osu.Game/Screens/Select/SongSelect.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 6577ed8506..528222a89c 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -397,6 +397,8 @@ namespace osu.Game.Screens.Select
                 var criteria = FilterControl.CreateCriteria();
                 criteria.SelectedBeatmapSet = e.NewValue.BeatmapInfo.BeatmapSet;
                 Carousel.Filter(criteria);
+
+                Carousel.SelectBeatmap(e.NewValue.BeatmapInfo);
             }
         }
 

From 583e2c3f4a616fea8d2b9abc7065135e917217d3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Mar 2020 00:10:05 +0900
Subject: [PATCH 0926/1142] Actually check rate is applied

---
 .../Mods/TestSceneOsuModDoubleTime.cs         | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDoubleTime.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDoubleTime.cs
index deb733c581..dcf19ad993 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDoubleTime.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDoubleTime.cs
@@ -2,14 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
+using osu.Framework.Utils;
 using osu.Game.Rulesets.Osu.Mods;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Scoring;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests.Mods
 {
-    public class TestSceneOsuModDoubleTime : ModSandboxTestScene
+    public class TestSceneOsuModDoubleTime : ModTestScene
     {
         public TestSceneOsuModDoubleTime()
             : base(new OsuRuleset())
@@ -21,21 +20,16 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         [TestCase(1.5)]
         [TestCase(2)]
         [TestCase(5)]
-        public void TestDefaultRate(double rate) => CreateModTest(new ModTestCaseData("1.5x", new OsuModDoubleTime { SpeedChange = { Value = rate } })
+        public void TestSpeedChangeCustomisation(double rate)
         {
-            PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
-        });
+            var mod = new OsuModDoubleTime { SpeedChange = { Value = rate } };
 
-        protected override TestPlayer CreateReplayPlayer(Score score) => new ScoreAccessibleTestPlayer(score);
-
-        private class ScoreAccessibleTestPlayer : TestPlayer
-        {
-            public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
-
-            public ScoreAccessibleTestPlayer(Score score)
-                : base(score)
+            CreateModTest(new ModTestData
             {
-            }
+                Mod = mod,
+                PassCondition = () => Player.ScoreProcessor.JudgedHits >= 2 &&
+                                      Precision.AlmostEquals(Player.GameplayClockContainer.GameplayClock.Rate, mod.SpeedChange.Value)
+            });
         }
     }
 }

From ece263131b6c4d89a9580c70f34fdf36837b4c4a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Mar 2020 00:36:05 +0900
Subject: [PATCH 0927/1142] Update to follow new naming/structure

---
 osu.Game/Tests/Visual/ModPerfectTestScene.cs | 20 +++++++-------------
 osu.Game/Tests/Visual/ModTestScene.cs        |  2 +-
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Tests/Visual/ModPerfectTestScene.cs b/osu.Game/Tests/Visual/ModPerfectTestScene.cs
index 31d2ce9281..4bc00425bf 100644
--- a/osu.Game/Tests/Visual/ModPerfectTestScene.cs
+++ b/osu.Game/Tests/Visual/ModPerfectTestScene.cs
@@ -1,29 +1,28 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Extensions.TypeExtensions;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Scoring;
 
 namespace osu.Game.Tests.Visual
 {
-    public abstract class ModPerfectTestScene : ModSandboxTestScene
+    public abstract class ModPerfectTestScene : ModTestScene
     {
         private readonly Ruleset ruleset;
-        private readonly ModPerfect perfectMod;
+        private readonly ModPerfect mod;
 
-        protected ModPerfectTestScene(Ruleset ruleset, ModPerfect perfectMod)
+        protected ModPerfectTestScene(Ruleset ruleset, ModPerfect mod)
             : base(ruleset)
         {
             this.ruleset = ruleset;
-            this.perfectMod = perfectMod;
+            this.mod = mod;
         }
 
-        protected void CreateHitObjectTest(HitObjectTestCase testCaseData, bool shouldMiss) => CreateModTest(new ModTestCaseData(testCaseData.HitObject.GetType().ReadableName(), perfectMod)
+        protected void CreateHitObjectTest(HitObjectTestCase testCaseData, bool shouldMiss) => CreateModTest(new ModTestData
         {
+            Mod = mod,
             Beatmap = new Beatmap
             {
                 BeatmapInfo = { Ruleset = ruleset.RulesetInfo },
@@ -33,15 +32,10 @@ namespace osu.Game.Tests.Visual
             PassCondition = () => ((PerfectModTestPlayer)Player).CheckFailed(shouldMiss && testCaseData.FailOnMiss)
         });
 
-        protected sealed override TestPlayer CreateReplayPlayer(Score score) => new PerfectModTestPlayer(score);
+        protected override TestPlayer CreatePlayer(Ruleset ruleset) => new PerfectModTestPlayer();
 
         private class PerfectModTestPlayer : TestPlayer
         {
-            public PerfectModTestPlayer(Score score)
-                : base(score)
-            {
-            }
-
             protected override bool AllowFail => true;
 
             public bool CheckFailed(bool failed)
diff --git a/osu.Game/Tests/Visual/ModTestScene.cs b/osu.Game/Tests/Visual/ModTestScene.cs
index 9abe543bf6..eb418304d9 100644
--- a/osu.Game/Tests/Visual/ModTestScene.cs
+++ b/osu.Game/Tests/Visual/ModTestScene.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Tests.Visual
 
         protected sealed override IBeatmap CreateBeatmap(RulesetInfo ruleset) => currentTestData?.Beatmap ?? base.CreateBeatmap(ruleset);
 
-        protected sealed override TestPlayer CreatePlayer(Ruleset ruleset)
+        protected override TestPlayer CreatePlayer(Ruleset ruleset)
         {
             var mods = new List<Mod>(SelectedMods.Value);
 

From e3509c742c4ec1bb9df56d4a3c1f733ad4587f58 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Mar 2020 01:28:59 +0900
Subject: [PATCH 0928/1142] Track time in a simpler way in TrackVirtualManual

---
 osu.Game/Tests/Visual/OsuTestScene.cs | 47 ++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 917d12ebb1..3c95b990e1 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -229,10 +229,10 @@ namespace osu.Game.Tests.Visual
             /// </summary>
             public class TrackVirtualManual : Track
             {
-                private readonly StopwatchClock stopwatchClock = new StopwatchClock();
-
                 private readonly IFrameBasedClock referenceClock;
 
+                private bool running;
+
                 public TrackVirtualManual(IFrameBasedClock referenceClock)
                 {
                     this.referenceClock = referenceClock;
@@ -241,32 +241,55 @@ namespace osu.Game.Tests.Visual
 
                 public override bool Seek(double seek)
                 {
-                    var offset = Math.Clamp(seek, 0, Length);
+                    accumulated = Math.Min(seek, Length);
+                    lastReferenceTime = null;
 
-                    stopwatchClock.Seek(offset);
-
-                    return offset == seek;
+                    return accumulated == seek;
                 }
 
-                public override void Start() => stopwatchClock.Start();
+                public override void Start()
+                {
+                    running = true;
+                }
 
                 public override void Reset()
                 {
-                    stopwatchClock.Seek(0);
+                    Seek(0);
                     base.Reset();
                 }
 
-                public override void Stop() => stopwatchClock.Stop();
+                public override void Stop()
+                {
+                    if (running)
+                    {
+                        running = false;
+                        lastReferenceTime = null;
+                    }
+                }
 
-                public override bool IsRunning => stopwatchClock.IsRunning;
+                public override bool IsRunning => running;
 
-                public override double CurrentTime => stopwatchClock.CurrentTime;
+                private double? lastReferenceTime;
+
+                private double accumulated;
+
+                public override double CurrentTime => Math.Min(accumulated, Length);
 
                 protected override void UpdateState()
                 {
                     base.UpdateState();
 
-                    stopwatchClock.Rate = Rate * referenceClock.Rate;
+                    if (running)
+                    {
+                        double refTime = referenceClock.CurrentTime;
+
+                        if (lastReferenceTime.HasValue)
+                            accumulated += (refTime - lastReferenceTime.Value) * Rate;
+
+                        lastReferenceTime = refTime;
+                    }
+
+                    Console.WriteLine($"t={CurrentTime}");
 
                     if (CurrentTime >= Length)
                     {

From ebc86c10754ede8686e06b06682c272ff117b562 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Mar 2020 02:08:49 +0900
Subject: [PATCH 0929/1142] Fix random test failure

---
 osu.Game/Screens/Play/SkipOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/SkipOverlay.cs b/osu.Game/Screens/Play/SkipOverlay.cs
index 3daf5b1ff1..ac7e509c2c 100644
--- a/osu.Game/Screens/Play/SkipOverlay.cs
+++ b/osu.Game/Screens/Play/SkipOverlay.cs
@@ -116,7 +116,7 @@ namespace osu.Game.Screens.Play
         {
             base.Update();
 
-            var progress = Math.Max(0, 1 - (gameplayClock.CurrentTime - displayTime) / (fadeOutBeginTime - displayTime));
+            var progress = fadeOutBeginTime <= displayTime ? 1 : Math.Max(0, 1 - (gameplayClock.CurrentTime - displayTime) / (fadeOutBeginTime - displayTime));
 
             remainingTimeBox.Width = (float)Interpolation.Lerp(remainingTimeBox.Width, progress, Math.Clamp(Time.Elapsed / 40, 0, 1));
 

From c3ad08f230b635f4dcc8582c5ee2028f04cd25c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Mar 2020 02:18:35 +0900
Subject: [PATCH 0930/1142] Remove wild writeline

---
 osu.Game/Tests/Visual/OsuTestScene.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 3c95b990e1..5623435da4 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -289,8 +289,6 @@ namespace osu.Game.Tests.Visual
                         lastReferenceTime = refTime;
                     }
 
-                    Console.WriteLine($"t={CurrentTime}");
-
                     if (CurrentTime >= Length)
                     {
                         Stop();

From bd1dbea6f4b35937777ef3f5b017d2bf787e35e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 5 Mar 2020 23:10:14 +0100
Subject: [PATCH 0931/1142] Centralise background colour updates

---
 .../Profile/Sections/ProfileItemContainer.cs      | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs b/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs
index 1ab9ed3f82..c057ebe12b 100644
--- a/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs
@@ -27,8 +27,7 @@ namespace osu.Game.Overlays.Profile.Sections
             set
             {
                 idleColour = value;
-                if (!IsHovered)
-                    background.Colour = value;
+                fadeBackgroundColour();
             }
         }
 
@@ -40,8 +39,7 @@ namespace osu.Game.Overlays.Profile.Sections
             set
             {
                 hoverColour = value;
-                if (IsHovered)
-                    background.Colour = value;
+                fadeBackgroundColour();
             }
         }
 
@@ -73,14 +71,19 @@ namespace osu.Game.Overlays.Profile.Sections
 
         protected override bool OnHover(HoverEvent e)
         {
-            background.FadeColour(HoverColour, hover_duration, Easing.OutQuint);
+            fadeBackgroundColour(hover_duration);
             return base.OnHover(e);
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
             base.OnHoverLost(e);
-            background.FadeColour(IdleColour, hover_duration, Easing.OutQuint);
+            fadeBackgroundColour(hover_duration);
+        }
+
+        private void fadeBackgroundColour(double fadeDuration = 0)
+        {
+            background.FadeColour(IsHovered ? HoverColour : IdleColour, fadeDuration, Easing.OutQuint);
         }
     }
 }

From 5b0846cb69a2f5aca2da311d179169fc1c0f5deb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Thu, 5 Mar 2020 23:15:53 +0100
Subject: [PATCH 0932/1142] Handle hover explicitly

---
 osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs b/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs
index c057ebe12b..afa6bd9f79 100644
--- a/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/ProfileItemContainer.cs
@@ -72,7 +72,7 @@ namespace osu.Game.Overlays.Profile.Sections
         protected override bool OnHover(HoverEvent e)
         {
             fadeBackgroundColour(hover_duration);
-            return base.OnHover(e);
+            return true;
         }
 
         protected override void OnHoverLost(HoverLostEvent e)

From ac88ba717b7f6589b01950ac915a4801eac4a007 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Mar 2020 16:03:26 +0900
Subject: [PATCH 0933/1142] Ensure screens respect aspect ratio in tests

---
 osu.Game.Tournament/Screens/TournamentScreen.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game.Tournament/Screens/TournamentScreen.cs b/osu.Game.Tournament/Screens/TournamentScreen.cs
index 0b5b3e728b..5da7c7a5d2 100644
--- a/osu.Game.Tournament/Screens/TournamentScreen.cs
+++ b/osu.Game.Tournament/Screens/TournamentScreen.cs
@@ -18,6 +18,9 @@ namespace osu.Game.Tournament.Screens
         protected TournamentScreen()
         {
             RelativeSizeAxes = Axes.Both;
+
+            FillMode = FillMode.Fit;
+            FillAspectRatio = 16 / 9f;
         }
 
         public override void Hide() => this.FadeOut(FADE_DELAY);

From 8ff3370273fb9c857e0117bab3235b6408caf6c7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Mar 2020 16:27:38 +0900
Subject: [PATCH 0934/1142] Add a short load delay for avatars to avoid
 unnecessary fetching

---
 osu.Game/Users/Drawables/UpdateableAvatar.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Users/Drawables/UpdateableAvatar.cs b/osu.Game/Users/Drawables/UpdateableAvatar.cs
index 59fbb5f910..171462f3fc 100644
--- a/osu.Game/Users/Drawables/UpdateableAvatar.cs
+++ b/osu.Game/Users/Drawables/UpdateableAvatar.cs
@@ -43,6 +43,8 @@ namespace osu.Game.Users.Drawables
             set => base.EdgeEffect = value;
         }
 
+        protected override double LoadDelay => 200;
+
         /// <summary>
         /// Whether to show a default guest representation on null user (as opposed to nothing).
         /// </summary>

From 88759e65a0b2702defc8e036561ad2d18fbb02dc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Mar 2020 16:31:36 +0900
Subject: [PATCH 0935/1142] Remove layout durations from tournament editor
 screns for better performance

---
 osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs      | 2 --
 osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs    | 2 --
 osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs       | 2 --
 osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs | 2 --
 4 files changed, 8 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
index 7119533743..8b8078e119 100644
--- a/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/RoundEditorScreen.cs
@@ -129,8 +129,6 @@ namespace osu.Game.Tournament.Screens.Editors
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
                         Direction = FillDirection.Vertical,
-                        LayoutDuration = 200,
-                        LayoutEasing = Easing.OutQuint,
                         ChildrenEnumerable = round.Beatmaps.Select(p => new RoundBeatmapRow(round, p))
                     };
                 }
diff --git a/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs
index e68946aaf2..46bb7b83e3 100644
--- a/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs
@@ -124,8 +124,6 @@ namespace osu.Game.Tournament.Screens.Editors
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
                         Direction = FillDirection.Vertical,
-                        LayoutDuration = 200,
-                        LayoutEasing = Easing.OutQuint,
                         ChildrenEnumerable = round.Beatmaps.Select(p => new SeedingBeatmapRow(round, p))
                     };
                 }
diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index ca8bce1cca..631393c6f4 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -202,8 +202,6 @@ namespace osu.Game.Tournament.Screens.Editors
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
                         Direction = FillDirection.Vertical,
-                        LayoutDuration = 200,
-                        LayoutEasing = Easing.OutQuint,
                         ChildrenEnumerable = team.Players.Select(p => new PlayerRow(team, p))
                     };
                 }
diff --git a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
index 5598910824..e4256e727d 100644
--- a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
@@ -48,8 +48,6 @@ namespace osu.Game.Tournament.Screens.Editors
                         Direction = FillDirection.Vertical,
                         RelativeSizeAxes = Axes.X,
                         AutoSizeAxes = Axes.Y,
-                        LayoutDuration = 200,
-                        LayoutEasing = Easing.OutQuint,
                         Spacing = new Vector2(20)
                     },
                 },

From 40074f10dbd5999dca3f38dc0a6de093c28de463 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Mar 2020 17:55:05 +0900
Subject: [PATCH 0936/1142] Remove unnecessary override

---
 osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
index 9140cccafd..2a8f77210a 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
@@ -32,12 +32,5 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("rewind", () => Player.GameplayClockContainer.Seek(-80000));
             AddUntilStep("key counter reset", () => Player.HUDOverlay.KeyCounter.Children.All(kc => kc.CountPresses == 0));
         }
-
-        protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
-        {
-            var working = base.CreateWorkingBeatmap(beatmap, storyboard);
-
-            return working;
-        }
     }
 }

From 3b0e3cd71a3ae257ec3f21f774c1ba2c63cf8e53 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Mar 2020 17:55:57 +0900
Subject: [PATCH 0937/1142] Remove using statements

---
 osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
index 2a8f77210a..afeda5fb7c 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
@@ -3,10 +3,8 @@
 
 using System.ComponentModel;
 using System.Linq;
-using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Play;
-using osu.Game.Storyboards;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {

From 0ccf691c972f3de8253c357b101e2f5c8ba5e93d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Mar 2020 18:00:07 +0900
Subject: [PATCH 0938/1142] Remove unnecessary interpolation

---
 osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
index 10827bc0b9..227ada70fe 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert($"Check {testKey} counter after keypress", () => testCounter.CountPresses == 1);
             addPressKeyStep();
             AddAssert($"Check {testKey} counter after keypress", () => testCounter.CountPresses == 2);
-            AddStep($"Disable counting", () => testCounter.IsCounting = false);
+            AddStep("Disable counting", () => testCounter.IsCounting = false);
             addPressKeyStep();
             AddAssert($"Check {testKey} count has not changed", () => testCounter.CountPresses == 2);
 

From a59c3d997da57bcfa33e2f3342222ccaa825d674 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Mar 2020 18:00:17 +0900
Subject: [PATCH 0939/1142] Refactor implementation to better match what
 already existed

---
 osu.Game/Screens/Play/Player.cs | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 2d49c707ec..bcadba14af 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -157,10 +157,7 @@ namespace osu.Game.Screens.Play
             addGameplayComponents(GameplayClockContainer, Beatmap.Value);
             addOverlayComponents(GameplayClockContainer, Beatmap.Value);
 
-            DrawableRuleset.HasReplayLoaded.BindValueChanged(e =>
-            {
-                updatePauseOnFocusLostState(e.NewValue, BreakOverlay.IsBreakTime.Value);
-            }, true);
+            DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
 
             // bind clock into components that require it
             DrawableRuleset.IsPaused.BindTo(GameplayClockContainer.IsPaused);
@@ -232,7 +229,11 @@ namespace osu.Game.Screens.Play
                         IsPaused = { BindTarget = GameplayClockContainer.IsPaused }
                     },
                     PlayerSettingsOverlay = { PlaybackSettings = { UserPlaybackRate = { BindTarget = GameplayClockContainer.UserPlaybackRate } } },
-                    KeyCounter = { AlwaysVisible = { BindTarget = DrawableRuleset.HasReplayLoaded }, IsCounting = false },
+                    KeyCounter =
+                    {
+                        AlwaysVisible = { BindTarget = DrawableRuleset.HasReplayLoaded },
+                        IsCounting = false
+                    },
                     RequestSeek = GameplayClockContainer.Seek,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre
@@ -289,16 +290,16 @@ namespace osu.Game.Screens.Play
             HealthProcessor.IsBreakTime.BindTo(BreakOverlay.IsBreakTime);
         }
 
-        private void onBreakTimeChanged(ValueChangedEvent<bool> changeEvent)
+        private void onBreakTimeChanged(ValueChangedEvent<bool> isBreakTime)
         {
-            updatePauseOnFocusLostState(DrawableRuleset.HasReplayLoaded.Value, changeEvent.NewValue);
-            HUDOverlay.KeyCounter.IsCounting = !changeEvent.NewValue;
+            updatePauseOnFocusLostState();
+            HUDOverlay.KeyCounter.IsCounting = !isBreakTime.NewValue;
         }
 
-        private void updatePauseOnFocusLostState(bool replayLoaded, bool isBreakTime) =>
+        private void updatePauseOnFocusLostState() =>
             HUDOverlay.HoldToQuit.PauseOnFocusLost = PauseOnFocusLost
-                                                     && !replayLoaded
-                                                     && !isBreakTime;
+                                                     && !DrawableRuleset.HasReplayLoaded.Value
+                                                     && !BreakOverlay.IsBreakTime.Value;
 
         private IBeatmap loadPlayableBeatmap()
         {

From 2d95f2992534444949ebbf6a66dd53b333a94c9f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Mar 2020 16:06:23 +0900
Subject: [PATCH 0940/1142] Add gameplay screen specific video

---
 osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index 6a3095d42d..c74302a869 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -6,6 +6,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Platform;
 using osu.Framework.Threading;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Tournament.Components;
@@ -19,7 +20,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tournament.Screens.Gameplay
 {
-    public class GameplayScreen : BeatmapInfoScreen
+    public class GameplayScreen : BeatmapInfoScreen, IProvideVideo
     {
         private readonly BindableBool warmup = new BindableBool();
 
@@ -39,12 +40,17 @@ namespace osu.Game.Tournament.Screens.Gameplay
         private TournamentMatchChatDisplay chat { get; set; }
 
         [BackgroundDependencyLoader]
-        private void load(LadderInfo ladder, MatchIPCInfo ipc)
+        private void load(LadderInfo ladder, MatchIPCInfo ipc, Storage storage)
         {
             this.ipc = ipc;
 
             AddRangeInternal(new Drawable[]
             {
+                new TourneyVideo(storage.GetStream("videos/gameplay.m4v"))
+                {
+                    Loop = true,
+                    RelativeSizeAxes = Axes.Both,
+                },
                 new MatchHeader(),
                 new Container
                 {

From 0a72fa69ab70bbb14fa7742e19a6d0075aefa21f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Mar 2020 18:38:29 +0900
Subject: [PATCH 0941/1142] Simplify video creation (and handle fallback
 better)

---
 .../Components/TourneyVideo.cs                | 38 ++++++++++++-------
 .../Screens/Gameplay/GameplayScreen.cs        |  2 +-
 .../Screens/Ladder/LadderScreen.cs            |  2 +-
 .../Screens/Schedule/ScheduleScreen.cs        |  4 +-
 .../Screens/TeamIntro/SeedingScreen.cs        |  2 +-
 .../Screens/TeamIntro/TeamIntroScreen.cs      |  2 +-
 .../Screens/TeamWin/TeamWinScreen.cs          |  4 +-
 osu.Game.Tournament/TournamentSceneManager.cs |  2 +-
 8 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Tournament/Components/TourneyVideo.cs b/osu.Game.Tournament/Components/TourneyVideo.cs
index 206689ca1a..7d2eaff515 100644
--- a/osu.Game.Tournament/Components/TourneyVideo.cs
+++ b/osu.Game.Tournament/Components/TourneyVideo.cs
@@ -1,12 +1,13 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.IO;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Video;
+using osu.Framework.Platform;
 using osu.Framework.Timing;
 using osu.Game.Graphics;
 
@@ -14,21 +15,24 @@ namespace osu.Game.Tournament.Components
 {
     public class TourneyVideo : CompositeDrawable
     {
-        private readonly VideoSprite video;
+        private readonly string filename;
+        private readonly bool drawFallbackGradient;
+        private VideoSprite video;
 
-        private readonly ManualClock manualClock;
+        private ManualClock manualClock;
 
-        public TourneyVideo(Stream stream)
+        public TourneyVideo(string filename, bool drawFallbackGradient = false)
         {
-            if (stream == null)
-            {
-                InternalChild = new Box
-                {
-                    Colour = ColourInfo.GradientVertical(OsuColour.Gray(0.3f), OsuColour.Gray(0.6f)),
-                    RelativeSizeAxes = Axes.Both,
-                };
-            }
-            else
+            this.filename = filename;
+            this.drawFallbackGradient = drawFallbackGradient;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(Storage storage)
+        {
+            var stream = storage.GetStream($@"videos/{filename}.m4v");
+
+            if (stream != null)
             {
                 InternalChild = video = new VideoSprite(stream)
                 {
@@ -37,6 +41,14 @@ namespace osu.Game.Tournament.Components
                     Clock = new FramedClock(manualClock = new ManualClock())
                 };
             }
+            else if (drawFallbackGradient)
+            {
+                InternalChild = new Box
+                {
+                    Colour = ColourInfo.GradientVertical(OsuColour.Gray(0.3f), OsuColour.Gray(0.6f)),
+                    RelativeSizeAxes = Axes.Both,
+                };
+            }
         }
 
         public bool Loop
diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index c74302a869..d632e7c5f3 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Tournament.Screens.Gameplay
 
             AddRangeInternal(new Drawable[]
             {
-                new TourneyVideo(storage.GetStream("videos/gameplay.m4v"))
+                new TourneyVideo("gameplay")
                 {
                     Loop = true,
                     RelativeSizeAxes = Axes.Both,
diff --git a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
index 293f6e0068..7b265ded32 100644
--- a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
+++ b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Tournament.Screens.Ladder
                 RelativeSizeAxes = Axes.Both,
                 Children = new Drawable[]
                 {
-                    new TourneyVideo(storage.GetStream(@"videos/ladder.m4v"))
+                    new TourneyVideo("ladder")
                     {
                         RelativeSizeAxes = Axes.Both,
                         Loop = true,
diff --git a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
index 080570eac4..4c93c04fcf 100644
--- a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
+++ b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
@@ -18,7 +18,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tournament.Screens.Schedule
 {
-    public class ScheduleScreen : TournamentScreen, IProvideVideo
+    public class ScheduleScreen : TournamentScreen
     {
         private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
         private Container mainContainer;
@@ -33,7 +33,7 @@ namespace osu.Game.Tournament.Screens.Schedule
 
             InternalChildren = new Drawable[]
             {
-                new TourneyVideo(storage.GetStream(@"videos/schedule.m4v"))
+                new TourneyVideo("schedule")
                 {
                     RelativeSizeAxes = Axes.Both,
                     Loop = true,
diff --git a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
index db5363c155..513d84b594 100644
--- a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
 
             InternalChildren = new Drawable[]
             {
-                new TourneyVideo(storage.GetStream(@"videos/seeding.m4v"))
+                new TourneyVideo("seeding")
                 {
                     RelativeSizeAxes = Axes.Both,
                     Loop = true,
diff --git a/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
index 6559113f55..d584c21058 100644
--- a/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
 
             InternalChildren = new Drawable[]
             {
-                new TourneyVideo(storage.GetStream(@"videos/teamintro.m4v"))
+                new TourneyVideo("teamintro")
                 {
                     RelativeSizeAxes = Axes.Both,
                     Loop = true,
diff --git a/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs b/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
index 30b86f8421..1765ab7ba2 100644
--- a/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
@@ -31,13 +31,13 @@ namespace osu.Game.Tournament.Screens.TeamWin
 
             InternalChildren = new Drawable[]
             {
-                blueWinVideo = new TourneyVideo(storage.GetStream(@"videos/teamwin-blue.m4v"))
+                blueWinVideo = new TourneyVideo("teamwin-blue")
                 {
                     Alpha = 1,
                     RelativeSizeAxes = Axes.Both,
                     Loop = true,
                 },
-                redWinVideo = new TourneyVideo(storage.GetStream(@"videos/teamwin-red.m4v"))
+                redWinVideo = new TourneyVideo("teamwin-red")
                 {
                     Alpha = 0,
                     RelativeSizeAxes = Axes.Both,
diff --git a/osu.Game.Tournament/TournamentSceneManager.cs b/osu.Game.Tournament/TournamentSceneManager.cs
index 9f5f2b6827..287e25b1fb 100644
--- a/osu.Game.Tournament/TournamentSceneManager.cs
+++ b/osu.Game.Tournament/TournamentSceneManager.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Tournament
                     //Masking = true,
                     Children = new Drawable[]
                     {
-                        video = new TourneyVideo(storage.GetStream("videos/main.m4v"))
+                        video = new TourneyVideo("main", true)
                         {
                             Loop = true,
                             RelativeSizeAxes = Axes.Both,

From 16cc49daa00d3c4af18130162ccee7f74a1bf098 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Mar 2020 18:47:31 +0900
Subject: [PATCH 0942/1142] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 1c4a6ffe75..97f7a7edb1 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.304.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.302.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.305.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 4d59b709aa..855bda3679 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.304.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.302.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.305.0" />
     <PackageReference Include="Sentry" Version="2.1.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 6897d3e625..e2c4c09047 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.304.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.302.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.305.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
@@ -79,7 +79,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.302.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.305.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 3295f8657ac3d74a95c10016273068fbbdedde26 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Mar 2020 22:44:11 +0900
Subject: [PATCH 0943/1142] Restore clamp behaviour

---
 osu.Game/Tests/Visual/OsuTestScene.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 5623435da4..d1d8059cb1 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -241,7 +241,7 @@ namespace osu.Game.Tests.Visual
 
                 public override bool Seek(double seek)
                 {
-                    accumulated = Math.Min(seek, Length);
+                    accumulated = Math.Clamp(seek, 0, Length);
                     lastReferenceTime = null;
 
                     return accumulated == seek;

From 491840b17d215cd983dca0badaac0a502e6d0d19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 6 Mar 2020 21:10:23 +0100
Subject: [PATCH 0944/1142] Add failing tests

---
 .../TestSceneHitCircleArea.cs                 | 108 ++++++++++++++++++
 1 file changed, 108 insertions(+)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
new file mode 100644
index 0000000000..06eccdafdb
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
@@ -0,0 +1,108 @@
+// 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 NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Skinning;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    public class TestSceneHitCircleArea : ManualInputManagerTestScene
+    {
+        private HitCircle hitCircle;
+        private DrawableHitCircle drawableHitCircle;
+        private DrawableHitCircle.HitReceptor hitAreaReceptor => drawableHitCircle.HitArea;
+
+        [SetUp]
+        public new void SetUp()
+        {
+            base.SetUp();
+
+            Schedule(() =>
+            {
+                hitCircle = new HitCircle
+                {
+                    Position = new Vector2(100, 100),
+                    StartTime = Time.Current + 500
+                };
+
+                hitCircle.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
+                Child = new SkinProvidingContainer(new DefaultSkin())
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = drawableHitCircle = new DrawableHitCircle(hitCircle)
+                    {
+                        Size = new Vector2(100)
+                    }
+                };
+            });
+        }
+
+        [Test]
+        public void TestCircleHitCentre()
+        {
+            AddStep("move mouse to centre", () => InputManager.MoveMouseTo(hitAreaReceptor.ScreenSpaceDrawQuad.Centre));
+            scheduleHit();
+
+            AddAssert("hit registered", () => hitAreaReceptor.HitAction == OsuAction.LeftButton);
+        }
+
+        [Test]
+        public void TestCircleHitLeftEdge()
+        {
+            AddStep("move mouse to left edge", () =>
+            {
+                var drawQuad = hitAreaReceptor.ScreenSpaceDrawQuad;
+                var mousePosition = new Vector2(drawQuad.TopLeft.X, drawQuad.Centre.Y);
+
+                InputManager.MoveMouseTo(mousePosition);
+            });
+            scheduleHit();
+
+            AddAssert("hit registered", () => hitAreaReceptor.HitAction == OsuAction.LeftButton);
+        }
+
+        [Test]
+        public void TestCircleHitTopLeftEdge()
+        {
+            AddStep("move mouse to top left circle edge", () =>
+            {
+                var drawQuad = hitAreaReceptor.ScreenSpaceDrawQuad;
+                // sqrt(2) / 2 = sin(45deg) = cos(45deg)
+                // draw width halved to get radius
+                // 0.95f taken for leniency
+                float correction = 0.95f * (float)Math.Sqrt(2) / 2 * (drawQuad.Width / 2);
+                var mousePosition = new Vector2(drawQuad.Centre.X - correction, drawQuad.Centre.Y - correction);
+
+                InputManager.MoveMouseTo(mousePosition);
+            });
+            scheduleHit();
+
+            AddAssert("hit registered", () => hitAreaReceptor.HitAction == OsuAction.LeftButton);
+        }
+
+        [Test]
+        public void TestCircleMissBoundingBoxCorner()
+        {
+            AddStep("move mouse to top left corner of bounding box", () => InputManager.MoveMouseTo(hitAreaReceptor.ScreenSpaceDrawQuad.TopLeft));
+            scheduleHit();
+
+            AddAssert("hit not registered", () => hitAreaReceptor.HitAction == null);
+        }
+
+        private void scheduleHit() => AddStep("schedule action", () =>
+        {
+            var delay = hitCircle.StartTime - hitCircle.HitWindows.WindowFor(HitResult.Great) - Time.Current;
+            Scheduler.AddDelayed(() => hitAreaReceptor.OnPressed(OsuAction.LeftButton), delay);
+        });
+    }
+}

From 77fd7480352b3dbc834fe7fa85b01d17491466c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 6 Mar 2020 21:21:20 +0100
Subject: [PATCH 0945/1142] Fix incorrect circle piece hitbox

Hitboxes of circle pieces in osu! have regressed with commit 8592335.
The reason for the regression was that hit detection was moved from
DrawableHitCircle itself to a newly-introduced private HitArea class
(now named HitReceptor).

As HitArea inherited from Drawable, it would return IsHovered == true
over its entire bounding box. This meant that the hit area could wrongly
pick up actions that are not within circle radius and make them into
hits.

To resolve, make HitReceptor a CompositeDrawable and set its corner
radius to match the circle piece. This fixes the invalid hitbox, as
IsHovered takes radius into account.
---
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index 4ef63bb2a0..da1e666aba 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -170,7 +170,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         public Drawable ProxiedLayer => ApproachCircle;
 
-        public class HitReceptor : Drawable, IKeyBindingHandler<OsuAction>
+        public class HitReceptor : CompositeDrawable, IKeyBindingHandler<OsuAction>
         {
             // IsHovered is used
             public override bool HandlePositionalInput => true;
@@ -185,6 +185,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
                 Anchor = Anchor.Centre;
                 Origin = Anchor.Centre;
+
+                CornerRadius = OsuHitObject.OBJECT_RADIUS;
+                CornerExponent = 2;
             }
 
             public bool OnPressed(OsuAction action)

From b60876455481d8dd756d938fe07865628b872128 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 6 Mar 2020 22:09:02 +0100
Subject: [PATCH 0946/1142] Cover area just outside circle in test

---
 osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
index 06eccdafdb..67b6dac787 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneHitCircleArea.cs
@@ -71,23 +71,23 @@ namespace osu.Game.Rulesets.Osu.Tests
             AddAssert("hit registered", () => hitAreaReceptor.HitAction == OsuAction.LeftButton);
         }
 
-        [Test]
-        public void TestCircleHitTopLeftEdge()
+        [TestCase(0.95f, OsuAction.LeftButton)]
+        [TestCase(1.05f, null)]
+        public void TestHitsCloseToEdge(float relativeDistanceFromCentre, OsuAction? expectedAction)
         {
             AddStep("move mouse to top left circle edge", () =>
             {
                 var drawQuad = hitAreaReceptor.ScreenSpaceDrawQuad;
                 // sqrt(2) / 2 = sin(45deg) = cos(45deg)
                 // draw width halved to get radius
-                // 0.95f taken for leniency
-                float correction = 0.95f * (float)Math.Sqrt(2) / 2 * (drawQuad.Width / 2);
+                float correction = relativeDistanceFromCentre * (float)Math.Sqrt(2) / 2 * (drawQuad.Width / 2);
                 var mousePosition = new Vector2(drawQuad.Centre.X - correction, drawQuad.Centre.Y - correction);
 
                 InputManager.MoveMouseTo(mousePosition);
             });
             scheduleHit();
 
-            AddAssert("hit registered", () => hitAreaReceptor.HitAction == OsuAction.LeftButton);
+            AddAssert($"hit {(expectedAction == null ? "not " : string.Empty)}registered", () => hitAreaReceptor.HitAction == expectedAction);
         }
 
         [Test]

From e886c155e60d103dcc232bc210d0eb7017f6664f Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 7 Mar 2020 04:05:17 +0300
Subject: [PATCH 0947/1142] Adjust text size values

---
 osu.Game/Users/UserPanel.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index a900a55dab..5676113aad 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -129,7 +129,7 @@ namespace osu.Game.Users
 
         protected OsuSpriteText CreateUsername() => new OsuSpriteText
         {
-            Font = OsuFont.GetFont(size: 20, weight: FontWeight.Bold, italics: true),
+            Font = OsuFont.GetFont(size: 16, weight: FontWeight.Bold),
             Shadow = false,
             Text = User.Username,
         };
@@ -150,7 +150,7 @@ namespace osu.Game.Users
 
             var alignment = rightAlignedChildren ? Anchor.CentreRight : Anchor.CentreLeft;
 
-            statusContainer.Add(lastVisitMessage = new TextFlowContainer(t => t.Font = OsuFont.GetFont(size: 15, weight: FontWeight.SemiBold)).With(text =>
+            statusContainer.Add(lastVisitMessage = new TextFlowContainer(t => t.Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold)).With(text =>
             {
                 text.Anchor = alignment;
                 text.Origin = alignment;
@@ -171,7 +171,7 @@ namespace osu.Game.Users
             {
                 Anchor = alignment,
                 Origin = alignment,
-                Font = OsuFont.GetFont(size: 17, weight: FontWeight.SemiBold)
+                Font = OsuFont.GetFont(size: 14, weight: FontWeight.SemiBold)
             });
 
             return statusContainer;

From 9f44a7b2ce404a7f4c363a7643e779896691924d Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 8 Mar 2020 03:07:14 +0300
Subject: [PATCH 0948/1142] Simplify status assignment in the test scene

---
 osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
index f02a570f4f..ccae778745 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
@@ -25,6 +25,7 @@ namespace osu.Game.Tests.Visual.Online
         };
 
         private readonly Bindable<UserActivity> activity = new Bindable<UserActivity>();
+        private readonly Bindable<UserStatus> status = new Bindable<UserStatus>();
 
         private UserGridPanel peppy;
         private UserListPanel evast;
@@ -76,20 +77,20 @@ namespace osu.Game.Tests.Visual.Online
 
             flyte.Status.Value = new UserStatusOnline();
 
-            peppy.Status.Value = null;
+            peppy.Status.BindTo(status);
             peppy.Activity.BindTo(activity);
 
-            evast.Status.Value = null;
+            evast.Status.BindTo(status);
             evast.Activity.BindTo(activity);
         });
 
         [Test]
         public void TestUserStatus()
         {
-            AddStep("online", () => peppy.Status.Value = evast.Status.Value = new UserStatusOnline());
-            AddStep("do not disturb", () => peppy.Status.Value = evast.Status.Value = new UserStatusDoNotDisturb());
-            AddStep("offline", () => peppy.Status.Value = evast.Status.Value = new UserStatusOffline());
-            AddStep("null status", () => peppy.Status.Value = evast.Status.Value = null);
+            AddStep("online", () => status.Value = new UserStatusOnline());
+            AddStep("do not disturb", () => status.Value = new UserStatusDoNotDisturb());
+            AddStep("offline", () => status.Value = new UserStatusOffline());
+            AddStep("null status", () => status.Value = null);
         }
 
         [Test]

From 3caffb81e187e2d546fba85640791004d12e3ad5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Mar 2020 16:03:18 +0900
Subject: [PATCH 0949/1142] Add new element colours to TournamentGame

---
 osu.Game.Tournament/TournamentGame.cs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index 608fc5f04a..6d597d5e7d 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.cs
@@ -2,15 +2,25 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Game.Graphics;
 using osu.Game.Graphics.Cursor;
+using osu.Game.Tournament.Models;
 using osuTK.Graphics;
 
 namespace osu.Game.Tournament
 {
     public class TournamentGame : TournamentGameBase
     {
-        public static readonly Color4 COLOUR_RED = new Color4(144, 0, 0, 255);
-        public static readonly Color4 COLOUR_BLUE = new Color4(0, 84, 144, 255);
+        public static ColourInfo GetTeamColour(TeamColour teamColour) => teamColour == TeamColour.Red ? COLOUR_RED : COLOUR_BLUE;
+
+        public static readonly Color4 COLOUR_RED = OsuColour.FromHex("#AA1414");
+        public static readonly Color4 COLOUR_BLUE = OsuColour.FromHex("#1462AA");
+
+        public static readonly Color4 ELEMENT_BACKGROUND_COLOUR = OsuColour.FromHex("#fff");
+        public static readonly Color4 ELEMENT_FOREGROUND_COLOUR = OsuColour.FromHex("#000");
+
+        public static readonly Color4 TEXT_COLOUR = OsuColour.FromHex("#fff");
 
         protected override void LoadComplete()
         {

From 129c8fe24ff86054d5875650d47acf5da098307d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Mar 2020 16:03:34 +0900
Subject: [PATCH 0950/1142] Add helper method to get winning team colour

---
 osu.Game.Tournament/Models/TournamentMatch.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tournament/Models/TournamentMatch.cs b/osu.Game.Tournament/Models/TournamentMatch.cs
index 06cce3d59e..8ebcbf4e15 100644
--- a/osu.Game.Tournament/Models/TournamentMatch.cs
+++ b/osu.Game.Tournament/Models/TournamentMatch.cs
@@ -90,6 +90,8 @@ namespace osu.Game.Tournament.Models
         [JsonIgnore]
         public TournamentTeam Loser => !Completed.Value ? null : Team1Score.Value > Team2Score.Value ? Team2.Value : Team1.Value;
 
+        public TeamColour WinnerColour => Winner == Team1.Value ? TeamColour.Red : TeamColour.Blue;
+
         public int PointsToWin => Round.Value?.BestOf.Value / 2 + 1 ?? 0;
 
         /// <summary>

From aeb6bf5b4619e139526600b5f2fd78ca5f72bfd4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Mar 2020 16:36:07 +0900
Subject: [PATCH 0951/1142] Remove unnecessary width specification on editor
 screens

---
 osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
index e4256e727d..8e5df72cc8 100644
--- a/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TournamentEditorScreen.cs
@@ -40,7 +40,6 @@ namespace osu.Game.Tournament.Screens.Editors
                 new OsuScrollContainer
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Width = 0.9f,
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
                     Child = flow = new FillFlowContainer<TDrawable>

From 01e32896eebdbdaf880610b888993ce9f061e81e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Mar 2020 17:43:47 +0900
Subject: [PATCH 0952/1142] Make save changes button more prominent

---
 osu.Game.Tournament/TournamentGameBase.cs | 37 +++++++++++++++++++----
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 435f315c8d..41165ca141 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -22,6 +22,7 @@ using osu.Game.Online.API.Requests;
 using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Models;
 using osu.Game.Users;
+using osuTK;
 using osuTK.Graphics;
 using osuTK.Input;
 
@@ -74,16 +75,40 @@ namespace osu.Game.Tournament
 
             AddRange(new[]
             {
-                new TourneyButton
+                new Container
                 {
-                    Text = "Save Changes",
-                    Width = 140,
-                    Height = 50,
+                    CornerRadius = 10,
                     Depth = float.MinValue,
+                    Position = new Vector2(5),
+                    Masking = true,
+                    AutoSizeAxes = Axes.Both,
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,
-                    Padding = new MarginPadding(10),
-                    Action = SaveChanges,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Colour = OsuColour.Gray(0.2f),
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        new TourneyButton
+                        {
+                            Text = "Save Changes",
+                            Width = 140,
+                            Height = 50,
+                            Padding = new MarginPadding
+                            {
+                                Top = 10,
+                                Left = 10,
+                            },
+                            Margin = new MarginPadding
+                            {
+                                Right = 10,
+                                Bottom = 10,
+                            },
+                            Action = SaveChanges,
+                        },
+                    }
                 },
                 heightWarning = new Container
                 {

From aed52179f0ffaea6be4e15775857370201ee5fd9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 7 Mar 2020 16:29:11 +0900
Subject: [PATCH 0953/1142] Fix weird reverse logic

---
 osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs | 6 +++---
 osu.Game/Online/Chat/StandAloneChatDisplay.cs          | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index d632e7c5f3..6ba57c60b8 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -162,7 +162,7 @@ namespace osu.Game.Tournament.Screens.Gameplay
 
                 void expand()
                 {
-                    chat?.Expand();
+                    chat?.Contract();
 
                     using (BeginDelayedSequence(300, true))
                     {
@@ -176,7 +176,7 @@ namespace osu.Game.Tournament.Screens.Gameplay
                     SongBar.Expanded = false;
                     scoreDisplay.FadeOut(100);
                     using (chat?.BeginDelayedSequence(500))
-                        chat?.Contract();
+                        chat?.Expand();
                 }
 
                 switch (state.NewValue)
@@ -203,7 +203,7 @@ namespace osu.Game.Tournament.Screens.Gameplay
                         break;
 
                     default:
-                        chat.Expand();
+                        chat.Contract();
                         expand();
                         break;
                 }
diff --git a/osu.Game/Online/Chat/StandAloneChatDisplay.cs b/osu.Game/Online/Chat/StandAloneChatDisplay.cs
index 21d0bcc4bf..881dd19d8e 100644
--- a/osu.Game/Online/Chat/StandAloneChatDisplay.cs
+++ b/osu.Game/Online/Chat/StandAloneChatDisplay.cs
@@ -92,13 +92,13 @@ namespace osu.Game.Online.Chat
             textbox.Text = string.Empty;
         }
 
-        public void Contract()
+        public void Expand()
         {
             this.FadeIn(300);
             this.MoveToY(0, 500, Easing.OutQuint);
         }
 
-        public void Expand()
+        public void Contract()
         {
             this.FadeOut(200);
             this.MoveToY(100, 500, Easing.In);

From 1c5d6e0cf453eea4323ac204150b0811cd770057 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Mar 2020 16:07:54 +0900
Subject: [PATCH 0954/1142] Split out nested classes to higher level for better
 code sharing

---
 .../TestSceneDrawableTournamentTeam.cs        | 124 ++++++++++
 .../Components/DrawableTeamFlag.cs            |  33 +++
 .../Components/DrawableTeamHeader.cs          |  20 ++
 .../Components/DrawableTeamTitle.cs           |  32 +++
 .../Components/DrawableTeamTitleWithHeader.cs |  30 +++
 .../Components/DrawableTeamWithPlayers.cs     |  71 ++++++
 .../Components/DrawableTournamentTeam.cs      |   6 +-
 .../Components/DrawableTournamentTitleText.cs |  16 ++
 .../Components/RoundDisplay.cs                |  36 +++
 .../TournamentSpriteTextWithBackground.cs     |  37 +++
 .../Screens/Drawings/Components/Group.cs      |  49 ----
 .../Screens/Drawings/Components/GroupTeam.cs  |  60 +++++
 .../Screens/Editors/TeamEditorScreen.cs       |  13 -
 .../Gameplay/Components/MatchHeader.cs        | 228 +++++-------------
 .../Gameplay/Components/RoundDisplay.cs       |  56 +++++
 .../Gameplay/Components/TeamDisplay.cs        |  50 ++++
 .../Screens/Gameplay/Components/TeamScore.cs  |  38 +++
 17 files changed, 662 insertions(+), 237 deletions(-)
 create mode 100644 osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs
 create mode 100644 osu.Game.Tournament/Components/DrawableTeamFlag.cs
 create mode 100644 osu.Game.Tournament/Components/DrawableTeamHeader.cs
 create mode 100644 osu.Game.Tournament/Components/DrawableTeamTitle.cs
 create mode 100644 osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs
 create mode 100644 osu.Game.Tournament/Components/DrawableTeamWithPlayers.cs
 create mode 100644 osu.Game.Tournament/Components/DrawableTournamentTitleText.cs
 create mode 100644 osu.Game.Tournament/Components/RoundDisplay.cs
 create mode 100644 osu.Game.Tournament/Components/TournamentSpriteTextWithBackground.cs
 create mode 100644 osu.Game.Tournament/Screens/Drawings/Components/GroupTeam.cs
 create mode 100644 osu.Game.Tournament/Screens/Gameplay/Components/RoundDisplay.cs
 create mode 100644 osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
 create mode 100644 osu.Game.Tournament/Screens/Gameplay/Components/TeamScore.cs

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs
new file mode 100644
index 0000000000..41f7d3d847
--- /dev/null
+++ b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs
@@ -0,0 +1,124 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using osu.Framework.Graphics;
+using osu.Game.Tests.Visual;
+using osu.Game.Tournament.Components;
+using osu.Game.Tournament.Models;
+using osu.Game.Tournament.Screens.Drawings.Components;
+using osu.Game.Tournament.Screens.Gameplay.Components;
+using osu.Game.Tournament.Screens.Ladder.Components;
+using osu.Game.Users;
+
+namespace osu.Game.Tournament.Tests.Components
+{
+    public class TestSceneDrawableTournamentTeam : OsuGridTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(DrawableTeamFlag),
+            typeof(DrawableTeamTitle),
+            typeof(DrawableTeamTitleWithHeader),
+            typeof(DrawableMatchTeam),
+            typeof(DrawableTeamWithPlayers),
+            typeof(GroupTeam),
+            typeof(TeamDisplay),
+        };
+
+        public TestSceneDrawableTournamentTeam()
+            : base(4, 3)
+        {
+            var team = new TournamentTeam
+            {
+                FlagName = { Value = "AU" },
+                FullName = { Value = "Australia" },
+                Players =
+                {
+                    new User { Username = "ASecretBox" },
+                    new User { Username = "Dereban" },
+                    new User { Username = "mReKk" },
+                    new User { Username = "uyghti" },
+                    new User { Username = "Parkes" },
+                    new User { Username = "Shiroha" },
+                    new User { Username = "Jordan The Bear" },
+                }
+            };
+
+            var match = new TournamentMatch { Team1 = { Value = team } };
+
+            int i = 0;
+
+            Cell(i++).AddRange(new Drawable[]
+            {
+                new TournamentSpriteText { Text = "DrawableTeamFlag" },
+                new DrawableTeamFlag(team)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                }
+            });
+
+            Cell(i++).AddRange(new Drawable[]
+            {
+                new TournamentSpriteText { Text = "DrawableTeamTitle" },
+                new DrawableTeamTitle(team)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                }
+            });
+
+            Cell(i++).AddRange(new Drawable[]
+            {
+                new TournamentSpriteText { Text = "DrawableTeamTitleWithHeader" },
+                new DrawableTeamTitleWithHeader(team, TeamColour.Red)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                }
+            });
+
+            Cell(i++).AddRange(new Drawable[]
+            {
+                new TournamentSpriteText { Text = "DrawableMatchTeam" },
+                new DrawableMatchTeam(team, match, false)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                }
+            });
+
+            Cell(i++).AddRange(new Drawable[]
+            {
+                new TournamentSpriteText { Text = "TeamWithPlayers" },
+                new DrawableTeamWithPlayers(team, TeamColour.Blue)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                }
+            });
+
+            Cell(i++).AddRange(new Drawable[]
+            {
+                new TournamentSpriteText { Text = "GroupTeam" },
+                new GroupTeam(team)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                }
+            });
+
+            Cell(i).AddRange(new Drawable[]
+            {
+                new TournamentSpriteText { Text = "TeamDisplay" },
+                new TeamDisplay(team, TournamentGame.COLOUR_RED, false)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                }
+            });
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Components/DrawableTeamFlag.cs b/osu.Game.Tournament/Components/DrawableTeamFlag.cs
new file mode 100644
index 0000000000..8c85c9a46f
--- /dev/null
+++ b/osu.Game.Tournament/Components/DrawableTeamFlag.cs
@@ -0,0 +1,33 @@
+// 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 JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Tournament.Models;
+
+namespace osu.Game.Tournament.Components
+{
+    public class DrawableTeamFlag : Sprite
+    {
+        private readonly TournamentTeam team;
+
+        [UsedImplicitly]
+        private Bindable<string> flag;
+
+        public DrawableTeamFlag(TournamentTeam team)
+        {
+            this.team = team;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            if (team == null) return;
+
+            (flag = team.FlagName.GetBoundCopy()).BindValueChanged(acronym => Texture = textures.Get($@"Flags/{team.FlagName}"), true);
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Components/DrawableTeamHeader.cs b/osu.Game.Tournament/Components/DrawableTeamHeader.cs
new file mode 100644
index 0000000000..3d9e8a6e00
--- /dev/null
+++ b/osu.Game.Tournament/Components/DrawableTeamHeader.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.Game.Tournament.Models;
+using osuTK;
+
+namespace osu.Game.Tournament.Components
+{
+    public class DrawableTeamHeader : TournamentSpriteTextWithBackground
+    {
+        public DrawableTeamHeader(TeamColour colour)
+        {
+            Background.Colour = TournamentGame.GetTeamColour(colour);
+
+            Text.Colour = TournamentGame.TEXT_COLOUR;
+            Text.Text = $"Team {colour}".ToUpperInvariant();
+            Text.Scale = new Vector2(0.6f);
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Components/DrawableTeamTitle.cs b/osu.Game.Tournament/Components/DrawableTeamTitle.cs
new file mode 100644
index 0000000000..5aac37259f
--- /dev/null
+++ b/osu.Game.Tournament/Components/DrawableTeamTitle.cs
@@ -0,0 +1,32 @@
+// 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 JetBrains.Annotations;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Tournament.Models;
+
+namespace osu.Game.Tournament.Components
+{
+    public class DrawableTeamTitle : TournamentSpriteTextWithBackground
+    {
+        private readonly TournamentTeam team;
+
+        [UsedImplicitly]
+        private Bindable<string> acronym;
+
+        public DrawableTeamTitle(TournamentTeam team)
+        {
+            this.team = team;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            if (team == null) return;
+
+            (acronym = team.Acronym.GetBoundCopy()).BindValueChanged(acronym => Text.Text = team?.FullName.Value ?? string.Empty, true);
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs b/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs
new file mode 100644
index 0000000000..ceffe3d315
--- /dev/null
+++ b/osu.Game.Tournament/Components/DrawableTeamTitleWithHeader.cs
@@ -0,0 +1,30 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Tournament.Models;
+using osuTK;
+
+namespace osu.Game.Tournament.Components
+{
+    public class DrawableTeamTitleWithHeader : CompositeDrawable
+    {
+        public DrawableTeamTitleWithHeader(TournamentTeam team, TeamColour colour)
+        {
+            AutoSizeAxes = Axes.Both;
+
+            InternalChild = new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(0, 10),
+                Children = new Drawable[]
+                {
+                    new DrawableTeamHeader(colour),
+                    new DrawableTeamTitle(team),
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Components/DrawableTeamWithPlayers.cs b/osu.Game.Tournament/Components/DrawableTeamWithPlayers.cs
new file mode 100644
index 0000000000..0b80bef903
--- /dev/null
+++ b/osu.Game.Tournament/Components/DrawableTeamWithPlayers.cs
@@ -0,0 +1,71 @@
+// 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.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Tournament.Models;
+using osu.Game.Users;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Tournament.Components
+{
+    public class DrawableTeamWithPlayers : CompositeDrawable
+    {
+        public DrawableTeamWithPlayers(TournamentTeam team, TeamColour colour)
+        {
+            AutoSizeAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
+            {
+                new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(30),
+                    Children = new Drawable[]
+                    {
+                        new DrawableTeamTitleWithHeader(team, colour),
+                        new FillFlowContainer
+                        {
+                            AutoSizeAxes = Axes.Both,
+                            Direction = FillDirection.Horizontal,
+                            Padding = new MarginPadding { Left = 10 },
+                            Spacing = new Vector2(30),
+                            Children = new Drawable[]
+                            {
+                                new FillFlowContainer
+                                {
+                                    Direction = FillDirection.Vertical,
+                                    AutoSizeAxes = Axes.Both,
+                                    ChildrenEnumerable = team?.Players.Select(createPlayerText).Take(5) ?? Enumerable.Empty<Drawable>()
+                                },
+                                new FillFlowContainer
+                                {
+                                    Direction = FillDirection.Vertical,
+                                    AutoSizeAxes = Axes.Both,
+                                    ChildrenEnumerable = team?.Players.Select(p => new TournamentSpriteText
+                                    {
+                                        Text = p.Username,
+                                        Font = OsuFont.Torus.With(size: 24, weight: FontWeight.SemiBold),
+                                        Colour = Color4.White,
+                                    }).Skip(5) ?? Enumerable.Empty<Drawable>()
+                                },
+                            }
+                        },
+                    }
+                },
+            };
+
+            TournamentSpriteText createPlayerText(User p) =>
+                new TournamentSpriteText
+                {
+                    Text = p.Username,
+                    Font = OsuFont.Torus.With(size: 24, weight: FontWeight.SemiBold),
+                    Colour = Color4.White,
+                };
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Components/DrawableTournamentTeam.cs b/osu.Game.Tournament/Components/DrawableTournamentTeam.cs
index 99116d4a17..f8aed26ce1 100644
--- a/osu.Game.Tournament/Components/DrawableTournamentTeam.cs
+++ b/osu.Game.Tournament/Components/DrawableTournamentTeam.cs
@@ -23,14 +23,11 @@ namespace osu.Game.Tournament.Components
         [UsedImplicitly]
         private Bindable<string> acronym;
 
-        [UsedImplicitly]
-        private Bindable<string> flag;
-
         protected DrawableTournamentTeam(TournamentTeam team)
         {
             Team = team;
 
-            Flag = new Sprite
+            Flag = new DrawableTeamFlag(team)
             {
                 RelativeSizeAxes = Axes.Both,
                 FillMode = FillMode.Fit
@@ -48,7 +45,6 @@ namespace osu.Game.Tournament.Components
             if (Team == null) return;
 
             (acronym = Team.Acronym.GetBoundCopy()).BindValueChanged(acronym => AcronymText.Text = Team?.Acronym.Value?.ToUpperInvariant() ?? string.Empty, true);
-            (flag = Team.FlagName.GetBoundCopy()).BindValueChanged(acronym => Flag.Texture = textures.Get($@"Flags/{Team.FlagName}"), true);
         }
     }
 }
diff --git a/osu.Game.Tournament/Components/DrawableTournamentTitleText.cs b/osu.Game.Tournament/Components/DrawableTournamentTitleText.cs
new file mode 100644
index 0000000000..4fbc6cd060
--- /dev/null
+++ b/osu.Game.Tournament/Components/DrawableTournamentTitleText.cs
@@ -0,0 +1,16 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Graphics;
+
+namespace osu.Game.Tournament.Components
+{
+    public class DrawableTournamentTitleText : TournamentSpriteText
+    {
+        public DrawableTournamentTitleText()
+        {
+            Text = "osu!taiko world cup 2020";
+            Font = OsuFont.Torus.With(size: 26, weight: FontWeight.SemiBold);
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Components/RoundDisplay.cs b/osu.Game.Tournament/Components/RoundDisplay.cs
new file mode 100644
index 0000000000..dd56c83c57
--- /dev/null
+++ b/osu.Game.Tournament/Components/RoundDisplay.cs
@@ -0,0 +1,36 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Tournament.Models;
+
+namespace osu.Game.Tournament.Components
+{
+    public class RoundDisplay : CompositeDrawable
+    {
+        public RoundDisplay(TournamentMatch match)
+        {
+            AutoSizeAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
+            {
+                new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
+                    {
+                        new DrawableTournamentTitleText(),
+                        new TournamentSpriteText
+                        {
+                            Text = match.Round.Value?.Name.Value ?? "Unknown Round",
+                            Font = OsuFont.Torus.With(size: 26, weight: FontWeight.SemiBold)
+                        },
+                    }
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Components/TournamentSpriteTextWithBackground.cs b/osu.Game.Tournament/Components/TournamentSpriteTextWithBackground.cs
new file mode 100644
index 0000000000..d92b9eb605
--- /dev/null
+++ b/osu.Game.Tournament/Components/TournamentSpriteTextWithBackground.cs
@@ -0,0 +1,37 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+
+namespace osu.Game.Tournament.Components
+{
+    public class TournamentSpriteTextWithBackground : CompositeDrawable
+    {
+        protected readonly TournamentSpriteText Text;
+        protected readonly Box Background;
+
+        public TournamentSpriteTextWithBackground(string text = "")
+        {
+            AutoSizeAxes = Axes.Both;
+
+            InternalChildren = new Drawable[]
+            {
+                Background = new Box
+                {
+                    Colour = TournamentGame.ELEMENT_BACKGROUND_COLOUR,
+                    RelativeSizeAxes = Axes.Both,
+                },
+                Text = new TournamentSpriteText
+                {
+                    Colour = TournamentGame.ELEMENT_FOREGROUND_COLOUR,
+                    Font = OsuFont.Torus.With(weight: FontWeight.SemiBold, size: 50),
+                    Padding = new MarginPadding { Left = 10, Right = 20 },
+                    Text = text
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Screens/Drawings/Components/Group.cs b/osu.Game.Tournament/Screens/Drawings/Components/Group.cs
index 4126f2db65..ece1c431e2 100644
--- a/osu.Game.Tournament/Screens/Drawings/Components/Group.cs
+++ b/osu.Game.Tournament/Screens/Drawings/Components/Group.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
-using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
 using osuTK;
 using osuTK.Graphics;
@@ -116,53 +115,5 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
                 sb.AppendLine(gt.Team.FullName.Value);
             return sb.ToString();
         }
-
-        private class GroupTeam : DrawableTournamentTeam
-        {
-            private readonly FillFlowContainer innerContainer;
-
-            public GroupTeam(TournamentTeam team)
-                : base(team)
-            {
-                Width = 36;
-                AutoSizeAxes = Axes.Y;
-
-                Flag.Anchor = Anchor.TopCentre;
-                Flag.Origin = Anchor.TopCentre;
-
-                AcronymText.Anchor = Anchor.TopCentre;
-                AcronymText.Origin = Anchor.TopCentre;
-                AcronymText.Text = team.Acronym.Value.ToUpperInvariant();
-                AcronymText.Font = OsuFont.Torus.With(weight: FontWeight.Bold, size: 10);
-
-                InternalChildren = new Drawable[]
-                {
-                    innerContainer = new FillFlowContainer
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-
-                        Direction = FillDirection.Vertical,
-                        Spacing = new Vector2(0, 5f),
-
-                        Children = new Drawable[]
-                        {
-                            Flag,
-                            AcronymText
-                        }
-                    }
-                };
-            }
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-                innerContainer.ScaleTo(1.5f);
-                innerContainer.ScaleTo(1f, 200);
-            }
-        }
     }
 }
diff --git a/osu.Game.Tournament/Screens/Drawings/Components/GroupTeam.cs b/osu.Game.Tournament/Screens/Drawings/Components/GroupTeam.cs
new file mode 100644
index 0000000000..4f0ce0bbe7
--- /dev/null
+++ b/osu.Game.Tournament/Screens/Drawings/Components/GroupTeam.cs
@@ -0,0 +1,60 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Tournament.Components;
+using osu.Game.Tournament.Models;
+using osuTK;
+
+namespace osu.Game.Tournament.Screens.Drawings.Components
+{
+    public class GroupTeam : DrawableTournamentTeam
+    {
+        private readonly FillFlowContainer innerContainer;
+
+        public GroupTeam(TournamentTeam team)
+            : base(team)
+        {
+            Width = 36;
+            AutoSizeAxes = Axes.Y;
+
+            Flag.Anchor = Anchor.TopCentre;
+            Flag.Origin = Anchor.TopCentre;
+
+            AcronymText.Anchor = Anchor.TopCentre;
+            AcronymText.Origin = Anchor.TopCentre;
+            AcronymText.Text = team.Acronym.Value.ToUpperInvariant();
+            AcronymText.Font = OsuFont.Torus.With(weight: FontWeight.Bold, size: 10);
+
+            InternalChildren = new Drawable[]
+            {
+                innerContainer = new FillFlowContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(0, 5f),
+
+                    Children = new Drawable[]
+                    {
+                        Flag,
+                        AcronymText
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+            innerContainer.ScaleTo(1.5f);
+            innerContainer.ScaleTo(1f, 200);
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
index 631393c6f4..7468c9484d 100644
--- a/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
+++ b/osu.Game.Tournament/Screens/Editors/TeamEditorScreen.cs
@@ -172,19 +172,6 @@ namespace osu.Game.Tournament.Screens.Editors
                 drawableContainer.Child = new DrawableTeamFlag(Model);
             }
 
-            private class DrawableTeamFlag : DrawableTournamentTeam
-            {
-                public DrawableTeamFlag(TournamentTeam team)
-                    : base(team)
-                {
-                    InternalChild = Flag;
-                    RelativeSizeAxes = Axes.Both;
-
-                    Flag.Anchor = Anchor.Centre;
-                    Flag.Origin = Anchor.Centre;
-                }
-            }
-
             public class PlayerEditor : CompositeDrawable
             {
                 private readonly TournamentTeam team;
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
index ce17c392d0..c86132a802 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
@@ -5,15 +5,9 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
-using osu.Game.Graphics;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Showcase;
-using osuTK;
-using osuTK.Graphics;
 using osuTK.Input;
 
 namespace osu.Game.Tournament.Screens.Gameplay.Components
@@ -46,181 +40,75 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                 },
             };
         }
+    }
 
-        private class TeamScoreDisplay : CompositeDrawable
+    public class TeamScoreDisplay : CompositeDrawable
+    {
+        private readonly TeamColour teamColour;
+
+        private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
+        private readonly Bindable<TournamentTeam> currentTeam = new Bindable<TournamentTeam>();
+        private readonly Bindable<int?> currentTeamScore = new Bindable<int?>();
+
+        public TeamScoreDisplay(TeamColour teamColour)
         {
-            private readonly TeamColour teamColour;
+            this.teamColour = teamColour;
 
-            private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
-            private readonly Bindable<TournamentTeam> currentTeam = new Bindable<TournamentTeam>();
-            private readonly Bindable<int?> currentTeamScore = new Bindable<int?>();
+            RelativeSizeAxes = Axes.Y;
+            Width = 300;
+        }
 
-            public TeamScoreDisplay(TeamColour teamColour)
+        [BackgroundDependencyLoader]
+        private void load(LadderInfo ladder)
+        {
+            currentMatch.BindValueChanged(matchChanged);
+            currentMatch.BindTo(ladder.CurrentMatch);
+        }
+
+        private void matchChanged(ValueChangedEvent<TournamentMatch> match)
+        {
+            currentTeamScore.UnbindBindings();
+            currentTeamScore.BindTo(teamColour == TeamColour.Red ? match.NewValue.Team1Score : match.NewValue.Team2Score);
+
+            currentTeam.UnbindBindings();
+            currentTeam.BindTo(teamColour == TeamColour.Red ? match.NewValue.Team1 : match.NewValue.Team2);
+
+            // team may change to same team, which means score is not in a good state.
+            // thus we handle this manually.
+            teamChanged(currentTeam.Value);
+        }
+
+        protected override bool OnMouseDown(MouseDownEvent e)
+        {
+            switch (e.Button)
             {
-                this.teamColour = teamColour;
+                case MouseButton.Left:
+                    if (currentTeamScore.Value < currentMatch.Value.PointsToWin)
+                        currentTeamScore.Value++;
+                    return true;
 
-                RelativeSizeAxes = Axes.Y;
-                Width = 300;
+                case MouseButton.Right:
+                    if (currentTeamScore.Value > 0)
+                        currentTeamScore.Value--;
+                    return true;
             }
 
-            [BackgroundDependencyLoader]
-            private void load(LadderInfo ladder)
+            return base.OnMouseDown(e);
+        }
+
+        private void teamChanged(TournamentTeam team)
+        {
+            var colour = teamColour == TeamColour.Red ? TournamentGame.COLOUR_RED : TournamentGame.COLOUR_BLUE;
+            var flip = teamColour == TeamColour.Red;
+
+            InternalChildren = new Drawable[]
             {
-                currentMatch.BindValueChanged(matchChanged);
-                currentMatch.BindTo(ladder.CurrentMatch);
-            }
-
-            private void matchChanged(ValueChangedEvent<TournamentMatch> match)
-            {
-                currentTeamScore.UnbindBindings();
-                currentTeamScore.BindTo(teamColour == TeamColour.Red ? match.NewValue.Team1Score : match.NewValue.Team2Score);
-
-                currentTeam.UnbindBindings();
-                currentTeam.BindTo(teamColour == TeamColour.Red ? match.NewValue.Team1 : match.NewValue.Team2);
-
-                // team may change to same team, which means score is not in a good state.
-                // thus we handle this manually.
-                teamChanged(currentTeam.Value);
-            }
-
-            protected override bool OnMouseDown(MouseDownEvent e)
-            {
-                switch (e.Button)
+                new TeamDisplay(team, colour, flip),
+                new TeamScore(currentTeamScore, flip, currentMatch.Value.PointsToWin)
                 {
-                    case MouseButton.Left:
-                        if (currentTeamScore.Value < currentMatch.Value.PointsToWin)
-                            currentTeamScore.Value++;
-                        return true;
-
-                    case MouseButton.Right:
-                        if (currentTeamScore.Value > 0)
-                            currentTeamScore.Value--;
-                        return true;
+                    Colour = colour
                 }
-
-                return base.OnMouseDown(e);
-            }
-
-            private void teamChanged(TournamentTeam team)
-            {
-                var colour = teamColour == TeamColour.Red ? TournamentGame.COLOUR_RED : TournamentGame.COLOUR_BLUE;
-                var flip = teamColour != TeamColour.Red;
-
-                InternalChildren = new Drawable[]
-                {
-                    new TeamDisplay(team, colour, flip),
-                    new TeamScore(currentTeamScore, flip, currentMatch.Value.PointsToWin)
-                    {
-                        Colour = colour
-                    }
-                };
-            }
-        }
-
-        private class TeamScore : CompositeDrawable
-        {
-            private readonly Bindable<int?> currentTeamScore = new Bindable<int?>();
-            private readonly StarCounter counter;
-
-            public TeamScore(Bindable<int?> score, bool flip, int count)
-            {
-                var anchor = flip ? Anchor.CentreRight : Anchor.CentreLeft;
-
-                Anchor = anchor;
-                Origin = anchor;
-
-                InternalChild = counter = new StarCounter(count)
-                {
-                    Anchor = anchor,
-                    X = (flip ? -1 : 1) * 90,
-                    Y = 5,
-                    Scale = flip ? new Vector2(-1, 1) : Vector2.One,
-                };
-
-                currentTeamScore.BindValueChanged(scoreChanged);
-                currentTeamScore.BindTo(score);
-            }
-
-            private void scoreChanged(ValueChangedEvent<int?> score) => counter.CountStars = score.NewValue ?? 0;
-        }
-
-        private class TeamDisplay : DrawableTournamentTeam
-        {
-            public TeamDisplay(TournamentTeam team, Color4 colour, bool flip)
-                : base(team)
-            {
-                RelativeSizeAxes = Axes.Both;
-
-                var anchor = flip ? Anchor.CentreRight : Anchor.CentreLeft;
-
-                Anchor = Origin = anchor;
-
-                Flag.Anchor = Flag.Origin = anchor;
-                Flag.RelativeSizeAxes = Axes.None;
-                Flag.Size = new Vector2(60, 40);
-                Flag.Margin = new MarginPadding(20);
-
-                InternalChild = new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Children = new Drawable[]
-                    {
-                        Flag,
-                        new TournamentSpriteText
-                        {
-                            Text = team?.FullName.Value.ToUpper() ?? "???",
-                            X = (flip ? -1 : 1) * 90,
-                            Y = -10,
-                            Colour = colour,
-                            Font = OsuFont.Torus.With(weight: FontWeight.Regular, size: 20),
-                            Origin = anchor,
-                            Anchor = anchor,
-                        },
-                    }
-                };
-            }
-        }
-
-        private class RoundDisplay : CompositeDrawable
-        {
-            private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
-
-            private readonly TournamentSpriteText text;
-
-            public RoundDisplay()
-            {
-                Width = 200;
-                Height = 20;
-
-                Masking = true;
-                CornerRadius = 10;
-
-                InternalChildren = new Drawable[]
-                {
-                    new Box
-                    {
-                        Colour = OsuColour.Gray(0.18f),
-                        RelativeSizeAxes = Axes.Both,
-                    },
-                    text = new TournamentSpriteText
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Colour = Color4.White,
-                        Font = OsuFont.Torus.With(weight: FontWeight.Regular, size: 16),
-                    },
-                };
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(LadderInfo ladder)
-            {
-                currentMatch.BindValueChanged(matchChanged);
-                currentMatch.BindTo(ladder.CurrentMatch);
-            }
-
-            private void matchChanged(ValueChangedEvent<TournamentMatch> match) =>
-                text.Text = match.NewValue.Round.Value?.Name.Value ?? "Unknown Round";
+            };
         }
     }
 }
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/RoundDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/RoundDisplay.cs
new file mode 100644
index 0000000000..5322cf9a76
--- /dev/null
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/RoundDisplay.cs
@@ -0,0 +1,56 @@
+// 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.Tournament.Models;
+using osuTK.Graphics;
+
+namespace osu.Game.Tournament.Screens.Gameplay.Components
+{
+    public class RoundDisplay : CompositeDrawable
+    {
+        private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
+
+        private readonly TournamentSpriteText text;
+
+        public RoundDisplay()
+        {
+            Width = 200;
+            Height = 20;
+
+            Masking = true;
+            CornerRadius = 10;
+
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    Colour = OsuColour.Gray(0.18f),
+                    RelativeSizeAxes = Axes.Both,
+                },
+                text = new TournamentSpriteText
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Colour = Color4.White,
+                    Font = OsuFont.Torus.With(weight: FontWeight.Regular, size: 16),
+                },
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(LadderInfo ladder)
+        {
+            currentMatch.BindValueChanged(matchChanged);
+            currentMatch.BindTo(ladder.CurrentMatch);
+        }
+
+        private void matchChanged(ValueChangedEvent<TournamentMatch> match) =>
+            text.Text = match.NewValue.Round.Value?.Name.Value ?? "Unknown Round";
+    }
+}
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
new file mode 100644
index 0000000000..891435c48e
--- /dev/null
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
@@ -0,0 +1,50 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Tournament.Components;
+using osu.Game.Tournament.Models;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Tournament.Screens.Gameplay.Components
+{
+    public class TeamDisplay : DrawableTournamentTeam
+    {
+        public TeamDisplay(TournamentTeam team, Color4 colour, bool flip)
+            : base(team)
+        {
+            RelativeSizeAxes = Axes.Both;
+
+            var anchor = flip ? Anchor.CentreRight : Anchor.CentreLeft;
+
+            Anchor = Origin = anchor;
+
+            Flag.Anchor = Flag.Origin = anchor;
+            Flag.RelativeSizeAxes = Axes.None;
+            Flag.Size = new Vector2(60, 40);
+            Flag.Margin = new MarginPadding(20);
+
+            InternalChild = new Container
+            {
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    Flag,
+                    new TournamentSpriteText
+                    {
+                        Text = team?.FullName.Value.ToUpper() ?? "???",
+                        X = (flip ? -1 : 1) * 90,
+                        Y = -10,
+                        Colour = colour,
+                        Font = OsuFont.Torus.With(weight: FontWeight.Regular, size: 20),
+                        Origin = anchor,
+                        Anchor = anchor,
+                    },
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScore.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScore.cs
new file mode 100644
index 0000000000..608d98a16a
--- /dev/null
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScore.cs
@@ -0,0 +1,38 @@
+// 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.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.UserInterface;
+using osuTK;
+
+namespace osu.Game.Tournament.Screens.Gameplay.Components
+{
+    public class TeamScore : CompositeDrawable
+    {
+        private readonly Bindable<int?> currentTeamScore = new Bindable<int?>();
+        private readonly StarCounter counter;
+
+        public TeamScore(Bindable<int?> score, bool flip, int count)
+        {
+            var anchor = flip ? Anchor.CentreRight : Anchor.CentreLeft;
+
+            Anchor = anchor;
+            Origin = anchor;
+
+            InternalChild = counter = new StarCounter(count)
+            {
+                Anchor = anchor,
+                X = (flip ? -1 : 1) * 90,
+                Y = 5,
+                Scale = flip ? new Vector2(-1, 1) : Vector2.One,
+            };
+
+            currentTeamScore.BindValueChanged(scoreChanged);
+            currentTeamScore.BindTo(score);
+        }
+
+        private void scoreChanged(ValueChangedEvent<int?> score) => counter.CountStars = score.NewValue ?? 0;
+    }
+}

From 4d74493289a7de37137727545b67629ca3576343 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Mar 2020 16:08:05 +0900
Subject: [PATCH 0955/1142] Initial pass of win screen design update

---
 .../Screens/TeamWin/TeamWinScreen.cs          | 110 ++++--------------
 1 file changed, 23 insertions(+), 87 deletions(-)

diff --git a/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs b/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
index 1765ab7ba2..8b3f4488d0 100644
--- a/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
@@ -10,7 +10,6 @@ using osu.Game.Graphics;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Tournament.Screens.TeamWin
 {
@@ -73,105 +72,42 @@ namespace osu.Game.Tournament.Screens.TeamWin
                 return;
             }
 
-            bool redWin = match.Winner == match.Team1.Value;
-            redWinVideo.Alpha = redWin ? 1 : 0;
-            blueWinVideo.Alpha = redWin ? 0 : 1;
+            redWinVideo.Alpha = match.WinnerColour == TeamColour.Red ? 1 : 0;
+            blueWinVideo.Alpha = match.WinnerColour == TeamColour.Blue ? 1 : 0;
 
             mainContainer.Children = new Drawable[]
             {
-                new TeamFlagDisplay(match.Winner)
+                new DrawableTeamFlag(match.Winner)
                 {
                     Size = new Vector2(300, 200),
                     Scale = new Vector2(0.5f),
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    X = -387,
+                    Position = new Vector2(-300, 10),
                 },
-                new TournamentSpriteText
+                new FillFlowContainer
                 {
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Vertical,
                     Anchor = Anchor.Centre,
-                    Origin = Anchor.TopLeft,
-                    Position = new Vector2(78, -70),
-                    Colour = OsuColour.Gray(0.33f),
-                    Text = match.Round.Value?.Name.Value ?? "Unknown Round",
-                    Font = OsuFont.Torus.With(size: 30, weight: FontWeight.Regular)
-                },
-                new TeamWithPlayers(match.Winner, redWin)
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Width = 0.5f,
-                    Height = 0.6f,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.TopLeft,
-                    Position = new Vector2(78, 0),
+                    Origin = Anchor.Centre,
+                    X = 260,
+                    Children = new Drawable[]
+                    {
+                        new RoundDisplay(match)
+                        {
+                            Margin = new MarginPadding { Bottom = 30 },
+                        },
+                        new TournamentSpriteText
+                        {
+                            Text = "WINNER",
+                            Font = OsuFont.Torus.With(size: 100, weight: FontWeight.Bold),
+                            Margin = new MarginPadding { Bottom = 50 },
+                        },
+                        new DrawableTeamWithPlayers(match.Winner, match.WinnerColour)
+                    }
                 },
             };
         }
-
-        private class TeamWithPlayers : CompositeDrawable
-        {
-            public TeamWithPlayers(TournamentTeam team, bool left = false)
-            {
-                FillFlowContainer players;
-
-                var colour = left ? TournamentGame.COLOUR_RED : TournamentGame.COLOUR_BLUE;
-                InternalChildren = new Drawable[]
-                {
-                    new FillFlowContainer
-                    {
-                        Direction = FillDirection.Vertical,
-                        AutoSizeAxes = Axes.Both,
-                        Children = new Drawable[]
-                        {
-                            new TournamentSpriteText
-                            {
-                                Text = "WINNER",
-                                Font = OsuFont.Torus.With(size: 24, weight: FontWeight.SemiBold),
-                                Colour = Color4.Black,
-                            },
-                            new TournamentSpriteText
-                            {
-                                Text = team?.FullName.Value ?? "???",
-                                Font = OsuFont.Torus.With(size: 30, weight: FontWeight.SemiBold),
-                                Colour = Color4.Black,
-                            },
-                            players = new FillFlowContainer
-                            {
-                                Direction = FillDirection.Vertical,
-                                AutoSizeAxes = Axes.Both,
-                                Padding = new MarginPadding { Top = 10 },
-                            },
-                        }
-                    },
-                };
-
-                if (team != null)
-                {
-                    foreach (var p in team.Players)
-                    {
-                        players.Add(new TournamentSpriteText
-                        {
-                            Text = p.Username,
-                            Font = OsuFont.Torus.With(size: 24),
-                            Colour = colour,
-                            Anchor = left ? Anchor.CentreRight : Anchor.CentreLeft,
-                            Origin = left ? Anchor.CentreRight : Anchor.CentreLeft,
-                        });
-                    }
-                }
-            }
-        }
-
-        private class TeamFlagDisplay : DrawableTournamentTeam
-        {
-            public TeamFlagDisplay(TournamentTeam team)
-                : base(team)
-            {
-                InternalChildren = new Drawable[]
-                {
-                    Flag
-                };
-            }
-        }
     }
 }

From 29817304423d154a39a0f5212e9ac2aeb3514148 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 7 Mar 2020 13:51:11 +0900
Subject: [PATCH 0956/1142] Initial pass of map pool screen design update

---
 .../Components/TournamentBeatmapPanel.cs      | 22 ++-----------------
 .../Screens/MapPool/MapPoolScreen.cs          |  5 +++++
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index 394ffe304e..09c4a96807 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Tournament.Components
         private readonly string mods;
 
         private const float horizontal_padding = 10;
-        private const float vertical_padding = 5;
+        private const float vertical_padding = 10;
 
         public const float HEIGHT = 50;
 
@@ -50,8 +50,6 @@ namespace osu.Game.Tournament.Components
             currentMatch.BindValueChanged(matchChanged);
             currentMatch.BindTo(ladder.CurrentMatch);
 
-            CornerRadius = HEIGHT / 2;
-            CornerExponent = 2;
             Masking = true;
 
             AddRangeInternal(new Drawable[]
@@ -70,16 +68,12 @@ namespace osu.Game.Tournament.Components
                 new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
                     Padding = new MarginPadding(vertical_padding),
                     Direction = FillDirection.Vertical,
                     Children = new Drawable[]
                     {
                         new TournamentSpriteText
                         {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
                             Text = new LocalisedString((
                                 $"{Beatmap.Metadata.ArtistUnicode ?? Beatmap.Metadata.Artist} - {Beatmap.Metadata.TitleUnicode ?? Beatmap.Metadata.Title}",
                                 $"{Beatmap.Metadata.Artist} - {Beatmap.Metadata.Title}")),
@@ -88,9 +82,6 @@ namespace osu.Game.Tournament.Components
                         new FillFlowContainer
                         {
                             AutoSizeAxes = Axes.Both,
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                            Padding = new MarginPadding(vertical_padding),
                             Direction = FillDirection.Horizontal,
                             Children = new Drawable[]
                             {
@@ -170,16 +161,7 @@ namespace osu.Game.Tournament.Components
 
                 BorderThickness = 6;
 
-                switch (found.Team)
-                {
-                    case TeamColour.Red:
-                        BorderColour = Color4.Red;
-                        break;
-
-                    case TeamColour.Blue:
-                        BorderColour = Color4.Blue;
-                        break;
-                }
+                BorderColour = TournamentGame.GetTeamColour(found.Team);
 
                 switch (found.Type)
                 {
diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index c42d0a6da3..4f3f7cfdbf 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -42,6 +42,11 @@ namespace osu.Game.Tournament.Screens.MapPool
         {
             InternalChildren = new Drawable[]
             {
+                new TourneyVideo("gameplay")
+                {
+                    Loop = true,
+                    RelativeSizeAxes = Axes.Both,
+                },
                 new MatchHeader(),
                 mapFlows = new FillFlowContainer<FillFlowContainer<TournamentBeatmapPanel>>
                 {

From ba6c4abbe6568c3d4acc9701dac310feae4ce1a8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 7 Mar 2020 01:37:15 +0900
Subject: [PATCH 0957/1142] Initial pass of ladder screen design update

---
 .../Ladder/Components/DrawableMatchTeam.cs    | 60 +++++++++----------
 .../Components/DrawableTournamentMatch.cs     | 11 ++--
 .../Components/DrawableTournamentRound.cs     |  5 +-
 .../Screens/Ladder/LadderScreen.cs            | 10 +++-
 4 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
index 88d7b95b0c..4f10a7e7d0 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
@@ -27,12 +27,12 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         private readonly bool losers;
         private TournamentSpriteText scoreText;
         private Box background;
+        private Box backgroundRight;
 
         private readonly Bindable<int?> score = new Bindable<int?>();
         private readonly BindableBool completed = new BindableBool();
 
         private Color4 colourWinner;
-        private Color4 colourNormal;
 
         private readonly Func<bool> isWinner;
         private LadderEditorScreen ladderEditor;
@@ -60,15 +60,12 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             this.losers = losers;
             Size = new Vector2(150, 40);
 
-            Masking = true;
-            CornerRadius = 5;
-
             Flag.Scale = new Vector2(0.9f);
             Flag.Anchor = Flag.Origin = Anchor.CentreLeft;
 
             AcronymText.Anchor = AcronymText.Origin = Anchor.CentreLeft;
             AcronymText.Padding = new MarginPadding { Left = 50 };
-            AcronymText.Font = OsuFont.Torus.With(size: 24);
+            AcronymText.Font = OsuFont.Torus.With(size: 22, weight: FontWeight.Bold);
 
             if (match != null)
             {
@@ -85,8 +82,9 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         {
             this.ladderEditor = ladderEditor;
 
-            colourWinner = losers ? colours.YellowDarker : colours.BlueDarker;
-            colourNormal = OsuColour.Gray(0.2f);
+            colourWinner = losers
+                ? OsuColour.FromHex("#8E7F48")
+                : OsuColour.FromHex("#1462AA");
 
             InternalChildren = new Drawable[]
             {
@@ -102,29 +100,28 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
                     {
                         AcronymText,
                         Flag,
-                        new Container
+                    }
+                },
+                new Container
+                {
+                    Masking = true,
+                    Width = 0.3f,
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        backgroundRight = new Box
                         {
-                            Masking = true,
-                            CornerRadius = 5,
-                            Width = 0.3f,
-                            Anchor = Anchor.CentreRight,
-                            Origin = Anchor.CentreRight,
+                            Colour = OsuColour.Gray(0.1f),
+                            Alpha = 0.8f,
                             RelativeSizeAxes = Axes.Both,
-                            Children = new Drawable[]
-                            {
-                                new Box
-                                {
-                                    Colour = OsuColour.Gray(0.1f),
-                                    Alpha = 0.8f,
-                                    RelativeSizeAxes = Axes.Both,
-                                },
-                                scoreText = new TournamentSpriteText
-                                {
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    Font = OsuFont.Torus.With(size: 20),
-                                }
-                            }
+                        },
+                        scoreText = new TournamentSpriteText
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Font = OsuFont.Torus.With(size: 22),
                         }
                     }
                 }
@@ -181,9 +178,12 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         {
             bool winner = completed.Value && isWinner?.Invoke() == true;
 
-            background.FadeColour(winner ? colourWinner : colourNormal, winner ? 500 : 0, Easing.OutQuint);
+            background.FadeColour(winner ? Color4.White : OsuColour.FromHex("#444"), winner ? 500 : 0, Easing.OutQuint);
+            backgroundRight.FadeColour(winner ? colourWinner : OsuColour.FromHex("#333"), winner ? 500 : 0, Easing.OutQuint);
 
-            scoreText.Font = AcronymText.Font = OsuFont.Torus.With(weight: winner ? FontWeight.Bold : FontWeight.Regular);
+            AcronymText.Colour = winner ? Color4.Black : Color4.White;
+
+            scoreText.Font = scoreText.Font.With(weight: winner ? FontWeight.Bold : FontWeight.Regular);
         }
 
         public MenuItem[] ContextMenuItems
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
index c4b670f059..82a4c7017f 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
+using osu.Game.Graphics;
 using osu.Game.Tournament.Models;
 using osuTK;
 using osuTK.Graphics;
@@ -45,9 +46,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             {
                 selectionBox = new Container
                 {
-                    CornerRadius = 5,
-                    Masking = true,
-                    Scale = new Vector2(1.05f),
+                    Scale = new Vector2(1.1f),
                     RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -57,14 +56,12 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
                 },
                 currentMatchSelectionBox = new Container
                 {
-                    CornerRadius = 5,
-                    Masking = true,
-                    Scale = new Vector2(1.05f),
+                    Scale = new Vector2(1.1f),
                     RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Alpha = 0,
-                    Colour = Color4.OrangeRed,
+                    Colour = OsuColour.FromHex("#D24747"),
                     Child = new Box { RelativeSizeAxes = Axes.Both }
                 },
                 Flow = new FillFlowContainer<DrawableMatchTeam>
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentRound.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentRound.cs
index d14ebb4d03..cad0b827c0 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentRound.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentRound.cs
@@ -7,7 +7,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Tournament.Models;
-using osuTK.Graphics;
 
 namespace osu.Game.Tournament.Screens.Ladder.Components
 {
@@ -33,14 +32,14 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
                 {
                     textDescription = new TournamentSpriteText
                     {
-                        Colour = Color4.Black,
+                        Colour = TournamentGame.TEXT_COLOUR,
                         Origin = Anchor.TopCentre,
                         Anchor = Anchor.TopCentre
                     },
                     textName = new TournamentSpriteText
                     {
                         Font = OsuFont.Torus.With(weight: FontWeight.Bold),
-                        Colour = Color4.Black,
+                        Colour = TournamentGame.TEXT_COLOUR,
                         Origin = Anchor.TopCentre,
                         Anchor = Anchor.TopCentre
                     },
diff --git a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
index 7b265ded32..c7e59cfa7b 100644
--- a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
+++ b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
@@ -32,8 +32,8 @@ namespace osu.Game.Tournament.Screens.Ladder
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, Storage storage)
         {
-            normalPathColour = colours.BlueDarker.Darken(2);
-            losersPathColour = colours.YellowDarker.Darken(2);
+            normalPathColour = OsuColour.FromHex("#66D1FF");
+            losersPathColour = OsuColour.FromHex("#FFC700");
 
             RelativeSizeAxes = Axes.Both;
 
@@ -47,6 +47,12 @@ namespace osu.Game.Tournament.Screens.Ladder
                         RelativeSizeAxes = Axes.Both,
                         Loop = true,
                     },
+                    new DrawableTournamentTitleText
+                    {
+                        Y = 100,
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                    },
                     ScrollContent = new LadderDragContainer
                     {
                         RelativeSizeAxes = Axes.Both,

From 66e54ba9837f4c8bf5aa7fdc8788c8dc7c6e7eb3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 7 Mar 2020 12:49:09 +0900
Subject: [PATCH 0958/1142] Increase flexibility of StarCounter component

---
 .../Visual/Gameplay/TestSceneScoreCounter.cs  |  12 +--
 .../Graphics/UserInterface/StarCounter.cs     | 101 ++++++++++--------
 .../Carousel/DrawableCarouselBeatmap.cs       |   2 +-
 3 files changed, 61 insertions(+), 54 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
index ffd6f55b53..88bb83b446 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 Origin = Anchor.BottomLeft,
                 Anchor = Anchor.BottomLeft,
                 Position = new Vector2(20, -160),
-                CountStars = 5,
+                Current = 5,
             };
             Add(stars);
 
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 Origin = Anchor.BottomLeft,
                 Anchor = Anchor.BottomLeft,
                 Position = new Vector2(20, -190),
-                Text = stars.CountStars.ToString("0.00"),
+                Text = stars.Current.ToString("0.00"),
             };
             Add(starsLabel);
 
@@ -69,8 +69,8 @@ namespace osu.Game.Tests.Visual.Gameplay
                 comboCounter.Current.Value = 0;
                 numerator = denominator = 0;
                 accuracyCounter.SetFraction(0, 0);
-                stars.CountStars = 0;
-                starsLabel.Text = stars.CountStars.ToString("0.00");
+                stars.Current = 0;
+                starsLabel.Text = stars.Current.ToString("0.00");
             });
 
             AddStep(@"Hit! :D", delegate
@@ -91,8 +91,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep(@"Alter stars", delegate
             {
-                stars.CountStars = RNG.NextSingle() * (stars.StarCount + 1);
-                starsLabel.Text = stars.CountStars.ToString("0.00");
+                stars.Current = RNG.NextSingle() * (stars.StarCount + 1);
+                starsLabel.Text = stars.Current.ToString("0.00");
             });
 
             AddStep(@"Stop counters", delegate
diff --git a/osu.Game/Graphics/UserInterface/StarCounter.cs b/osu.Game/Graphics/UserInterface/StarCounter.cs
index 586cd2ce84..b13d6485ac 100644
--- a/osu.Game/Graphics/UserInterface/StarCounter.cs
+++ b/osu.Game/Graphics/UserInterface/StarCounter.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Graphics.UserInterface
 {
     public class StarCounter : Container
     {
-        private readonly Container<Star> stars;
+        private readonly FillFlowContainer<Star> stars;
 
         /// <summary>
         /// Maximum amount of stars displayed.
@@ -23,34 +23,29 @@ namespace osu.Game.Graphics.UserInterface
         /// </remarks>
         public int StarCount { get; }
 
-        private double animationDelay => 80;
+        /// <summary>
+        /// The added delay for each subsequent star to be animated.
+        /// </summary>
+        protected virtual double AnimationDelay => 80;
 
-        private double scalingDuration => 1000;
-        private Easing scalingEasing => Easing.OutElasticHalf;
-        private float minStarScale => 0.4f;
-
-        private double fadingDuration => 100;
-        private float minStarAlpha => 0.5f;
-
-        private const float star_size = 20;
         private const float star_spacing = 4;
 
-        private float countStars;
+        private float current;
 
         /// <summary>
         /// Amount of stars represented.
         /// </summary>
-        public float CountStars
+        public float Current
         {
-            get => countStars;
+            get => current;
 
             set
             {
-                if (countStars == value) return;
+                if (current == value) return;
 
                 if (IsLoaded)
-                    transformCount(value);
-                countStars = value;
+                    animate(value);
+                current = value;
             }
         }
 
@@ -71,11 +66,13 @@ namespace osu.Game.Graphics.UserInterface
                     AutoSizeAxes = Axes.Both,
                     Direction = FillDirection.Horizontal,
                     Spacing = new Vector2(star_spacing),
-                    ChildrenEnumerable = Enumerable.Range(0, StarCount).Select(i => new Star { Alpha = minStarAlpha })
+                    ChildrenEnumerable = Enumerable.Range(0, StarCount).Select(i => CreateStar())
                 }
             };
         }
 
+        public virtual Star CreateStar() => new DefaultStar();
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -86,63 +83,60 @@ namespace osu.Game.Graphics.UserInterface
 
         public void ResetCount()
         {
-            countStars = 0;
+            current = 0;
             StopAnimation();
         }
 
         public void ReplayAnimation()
         {
-            var t = countStars;
+            var t = current;
             ResetCount();
-            CountStars = t;
+            Current = t;
         }
 
         public void StopAnimation()
         {
-            int i = 0;
-
+            animate(current);
             foreach (var star in stars.Children)
+                star.FinishTransforms(true);
+        }
+
+        private float getStarScale(int i, float value) => i + 1 <= value ? 1.0f : Interpolation.ValueAt(value, 0, 1.0f, i, i + 1);
+
+        private void animate(float newValue)
+        {
+            for (var i = 0; i < stars.Children.Count; i++)
             {
+                var star = stars.Children[i];
+
                 star.ClearTransforms(true);
-                star.FadeTo(i < countStars ? 1.0f : minStarAlpha);
-                star.Icon.ScaleTo(getStarScale(i, countStars));
-                i++;
+
+                double delay = (current <= newValue ? Math.Max(i - current, 0) : Math.Max(current - 1 - i, 0)) * AnimationDelay;
+
+                using (star.BeginDelayedSequence(delay, true))
+                    star.DisplayAt(getStarScale(i, newValue));
             }
         }
 
-        private float getStarScale(int i, float value)
+        public class DefaultStar : Star
         {
-            if (value <= i)
-                return minStarScale;
+            private const double scaling_duration = 1000;
 
-            return i + 1 <= value ? 1.0f : Interpolation.ValueAt(value, minStarScale, 1.0f, i, i + 1);
-        }
+            private const double fading_duration = 100;
 
-        private void transformCount(float newValue)
-        {
-            int i = 0;
+            private const Easing scaling_easing = Easing.OutElasticHalf;
 
-            foreach (var star in stars.Children)
-            {
-                star.ClearTransforms(true);
+            private const float min_star_scale = 0.4f;
 
-                var delay = (countStars <= newValue ? Math.Max(i - countStars, 0) : Math.Max(countStars - 1 - i, 0)) * animationDelay;
-                star.Delay(delay).FadeTo(i < newValue ? 1.0f : minStarAlpha, fadingDuration);
-                star.Icon.Delay(delay).ScaleTo(getStarScale(i, newValue), scalingDuration, scalingEasing);
+            private const float star_size = 20;
 
-                i++;
-            }
-        }
-
-        private class Star : Container
-        {
             public readonly SpriteIcon Icon;
 
-            public Star()
+            public DefaultStar()
             {
                 Size = new Vector2(star_size);
 
-                Child = Icon = new SpriteIcon
+                InternalChild = Icon = new SpriteIcon
                 {
                     Size = new Vector2(star_size),
                     Icon = FontAwesome.Solid.Star,
@@ -150,6 +144,19 @@ namespace osu.Game.Graphics.UserInterface
                     Origin = Anchor.Centre,
                 };
             }
+
+            public override void DisplayAt(float scale)
+            {
+                scale = Math.Clamp(scale, min_star_scale, 1);
+
+                this.FadeTo(scale, fading_duration);
+                Icon.ScaleTo(scale, scaling_duration, scaling_easing);
+            }
+        }
+
+        public abstract class Star : CompositeDrawable
+        {
+            public abstract void DisplayAt(float scale);
         }
     }
 }
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index d9eeec9f85..50419a5fb9 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -123,7 +123,7 @@ namespace osu.Game.Screens.Select.Carousel
                                 },
                                 starCounter = new StarCounter
                                 {
-                                    CountStars = (float)beatmap.StarDifficulty,
+                                    Current = (float)beatmap.StarDifficulty,
                                     Scale = new Vector2(0.8f),
                                 }
                             }

From 86b12a384b4244bf14ae93ea19f3cd3cf13d6207 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 7 Mar 2020 12:51:11 +0900
Subject: [PATCH 0959/1142] Initial pass of gameplay screen design update

---
 .../TestSceneDrawableTournamentTeam.cs        |  3 +-
 .../Screens/TestSceneGameplayScreen.cs        | 11 +++
 .../Gameplay/Components/MatchHeader.cs        | 39 +++++----
 .../Gameplay/Components/RoundDisplay.cs       | 37 +--------
 .../Gameplay/Components/TeamDisplay.cs        | 73 ++++++++++++-----
 .../Screens/Gameplay/Components/TeamScore.cs  | 81 +++++++++++++++++--
 .../Screens/Gameplay/GameplayScreen.cs        | 32 +-------
 7 files changed, 170 insertions(+), 106 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs
index 41f7d3d847..01edcb66e4 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentTeam.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Tests.Visual;
 using osu.Game.Tournament.Components;
@@ -113,7 +114,7 @@ namespace osu.Game.Tournament.Tests.Components
             Cell(i).AddRange(new Drawable[]
             {
                 new TournamentSpriteText { Text = "TeamDisplay" },
-                new TeamDisplay(team, TournamentGame.COLOUR_RED, false)
+                new TeamDisplay(team, TeamColour.Red, new Bindable<int?>(2), 6)
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
index 9de00818a5..964930a8de 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
@@ -1,9 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
+using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Screens.Gameplay;
+using osu.Game.Tournament.Screens.Gameplay.Components;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
@@ -12,6 +15,14 @@ namespace osu.Game.Tournament.Tests.Screens
         [Cached]
         private TournamentMatchChatDisplay chat = new TournamentMatchChatDisplay();
 
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(TeamScore),
+            typeof(TeamScoreDisplay),
+            typeof(TeamDisplay),
+            typeof(MatchHeader),
+        };
+
         [BackgroundDependencyLoader]
         private void load()
         {
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
index c86132a802..45f46c462a 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
@@ -6,8 +6,9 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
+using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
-using osu.Game.Tournament.Screens.Showcase;
+using osuTK;
 using osuTK.Input;
 
 namespace osu.Game.Tournament.Screens.Gameplay.Components
@@ -21,13 +22,28 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             Height = 95;
             Children = new Drawable[]
             {
-                new TournamentLogo(),
-                new RoundDisplay
+                new FillFlowContainer
                 {
-                    Y = 5,
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.TopCentre,
+                    RelativeSizeAxes = Axes.Both,
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(5),
+                    Children = new Drawable[]
+                    {
+                        new DrawableTournamentTitleText
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Scale = new Vector2(1.2f)
+                        },
+                        new RoundDisplay
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Scale = new Vector2(0.4f)
+                        },
+                    }
                 },
+
                 new TeamScoreDisplay(TeamColour.Red)
                 {
                     Anchor = Anchor.TopLeft,
@@ -55,7 +71,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             this.teamColour = teamColour;
 
             RelativeSizeAxes = Axes.Y;
-            Width = 300;
+            AutoSizeAxes = Axes.X;
         }
 
         [BackgroundDependencyLoader]
@@ -98,16 +114,9 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
 
         private void teamChanged(TournamentTeam team)
         {
-            var colour = teamColour == TeamColour.Red ? TournamentGame.COLOUR_RED : TournamentGame.COLOUR_BLUE;
-            var flip = teamColour == TeamColour.Red;
-
             InternalChildren = new Drawable[]
             {
-                new TeamDisplay(team, colour, flip),
-                new TeamScore(currentTeamScore, flip, currentMatch.Value.PointsToWin)
-                {
-                    Colour = colour
-                }
+                new TeamDisplay(team, teamColour, currentTeamScore, currentMatch.Value.PointsToWin),
             };
         }
     }
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/RoundDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/RoundDisplay.cs
index 5322cf9a76..c8b0d3bdda 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/RoundDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/RoundDisplay.cs
@@ -3,46 +3,15 @@
 
 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.Tournament.Components;
 using osu.Game.Tournament.Models;
-using osuTK.Graphics;
 
 namespace osu.Game.Tournament.Screens.Gameplay.Components
 {
-    public class RoundDisplay : CompositeDrawable
+    public class RoundDisplay : TournamentSpriteTextWithBackground
     {
         private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
 
-        private readonly TournamentSpriteText text;
-
-        public RoundDisplay()
-        {
-            Width = 200;
-            Height = 20;
-
-            Masking = true;
-            CornerRadius = 10;
-
-            InternalChildren = new Drawable[]
-            {
-                new Box
-                {
-                    Colour = OsuColour.Gray(0.18f),
-                    RelativeSizeAxes = Axes.Both,
-                },
-                text = new TournamentSpriteText
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Colour = Color4.White,
-                    Font = OsuFont.Torus.With(weight: FontWeight.Regular, size: 16),
-                },
-            };
-        }
-
         [BackgroundDependencyLoader]
         private void load(LadderInfo ladder)
         {
@@ -51,6 +20,6 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
         }
 
         private void matchChanged(ValueChangedEvent<TournamentMatch> match) =>
-            text.Text = match.NewValue.Round.Value?.Name.Value ?? "Unknown Round";
+            Text.Text = match.NewValue.Round.Value?.Name.Value ?? "Unknown Round";
     }
 }
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
index 891435c48e..4bfeb2bc81 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
@@ -1,47 +1,84 @@
 // 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.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Tournament.Screens.Gameplay.Components
 {
     public class TeamDisplay : DrawableTournamentTeam
     {
-        public TeamDisplay(TournamentTeam team, Color4 colour, bool flip)
+        public TeamDisplay(TournamentTeam team, TeamColour colour, Bindable<int?> currentTeamScore, int pointsToWin)
             : base(team)
         {
-            RelativeSizeAxes = Axes.Both;
+            AutoSizeAxes = Axes.Both;
 
-            var anchor = flip ? Anchor.CentreRight : Anchor.CentreLeft;
+            bool flip = colour == TeamColour.Red;
 
-            Anchor = Origin = anchor;
+            var anchor = flip ? Anchor.TopLeft : Anchor.TopRight;
 
-            Flag.Anchor = Flag.Origin = anchor;
             Flag.RelativeSizeAxes = Axes.None;
             Flag.Size = new Vector2(60, 40);
-            Flag.Margin = new MarginPadding(20);
+            Flag.Origin = anchor;
+            Flag.Anchor = anchor;
+
+            Margin = new MarginPadding(20);
 
             InternalChild = new Container
             {
-                RelativeSizeAxes = Axes.Both,
+                AutoSizeAxes = Axes.Both,
                 Children = new Drawable[]
                 {
-                    Flag,
-                    new TournamentSpriteText
+                    new FillFlowContainer
                     {
-                        Text = team?.FullName.Value.ToUpper() ?? "???",
-                        X = (flip ? -1 : 1) * 90,
-                        Y = -10,
-                        Colour = colour,
-                        Font = OsuFont.Torus.With(weight: FontWeight.Regular, size: 20),
-                        Origin = anchor,
-                        Anchor = anchor,
+                        AutoSizeAxes = Axes.Both,
+                        Direction = FillDirection.Horizontal,
+                        Spacing = new Vector2(5),
+                        Children = new Drawable[]
+                        {
+                            Flag,
+                            new FillFlowContainer
+                            {
+                                AutoSizeAxes = Axes.Both,
+                                Direction = FillDirection.Vertical,
+                                Origin = anchor,
+                                Anchor = anchor,
+                                Spacing = new Vector2(5),
+                                Children = new Drawable[]
+                                {
+                                    new FillFlowContainer
+                                    {
+                                        AutoSizeAxes = Axes.Both,
+                                        Direction = FillDirection.Horizontal,
+                                        Spacing = new Vector2(5),
+                                        Children = new Drawable[]
+                                        {
+                                            new DrawableTeamHeader(colour)
+                                            {
+                                                Scale = new Vector2(0.75f),
+                                                Origin = anchor,
+                                                Anchor = anchor,
+                                            },
+                                            new TeamScore(currentTeamScore, colour, pointsToWin)
+                                            {
+                                                Origin = anchor,
+                                                Anchor = anchor,
+                                            }
+                                        }
+                                    },
+                                    new TournamentSpriteTextWithBackground(team?.FullName.Value ?? "???")
+                                    {
+                                        Scale = new Vector2(0.5f),
+                                        Origin = anchor,
+                                        Anchor = anchor,
+                                    },
+                                }
+                            },
+                        }
                     },
                 }
             };
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScore.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScore.cs
index 608d98a16a..056f8387fb 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScore.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScore.cs
@@ -2,10 +2,16 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Tournament.Models;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Tournament.Screens.Gameplay.Components
 {
@@ -14,18 +20,16 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
         private readonly Bindable<int?> currentTeamScore = new Bindable<int?>();
         private readonly StarCounter counter;
 
-        public TeamScore(Bindable<int?> score, bool flip, int count)
+        public TeamScore(Bindable<int?> score, TeamColour colour, int count)
         {
-            var anchor = flip ? Anchor.CentreRight : Anchor.CentreLeft;
+            bool flip = colour == TeamColour.Blue;
+            var anchor = flip ? Anchor.TopRight : Anchor.TopLeft;
 
-            Anchor = anchor;
-            Origin = anchor;
+            AutoSizeAxes = Axes.Both;
 
-            InternalChild = counter = new StarCounter(count)
+            InternalChild = counter = new TeamScoreStarCounter(count)
             {
                 Anchor = anchor,
-                X = (flip ? -1 : 1) * 90,
-                Y = 5,
                 Scale = flip ? new Vector2(-1, 1) : Vector2.One,
             };
 
@@ -33,6 +37,67 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             currentTeamScore.BindTo(score);
         }
 
-        private void scoreChanged(ValueChangedEvent<int?> score) => counter.CountStars = score.NewValue ?? 0;
+        private void scoreChanged(ValueChangedEvent<int?> score) => counter.Current = score.NewValue ?? 0;
+
+        public class TeamScoreStarCounter : StarCounter
+        {
+            public TeamScoreStarCounter(int count)
+                : base(count)
+            {
+            }
+
+            public override Star CreateStar() => new LightSquare();
+
+            public class LightSquare : Star
+            {
+                private Box box;
+
+                public LightSquare()
+                {
+                    Size = new Vector2(22.5f);
+
+                    InternalChildren = new Drawable[]
+                    {
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Masking = true,
+                            BorderColour = OsuColour.Gray(0.5f),
+                            BorderThickness = 3,
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    Colour = Color4.Transparent,
+                                    RelativeSizeAxes = Axes.Both,
+                                    AlwaysPresent = true,
+                                },
+                            }
+                        },
+                        box = new Box
+                        {
+                            Colour = OsuColour.FromHex("#FFE8AD"),
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                    };
+
+                    Masking = true;
+                    EdgeEffect = new EdgeEffectParameters
+                    {
+                        Type = EdgeEffectType.Glow,
+                        Colour = OsuColour.FromHex("#FFE8AD").Opacity(0.1f),
+                        Hollow = true,
+                        Radius = 20,
+                        Roundness = 10,
+                    };
+                }
+
+                public override void DisplayAt(float scale)
+                {
+                    box.FadeTo(scale, 500, Easing.OutQuint);
+                    FadeEdgeEffectTo(0.2f * scale, 500, Easing.OutQuint);
+                }
+            }
+        }
     }
 }
diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index 6ba57c60b8..df3ca59f1f 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -30,9 +30,6 @@ namespace osu.Game.Tournament.Screens.Gameplay
         private OsuButton warmupButton;
         private MatchIPCInfo ipc;
 
-        private readonly Color4 red = new Color4(186, 0, 18, 255);
-        private readonly Color4 blue = new Color4(17, 136, 170, 255);
-
         [Resolved(canBeNull: true)]
         private TournamentSceneManager sceneManager { get; set; }
 
@@ -66,36 +63,11 @@ namespace osu.Game.Tournament.Screens.Gameplay
                             // chroma key area for stable gameplay
                             Name = "chroma",
                             RelativeSizeAxes = Axes.X,
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
                             Height = 512,
                             Colour = new Color4(0, 255, 0, 255),
                         },
-                        new Container
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            AutoSizeAxes = Axes.Y,
-                            Y = -4,
-                            Children = new Drawable[]
-                            {
-                                new Circle
-                                {
-                                    Name = "top bar red",
-                                    RelativeSizeAxes = Axes.X,
-                                    Height = 8,
-                                    Width = 0.5f,
-                                    Colour = red,
-                                },
-                                new Circle
-                                {
-                                    Name = "top bar blue",
-                                    RelativeSizeAxes = Axes.X,
-                                    Height = 8,
-                                    Width = 0.5f,
-                                    Colour = blue,
-                                    Anchor = Anchor.TopRight,
-                                    Origin = Anchor.TopRight,
-                                },
-                            }
-                        },
                     }
                 },
                 scoreDisplay = new MatchScoreDisplay

From e25206728f39761932ecc8379a34e33d495348be Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 7 Mar 2020 14:46:40 +0900
Subject: [PATCH 0960/1142] Hide score displays during warmup

---
 .../Gameplay/Components/MatchHeader.cs        | 23 +++++++++++++++----
 .../Gameplay/Components/TeamDisplay.cs        |  6 ++++-
 .../Screens/Gameplay/GameplayScreen.cs        |  9 ++++++--
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
index 45f46c462a..7e9d0178d8 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
@@ -15,6 +15,18 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
 {
     public class MatchHeader : Container
     {
+        private TeamScoreDisplay teamDisplay1;
+        private TeamScoreDisplay teamDisplay2;
+
+        public bool ShowScores
+        {
+            set
+            {
+                teamDisplay1.ShowScore = value;
+                teamDisplay2.ShowScore = value;
+            }
+        }
+
         [BackgroundDependencyLoader]
         private void load()
         {
@@ -43,13 +55,12 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                         },
                     }
                 },
-
-                new TeamScoreDisplay(TeamColour.Red)
+                teamDisplay1 = new TeamScoreDisplay(TeamColour.Red)
                 {
                     Anchor = Anchor.TopLeft,
                     Origin = Anchor.TopLeft,
                 },
-                new TeamScoreDisplay(TeamColour.Blue)
+                teamDisplay2 = new TeamScoreDisplay(TeamColour.Blue)
                 {
                     Anchor = Anchor.TopRight,
                     Origin = Anchor.TopRight,
@@ -66,6 +77,10 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
         private readonly Bindable<TournamentTeam> currentTeam = new Bindable<TournamentTeam>();
         private readonly Bindable<int?> currentTeamScore = new Bindable<int?>();
 
+        private TeamDisplay teamDisplay;
+
+        public bool ShowScore { set => teamDisplay.ShowScore = value; }
+
         public TeamScoreDisplay(TeamColour teamColour)
         {
             this.teamColour = teamColour;
@@ -116,7 +131,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
         {
             InternalChildren = new Drawable[]
             {
-                new TeamDisplay(team, teamColour, currentTeamScore, currentMatch.Value.PointsToWin),
+                teamDisplay = new TeamDisplay(team, teamColour, currentTeamScore, currentMatch.Value.PointsToWin),
             };
         }
     }
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
index 4bfeb2bc81..29908e8e7c 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamDisplay.cs
@@ -12,6 +12,10 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
 {
     public class TeamDisplay : DrawableTournamentTeam
     {
+        private readonly TeamScore score;
+
+        public bool ShowScore { set => score.FadeTo(value ? 1 : 0, 200); }
+
         public TeamDisplay(TournamentTeam team, TeamColour colour, Bindable<int?> currentTeamScore, int pointsToWin)
             : base(team)
         {
@@ -63,7 +67,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                                                 Origin = anchor,
                                                 Anchor = anchor,
                                             },
-                                            new TeamScore(currentTeamScore, colour, pointsToWin)
+                                            score = new TeamScore(currentTeamScore, colour, pointsToWin)
                                             {
                                                 Origin = anchor,
                                                 Anchor = anchor,
diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index df3ca59f1f..78d27c87ff 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Tournament.Screens.Gameplay
                     Loop = true,
                     RelativeSizeAxes = Axes.Both,
                 },
-                new MatchHeader(),
+                header = new MatchHeader(),
                 new Container
                 {
                     RelativeSizeAxes = Axes.X,
@@ -108,13 +108,18 @@ namespace osu.Game.Tournament.Screens.Gameplay
 
             currentMatch.BindTo(ladder.CurrentMatch);
 
-            warmup.BindValueChanged(w => warmupButton.Alpha = !w.NewValue ? 0.5f : 1, true);
+            warmup.BindValueChanged(w =>
+            {
+                warmupButton.Alpha = !w.NewValue ? 0.5f : 1;
+                header.ShowScores = !w.NewValue;
+            }, true);
         }
 
         private ScheduledDelegate scheduledOperation;
         private MatchScoreDisplay scoreDisplay;
 
         private TourneyState lastState;
+        private MatchHeader header;
 
         private void stateChanged(ValueChangedEvent<TourneyState> state)
         {

From 3807c449bd350c838c9e0749c17631a63724aeb2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 7 Mar 2020 15:28:19 +0900
Subject: [PATCH 0961/1142] Update chat position

---
 .../Components/TournamentMatchChatDisplay.cs  | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs b/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
index 48c5b9bd35..6963f0a0cb 100644
--- a/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
+++ b/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
@@ -10,7 +10,6 @@ using osu.Game.Overlays.Chat;
 using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Models;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Tournament.Components
 {
@@ -23,11 +22,11 @@ namespace osu.Game.Tournament.Components
         public TournamentMatchChatDisplay()
         {
             RelativeSizeAxes = Axes.X;
-            Y = 100;
-            Size = new Vector2(0.45f, 112);
-            Margin = new MarginPadding(10);
-            Anchor = Anchor.BottomCentre;
-            Origin = Anchor.BottomCentre;
+            Size = new Vector2(0.5f, 142);
+            Anchor = Anchor.BottomLeft;
+            Origin = Anchor.BottomLeft;
+
+            CornerRadius = 0;
         }
 
         [BackgroundDependencyLoader(true)]
@@ -75,19 +74,15 @@ namespace osu.Game.Tournament.Components
             {
             }
 
-            [BackgroundDependencyLoader]
             private void load(LadderInfo info)
             {
-                //if (info.CurrentMatch.Value.Team1.Value.Players.Any(u => u.Id == Message.Sender.Id))
-                //    ColourBox.Colour = red;
-                //else if (info.CurrentMatch.Value.Team2.Value.Players.Any(u => u.Id == Message.Sender.Id))
-                //    ColourBox.Colour = blue;
-                //else if (Message.Sender.Colour != null)
-                //    SenderText.Colour = ColourBox.Colour = OsuColour.FromHex(Message.Sender.Colour);
+                // if (info.CurrentMatch.Value.Team1.Value.Players.Any(u => u.Id == Message.Sender.Id))
+                //     SenderText.Colour = TournamentGame.COLOUR_RED;
+                // else if (info.CurrentMatch.Value.Team2.Value.Players.Any(u => u.Id == Message.Sender.Id))
+                //     SenderText.Colour = TournamentGame.COLOUR_BLUE;
+                // else if (Message.Sender.Colour != null)
+                //     SenderText.Colour = ColourBox.Colour = OsuColour.FromHex(Message.Sender.Colour);
             }
-
-            private readonly Color4 red = new Color4(186, 0, 18, 255);
-            private readonly Color4 blue = new Color4(17, 136, 170, 255);
         }
     }
 }

From 9bd837da4123cb2781dc25ac89ca4a2755794924 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 7 Mar 2020 16:22:52 +0900
Subject: [PATCH 0962/1142] Update match score display

---
 .../Screens/TestSceneGameplayScreen.cs        |  1 +
 .../Gameplay/Components/MatchScoreDisplay.cs  | 53 ++++++++++++-------
 .../Screens/Gameplay/Components/TeamScore.cs  |  2 +-
 .../Screens/Gameplay/GameplayScreen.cs        |  6 +--
 4 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
index 964930a8de..ae7d9d853a 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
@@ -21,6 +21,7 @@ namespace osu.Game.Tournament.Tests.Screens
             typeof(TeamScoreDisplay),
             typeof(TeamDisplay),
             typeof(MatchHeader),
+            typeof(MatchScoreDisplay),
         };
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs
index fcf1469278..ed14956793 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs
@@ -11,16 +11,12 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Models;
-using osuTK.Graphics;
 
 namespace osu.Game.Tournament.Screens.Gameplay.Components
 {
     public class MatchScoreDisplay : CompositeDrawable
     {
-        private readonly Color4 red = new Color4(186, 0, 18, 255);
-        private readonly Color4 blue = new Color4(17, 136, 170, 255);
-
-        private const float bar_height = 20;
+        private const float bar_height = 18;
 
         private readonly BindableInt score1 = new BindableInt();
         private readonly BindableInt score2 = new BindableInt();
@@ -28,45 +24,63 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
         private readonly MatchScoreCounter score1Text;
         private readonly MatchScoreCounter score2Text;
 
-        private readonly Circle score1Bar;
-        private readonly Circle score2Bar;
+        private readonly Drawable score1Bar;
+        private readonly Drawable score2Bar;
 
         public MatchScoreDisplay()
         {
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
 
-            InternalChildren = new Drawable[]
+            InternalChildren = new[]
             {
-                score1Bar = new Circle
+                new Box
+                {
+                    Name = "top bar red (static)",
+                    RelativeSizeAxes = Axes.X,
+                    Height = bar_height / 4,
+                    Width = 0.5f,
+                    Colour = TournamentGame.COLOUR_RED,
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopRight
+                },
+                new Box
+                {
+                    Name = "top bar blue (static)",
+                    RelativeSizeAxes = Axes.X,
+                    Height = bar_height / 4,
+                    Width = 0.5f,
+                    Colour = TournamentGame.COLOUR_BLUE,
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopLeft
+                },
+                score1Bar = new Box
                 {
                     Name = "top bar red",
                     RelativeSizeAxes = Axes.X,
                     Height = bar_height,
                     Width = 0,
-                    Colour = red,
+                    Colour = TournamentGame.COLOUR_RED,
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopRight
                 },
                 score1Text = new MatchScoreCounter
                 {
-                    Colour = red,
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre
                 },
-                score2Bar = new Circle
+                score2Bar = new Box
                 {
                     Name = "top bar blue",
                     RelativeSizeAxes = Axes.X,
                     Height = bar_height,
                     Width = 0,
-                    Colour = blue,
+                    Colour = TournamentGame.COLOUR_BLUE,
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopLeft
                 },
                 score2Text = new MatchScoreCounter
                 {
-                    Colour = blue,
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre
                 },
@@ -103,10 +117,9 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             winningBar.ResizeWidthTo(Math.Min(0.4f, MathF.Pow(diff / 1500000f, 0.5f) / 2), 400, Easing.OutQuint);
         }
 
-        protected override void Update()
+        protected override void UpdateAfterChildren()
         {
-            base.Update();
-
+            base.UpdateAfterChildren();
             score1Text.X = -Math.Max(5 + score1Text.DrawWidth / 2, score1Bar.DrawWidth);
             score2Text.X = Math.Max(5 + score2Text.DrawWidth / 2, score2Bar.DrawWidth);
         }
@@ -115,7 +128,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
         {
             public MatchScoreCounter()
             {
-                Margin = new MarginPadding { Top = bar_height + 5, Horizontal = 10 };
+                Margin = new MarginPadding { Top = bar_height, Horizontal = 10 };
 
                 Winning = false;
             }
@@ -123,8 +136,8 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             public bool Winning
             {
                 set => DisplayedCountSpriteText.Font = value
-                    ? OsuFont.Torus.With(weight: FontWeight.Regular, size: 60)
-                    : OsuFont.Torus.With(weight: FontWeight.Light, size: 40);
+                    ? OsuFont.Torus.With(weight: FontWeight.Bold, size: 50)
+                    : OsuFont.Torus.With(weight: FontWeight.Regular, size: 40);
             }
         }
     }
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScore.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScore.cs
index 056f8387fb..c7071484ca 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScore.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScore.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
 
             public class LightSquare : Star
             {
-                private Box box;
+                private readonly Box box;
 
                 public LightSquare()
                 {
diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index 78d27c87ff..ad00dffac7 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -15,7 +15,6 @@ using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Gameplay.Components;
 using osu.Game.Tournament.Screens.MapPool;
 using osu.Game.Tournament.Screens.TeamWin;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Tournament.Screens.Gameplay
@@ -72,10 +71,9 @@ namespace osu.Game.Tournament.Screens.Gameplay
                 },
                 scoreDisplay = new MatchScoreDisplay
                 {
-                    Y = -60,
-                    Scale = new Vector2(0.8f),
+                    Y = -147,
                     Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.BottomCentre,
+                    Origin = Anchor.TopCentre,
                 },
                 new ControlPanel
                 {

From 979988235dab7aa08e138e9a1e5f20eeadd6ad67 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 7 Mar 2020 12:49:09 +0900
Subject: [PATCH 0963/1142] Increase flexibility of StarCounter component

---
 .../Visual/Gameplay/TestSceneScoreCounter.cs  |  12 +--
 .../Graphics/UserInterface/StarCounter.cs     | 101 ++++++++++--------
 .../Carousel/DrawableCarouselBeatmap.cs       |   2 +-
 3 files changed, 61 insertions(+), 54 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
index ffd6f55b53..88bb83b446 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 Origin = Anchor.BottomLeft,
                 Anchor = Anchor.BottomLeft,
                 Position = new Vector2(20, -160),
-                CountStars = 5,
+                Current = 5,
             };
             Add(stars);
 
@@ -59,7 +59,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 Origin = Anchor.BottomLeft,
                 Anchor = Anchor.BottomLeft,
                 Position = new Vector2(20, -190),
-                Text = stars.CountStars.ToString("0.00"),
+                Text = stars.Current.ToString("0.00"),
             };
             Add(starsLabel);
 
@@ -69,8 +69,8 @@ namespace osu.Game.Tests.Visual.Gameplay
                 comboCounter.Current.Value = 0;
                 numerator = denominator = 0;
                 accuracyCounter.SetFraction(0, 0);
-                stars.CountStars = 0;
-                starsLabel.Text = stars.CountStars.ToString("0.00");
+                stars.Current = 0;
+                starsLabel.Text = stars.Current.ToString("0.00");
             });
 
             AddStep(@"Hit! :D", delegate
@@ -91,8 +91,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
             AddStep(@"Alter stars", delegate
             {
-                stars.CountStars = RNG.NextSingle() * (stars.StarCount + 1);
-                starsLabel.Text = stars.CountStars.ToString("0.00");
+                stars.Current = RNG.NextSingle() * (stars.StarCount + 1);
+                starsLabel.Text = stars.Current.ToString("0.00");
             });
 
             AddStep(@"Stop counters", delegate
diff --git a/osu.Game/Graphics/UserInterface/StarCounter.cs b/osu.Game/Graphics/UserInterface/StarCounter.cs
index 586cd2ce84..b13d6485ac 100644
--- a/osu.Game/Graphics/UserInterface/StarCounter.cs
+++ b/osu.Game/Graphics/UserInterface/StarCounter.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Graphics.UserInterface
 {
     public class StarCounter : Container
     {
-        private readonly Container<Star> stars;
+        private readonly FillFlowContainer<Star> stars;
 
         /// <summary>
         /// Maximum amount of stars displayed.
@@ -23,34 +23,29 @@ namespace osu.Game.Graphics.UserInterface
         /// </remarks>
         public int StarCount { get; }
 
-        private double animationDelay => 80;
+        /// <summary>
+        /// The added delay for each subsequent star to be animated.
+        /// </summary>
+        protected virtual double AnimationDelay => 80;
 
-        private double scalingDuration => 1000;
-        private Easing scalingEasing => Easing.OutElasticHalf;
-        private float minStarScale => 0.4f;
-
-        private double fadingDuration => 100;
-        private float minStarAlpha => 0.5f;
-
-        private const float star_size = 20;
         private const float star_spacing = 4;
 
-        private float countStars;
+        private float current;
 
         /// <summary>
         /// Amount of stars represented.
         /// </summary>
-        public float CountStars
+        public float Current
         {
-            get => countStars;
+            get => current;
 
             set
             {
-                if (countStars == value) return;
+                if (current == value) return;
 
                 if (IsLoaded)
-                    transformCount(value);
-                countStars = value;
+                    animate(value);
+                current = value;
             }
         }
 
@@ -71,11 +66,13 @@ namespace osu.Game.Graphics.UserInterface
                     AutoSizeAxes = Axes.Both,
                     Direction = FillDirection.Horizontal,
                     Spacing = new Vector2(star_spacing),
-                    ChildrenEnumerable = Enumerable.Range(0, StarCount).Select(i => new Star { Alpha = minStarAlpha })
+                    ChildrenEnumerable = Enumerable.Range(0, StarCount).Select(i => CreateStar())
                 }
             };
         }
 
+        public virtual Star CreateStar() => new DefaultStar();
+
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -86,63 +83,60 @@ namespace osu.Game.Graphics.UserInterface
 
         public void ResetCount()
         {
-            countStars = 0;
+            current = 0;
             StopAnimation();
         }
 
         public void ReplayAnimation()
         {
-            var t = countStars;
+            var t = current;
             ResetCount();
-            CountStars = t;
+            Current = t;
         }
 
         public void StopAnimation()
         {
-            int i = 0;
-
+            animate(current);
             foreach (var star in stars.Children)
+                star.FinishTransforms(true);
+        }
+
+        private float getStarScale(int i, float value) => i + 1 <= value ? 1.0f : Interpolation.ValueAt(value, 0, 1.0f, i, i + 1);
+
+        private void animate(float newValue)
+        {
+            for (var i = 0; i < stars.Children.Count; i++)
             {
+                var star = stars.Children[i];
+
                 star.ClearTransforms(true);
-                star.FadeTo(i < countStars ? 1.0f : minStarAlpha);
-                star.Icon.ScaleTo(getStarScale(i, countStars));
-                i++;
+
+                double delay = (current <= newValue ? Math.Max(i - current, 0) : Math.Max(current - 1 - i, 0)) * AnimationDelay;
+
+                using (star.BeginDelayedSequence(delay, true))
+                    star.DisplayAt(getStarScale(i, newValue));
             }
         }
 
-        private float getStarScale(int i, float value)
+        public class DefaultStar : Star
         {
-            if (value <= i)
-                return minStarScale;
+            private const double scaling_duration = 1000;
 
-            return i + 1 <= value ? 1.0f : Interpolation.ValueAt(value, minStarScale, 1.0f, i, i + 1);
-        }
+            private const double fading_duration = 100;
 
-        private void transformCount(float newValue)
-        {
-            int i = 0;
+            private const Easing scaling_easing = Easing.OutElasticHalf;
 
-            foreach (var star in stars.Children)
-            {
-                star.ClearTransforms(true);
+            private const float min_star_scale = 0.4f;
 
-                var delay = (countStars <= newValue ? Math.Max(i - countStars, 0) : Math.Max(countStars - 1 - i, 0)) * animationDelay;
-                star.Delay(delay).FadeTo(i < newValue ? 1.0f : minStarAlpha, fadingDuration);
-                star.Icon.Delay(delay).ScaleTo(getStarScale(i, newValue), scalingDuration, scalingEasing);
+            private const float star_size = 20;
 
-                i++;
-            }
-        }
-
-        private class Star : Container
-        {
             public readonly SpriteIcon Icon;
 
-            public Star()
+            public DefaultStar()
             {
                 Size = new Vector2(star_size);
 
-                Child = Icon = new SpriteIcon
+                InternalChild = Icon = new SpriteIcon
                 {
                     Size = new Vector2(star_size),
                     Icon = FontAwesome.Solid.Star,
@@ -150,6 +144,19 @@ namespace osu.Game.Graphics.UserInterface
                     Origin = Anchor.Centre,
                 };
             }
+
+            public override void DisplayAt(float scale)
+            {
+                scale = Math.Clamp(scale, min_star_scale, 1);
+
+                this.FadeTo(scale, fading_duration);
+                Icon.ScaleTo(scale, scaling_duration, scaling_easing);
+            }
+        }
+
+        public abstract class Star : CompositeDrawable
+        {
+            public abstract void DisplayAt(float scale);
         }
     }
 }
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index d9eeec9f85..50419a5fb9 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -123,7 +123,7 @@ namespace osu.Game.Screens.Select.Carousel
                                 },
                                 starCounter = new StarCounter
                                 {
-                                    CountStars = (float)beatmap.StarDifficulty,
+                                    Current = (float)beatmap.StarDifficulty,
                                     Scale = new Vector2(0.8f),
                                 }
                             }

From 059aea8ead39601ffe0ff79d21333bb0443045b3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Mar 2020 16:09:07 +0900
Subject: [PATCH 0964/1142] Initial pass of schedule screen design update

---
 .../Screens/Schedule/ScheduleScreen.cs        | 126 +++++++++++++-----
 1 file changed, 95 insertions(+), 31 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
index 4c93c04fcf..9ca1aa626a 100644
--- a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
+++ b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -18,7 +19,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tournament.Screens.Schedule
 {
-    public class ScheduleScreen : TournamentScreen
+    public class ScheduleScreen : TournamentScreen // IProvidesVideo
     {
         private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
         private Container mainContainer;
@@ -38,10 +39,63 @@ namespace osu.Game.Tournament.Screens.Schedule
                     RelativeSizeAxes = Axes.Both,
                     Loop = true,
                 },
-                mainContainer = new Container
+                new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                }
+                    Padding = new MarginPadding(100) { Bottom = 50 },
+                    Children = new Drawable[]
+                    {
+                        new GridContainer
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            RowDimensions = new[]
+                            {
+                                new Dimension(GridSizeMode.AutoSize),
+                                new Dimension(),
+                            },
+                            Content = new[]
+                            {
+                                new Drawable[]
+                                {
+                                    new FillFlowContainer
+                                    {
+                                        AutoSizeAxes = Axes.Both,
+                                        Direction = FillDirection.Vertical,
+                                        Children = new Drawable[]
+                                        {
+                                            new DrawableTournamentTitleText(),
+                                            new Container
+                                            {
+                                                Margin = new MarginPadding { Top = 40 },
+                                                AutoSizeAxes = Axes.Both,
+                                                Children = new Drawable[]
+                                                {
+                                                    new Box
+                                                    {
+                                                        Colour = Color4.White,
+                                                        Size = new Vector2(50, 10),
+                                                    },
+                                                    new TournamentSpriteTextWithBackground("Schedule")
+                                                    {
+                                                        X = 60,
+                                                        Scale = new Vector2(0.8f)
+                                                    }
+                                                }
+                                            },
+                                        }
+                                    },
+                                },
+                                new Drawable[]
+                                {
+                                    mainContainer = new Container
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
             };
 
             currentMatch.BindValueChanged(matchChanged);
@@ -91,7 +145,7 @@ namespace osu.Game.Tournament.Screens.Schedule
                                                                .Take(8)
                                                                .Select(p => new ScheduleMatch(p))
                                 },
-                                new ScheduleContainer("match overview")
+                                new ScheduleContainer("upcoming matches")
                                 {
                                     RelativeSizeAxes = Axes.Both,
                                     Width = 0.6f,
@@ -100,26 +154,45 @@ namespace osu.Game.Tournament.Screens.Schedule
                             }
                         }
                     },
-                    new ScheduleContainer("current match")
+                    new ScheduleContainer("coming up next")
                     {
                         RelativeSizeAxes = Axes.Both,
                         Height = 0.25f,
                         Children = new Drawable[]
                         {
-                            new TournamentSpriteText
+                            new FillFlowContainer
                             {
-                                Margin = new MarginPadding { Left = -10, Bottom = 10, Top = -5 },
-                                Spacing = new Vector2(10, 0),
-                                Text = match.NewValue.Round.Value?.Name.Value,
-                                Colour = Color4.Black,
-                                Font = OsuFont.Torus.With(size: 20)
-                            },
-                            new ScheduleMatch(match.NewValue, false),
-                            new TournamentSpriteText
-                            {
-                                Text = "Start Time " + match.NewValue.Date.Value.ToUniversalTime().ToString("HH:mm UTC"),
-                                Colour = Color4.Black,
-                                Font = OsuFont.Torus.With(size: 20)
+                                RelativeSizeAxes = Axes.Both,
+                                Direction = FillDirection.Horizontal,
+                                Spacing = new Vector2(30),
+                                Children = new Drawable[]
+                                {
+                                    new ScheduleMatch(match.NewValue, false)
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                    },
+                                    new TournamentSpriteTextWithBackground(match.NewValue.Round.Value?.Name.Value)
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        Scale = new Vector2(0.5f)
+                                    },
+                                    new TournamentSpriteText
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        Text = match.NewValue.Team1.Value?.FullName + " vs " + match.NewValue.Team2.Value?.FullName,
+                                        Font = OsuFont.Torus.With(size: 24, weight: FontWeight.SemiBold)
+                                    },
+                                    new TournamentSpriteText
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        Text = $"Starting {match.NewValue.Date.Value.Humanize()}",
+                                        Font = OsuFont.Torus.With(size: 24, weight: FontWeight.Regular)
+                                    },
+                                }
                             },
                         }
                     }
@@ -170,29 +243,20 @@ namespace osu.Game.Tournament.Screens.Schedule
 
             public ScheduleContainer(string title)
             {
-                Padding = new MarginPadding { Left = 30, Top = 30 };
+                Padding = new MarginPadding { Left = 30, Top = 10 };
                 InternalChildren = new Drawable[]
                 {
-                    new TournamentSpriteText
+                    new TournamentSpriteTextWithBackground(title.ToUpperInvariant())
                     {
                         X = 30,
-                        Text = title,
-                        Colour = Color4.Black,
-                        Spacing = new Vector2(10, 0),
-                        Font = OsuFont.Torus.With(size: 30)
+                        Scale = new Vector2(0.5f)
                     },
                     content = new FillFlowContainer
                     {
                         Direction = FillDirection.Vertical,
                         RelativeSizeAxes = Axes.Both,
-                        Margin = new MarginPadding(40)
+                        Margin = new MarginPadding(10)
                     },
-                    new Circle
-                    {
-                        Colour = new Color4(233, 187, 79, 255),
-                        Width = 5,
-                        RelativeSizeAxes = Axes.Y,
-                    }
                 };
             }
         }

From 434feb5ac6b1986d27eb2907ca042be60175759b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 7 Mar 2020 13:26:54 +0900
Subject: [PATCH 0965/1142] Fix alignment on schedule screen

---
 .../Screens/TestSceneScheduleScreen.cs        |  3 ++
 .../Components/DrawableTournamentMatch.cs     | 12 +++----
 .../Screens/Schedule/ScheduleScreen.cs        | 36 ++++++++++++-------
 3 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
index 2277302e98..b240ef3ae5 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs
@@ -2,6 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Screens.Schedule;
 
 namespace osu.Game.Tournament.Tests.Screens
@@ -11,6 +13,7 @@ namespace osu.Game.Tournament.Tests.Screens
         [BackgroundDependencyLoader]
         private void load()
         {
+            Add(new TourneyVideo("main") { RelativeSizeAxes = Axes.Both });
             Add(new ScheduleScreen());
         }
     }
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
index c4b670f059..d0ba9a96f4 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         private readonly bool editor;
         protected readonly FillFlowContainer<DrawableMatchTeam> Flow;
         private readonly Drawable selectionBox;
-        private readonly Drawable currentMatchSelectionBox;
+        protected readonly Drawable CurrentMatchSelectionBox;
         private Bindable<TournamentMatch> globalSelection;
 
         [Resolved(CanBeNull = true)]
@@ -55,11 +55,9 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
                     Colour = Color4.YellowGreen,
                     Child = new Box { RelativeSizeAxes = Axes.Both }
                 },
-                currentMatchSelectionBox = new Container
+                CurrentMatchSelectionBox = new Container
                 {
-                    CornerRadius = 5,
-                    Masking = true,
-                    Scale = new Vector2(1.05f),
+                    Scale = new Vector2(1.05f, 1.1f),
                     RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
@@ -128,9 +126,9 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         private void updateCurrentMatch()
         {
             if (Match.Current.Value)
-                currentMatchSelectionBox.Show();
+                CurrentMatchSelectionBox.Show();
             else
-                currentMatchSelectionBox.Hide();
+                CurrentMatchSelectionBox.Hide();
         }
 
         private bool selected;
diff --git a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
index 9ca1aa626a..634ceb11a5 100644
--- a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
+++ b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
@@ -127,7 +127,7 @@ namespace osu.Game.Tournament.Screens.Schedule
                     new Container
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Height = 0.65f,
+                        Height = 0.74f,
                         Child = new FillFlowContainer
                         {
                             RelativeSizeAxes = Axes.Both,
@@ -162,7 +162,7 @@ namespace osu.Game.Tournament.Screens.Schedule
                         {
                             new FillFlowContainer
                             {
-                                RelativeSizeAxes = Axes.Both,
+                                AutoSizeAxes = Axes.Both,
                                 Direction = FillDirection.Horizontal,
                                 Spacing = new Vector2(30),
                                 Children = new Drawable[]
@@ -207,6 +207,8 @@ namespace osu.Game.Tournament.Screens.Schedule
             {
                 Flow.Direction = FillDirection.Horizontal;
 
+                Scale = new Vector2(0.8f);
+
                 bool conditional = match is ConditionalTournamentMatch;
 
                 if (conditional)
@@ -218,15 +220,16 @@ namespace osu.Game.Tournament.Screens.Schedule
                     {
                         Anchor = Anchor.TopRight,
                         Origin = Anchor.TopLeft,
-                        Colour = Color4.Black,
+                        Colour = OsuColour.Gray(0.7f),
                         Alpha = conditional ? 0.6f : 1,
+                        Font = OsuFont.Torus,
                         Margin = new MarginPadding { Horizontal = 10, Vertical = 5 },
                     });
                     AddInternal(new TournamentSpriteText
                     {
                         Anchor = Anchor.BottomRight,
                         Origin = Anchor.BottomLeft,
-                        Colour = Color4.Black,
+                        Colour = OsuColour.Gray(0.7f),
                         Alpha = conditional ? 0.6f : 1,
                         Margin = new MarginPadding { Horizontal = 10, Vertical = 5 },
                         Text = match.Date.Value.ToUniversalTime().ToString("HH:mm UTC") + (conditional ? " (conditional)" : "")
@@ -243,19 +246,26 @@ namespace osu.Game.Tournament.Screens.Schedule
 
             public ScheduleContainer(string title)
             {
-                Padding = new MarginPadding { Left = 30, Top = 10 };
+                Padding = new MarginPadding { Left = 60, Top = 10 };
                 InternalChildren = new Drawable[]
                 {
-                    new TournamentSpriteTextWithBackground(title.ToUpperInvariant())
+                    new FillFlowContainer
                     {
-                        X = 30,
-                        Scale = new Vector2(0.5f)
-                    },
-                    content = new FillFlowContainer
-                    {
-                        Direction = FillDirection.Vertical,
                         RelativeSizeAxes = Axes.Both,
-                        Margin = new MarginPadding(10)
+                        Direction = FillDirection.Vertical,
+                        Children = new Drawable[]
+                        {
+                            new TournamentSpriteTextWithBackground(title.ToUpperInvariant())
+                            {
+                                Scale = new Vector2(0.5f)
+                            },
+                            content = new FillFlowContainer
+                            {
+                                Direction = FillDirection.Vertical,
+                                RelativeSizeAxes = Axes.Both,
+                                Margin = new MarginPadding(10)
+                            },
+                        }
                     },
                 };
             }

From 9934a97bd0a9dc3a7eb97113b7a74af88fdb004a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 7 Mar 2020 16:31:28 +0900
Subject: [PATCH 0966/1142] Limit upcoming matches displayed to 8

---
 osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
index 634ceb11a5..01d6d33fee 100644
--- a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
+++ b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
@@ -116,7 +116,7 @@ namespace osu.Game.Tournament.Screens.Schedule
                                .SelectMany(m => m.ConditionalMatches.Where(cp => m.Acronyms.TrueForAll(a => cp.Acronyms.Contains(a))));
 
             upcoming = upcoming.Concat(conditionals);
-            upcoming = upcoming.OrderBy(p => p.Date.Value).Take(12);
+            upcoming = upcoming.OrderBy(p => p.Date.Value).Take(8);
 
             mainContainer.Child = new FillFlowContainer
             {

From 6c0a27e0b956e0ff955c77be57981614a680be6e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 7 Mar 2020 16:38:50 +0900
Subject: [PATCH 0967/1142] Improve look of selected match

---
 .../Screens/Ladder/Components/DrawableTournamentMatch.cs        | 2 +-
 osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs          | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
index d0ba9a96f4..320e76775a 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
                     Alpha = 0,
-                    Colour = Color4.OrangeRed,
+                    Colour = Color4.White,
                     Child = new Box { RelativeSizeAxes = Axes.Both }
                 },
                 Flow = new FillFlowContainer<DrawableMatchTeam>
diff --git a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
index 01d6d33fee..27a1fe98d2 100644
--- a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
+++ b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
@@ -209,6 +209,8 @@ namespace osu.Game.Tournament.Screens.Schedule
 
                 Scale = new Vector2(0.8f);
 
+                CurrentMatchSelectionBox.Scale = new Vector2(1.02f, 1.15f);
+
                 bool conditional = match is ConditionalTournamentMatch;
 
                 if (conditional)

From 8ab9ca77d60b4d8c065454b5f495ec87e75bc0cc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 8 Mar 2020 15:06:06 +0900
Subject: [PATCH 0968/1142] Fix next match timer not updating

---
 .../Screens/Schedule/ScheduleScreen.cs        | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
index 27a1fe98d2..0fcec645e3 100644
--- a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
+++ b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Linq;
-using Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -185,12 +184,24 @@ namespace osu.Game.Tournament.Screens.Schedule
                                         Text = match.NewValue.Team1.Value?.FullName + " vs " + match.NewValue.Team2.Value?.FullName,
                                         Font = OsuFont.Torus.With(size: 24, weight: FontWeight.SemiBold)
                                     },
-                                    new TournamentSpriteText
+                                    new FillFlowContainer
                                     {
+                                        AutoSizeAxes = Axes.Both,
+                                        Direction = FillDirection.Horizontal,
                                         Anchor = Anchor.CentreLeft,
                                         Origin = Anchor.CentreLeft,
-                                        Text = $"Starting {match.NewValue.Date.Value.Humanize()}",
-                                        Font = OsuFont.Torus.With(size: 24, weight: FontWeight.Regular)
+                                        Children = new Drawable[]
+                                        {
+                                            new TournamentSpriteText
+                                            {
+                                                Text = "Starting ",
+                                                Font = OsuFont.Torus.With(size: 24, weight: FontWeight.Regular)
+                                            },
+                                            new DrawableDate(match.NewValue.Date.Value)
+                                            {
+                                                Font = OsuFont.Torus.With(size: 24, weight: FontWeight.Regular)
+                                            }
+                                        }
                                     },
                                 }
                             },

From 3ac599246dc816247c7790aec8a95e0fc50aa62b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Mar 2020 16:08:24 +0900
Subject: [PATCH 0969/1142] Initial pass of seeding screen design update

---
 .../Screens/TeamIntro/SeedingScreen.cs        | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
index 513d84b594..d48e396b89 100644
--- a/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamIntro/SeedingScreen.cs
@@ -15,7 +15,6 @@ using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Ladder.Components;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Tournament.Screens.TeamIntro
 {
@@ -140,9 +139,9 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                             Spacing = new Vector2(5),
                             Children = new Drawable[]
                             {
-                                new TournamentSpriteText { Text = beatmap.BeatmapInfo.Metadata.Title, Colour = Color4.Black, },
-                                new TournamentSpriteText { Text = "by", Colour = Color4.Black, Font = OsuFont.Torus.With(weight: FontWeight.Regular) },
-                                new TournamentSpriteText { Text = beatmap.BeatmapInfo.Metadata.Artist, Colour = Color4.Black, Font = OsuFont.Torus.With(weight: FontWeight.Regular) },
+                                new TournamentSpriteText { Text = beatmap.BeatmapInfo.Metadata.Title, Colour = TournamentGame.TEXT_COLOUR, },
+                                new TournamentSpriteText { Text = "by", Colour = TournamentGame.TEXT_COLOUR, Font = OsuFont.Torus.With(weight: FontWeight.Regular) },
+                                new TournamentSpriteText { Text = beatmap.BeatmapInfo.Metadata.Artist, Colour = TournamentGame.TEXT_COLOUR, Font = OsuFont.Torus.With(weight: FontWeight.Regular) },
                             }
                         },
                         new FillFlowContainer
@@ -154,8 +153,8 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                             Spacing = new Vector2(40),
                             Children = new Drawable[]
                             {
-                                new TournamentSpriteText { Text = beatmap.Score.ToString("#,0"), Colour = Color4.Black, Width = 80 },
-                                new TournamentSpriteText { Text = "#" + beatmap.Seed.Value.ToString("#,0"), Colour = Color4.Black, Font = OsuFont.Torus.With(weight: FontWeight.Regular) },
+                                new TournamentSpriteText { Text = beatmap.Score.ToString("#,0"), Colour = TournamentGame.TEXT_COLOUR, Width = 80 },
+                                new TournamentSpriteText { Text = "#" + beatmap.Seed.Value.ToString("#,0"), Colour = TournamentGame.TEXT_COLOUR, Font = OsuFont.Torus.With(weight: FontWeight.Regular) },
                             }
                         },
                     };
@@ -204,7 +203,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                                         new Box
                                         {
                                             RelativeSizeAxes = Axes.Both,
-                                            Colour = Color4.Black,
+                                            Colour = TournamentGame.TEXT_COLOUR,
                                         },
                                         new TournamentSpriteText
                                         {
@@ -260,20 +259,18 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                     AutoSizeAxes = Axes.Y;
                     RelativeSizeAxes = Axes.X;
 
-                    var colour = OsuColour.Gray(0.3f);
-
                     InternalChildren = new Drawable[]
                     {
                         new TournamentSpriteText
                         {
                             Text = left,
-                            Colour = colour,
-                            Font = OsuFont.Torus.With(size: 22),
+                            Colour = TournamentGame.TEXT_COLOUR,
+                            Font = OsuFont.Torus.With(size: 22, weight: FontWeight.SemiBold),
                         },
                         new TournamentSpriteText
                         {
                             Text = right,
-                            Colour = colour,
+                            Colour = TournamentGame.TEXT_COLOUR,
                             Anchor = Anchor.TopRight,
                             Origin = Anchor.TopLeft,
                             Font = OsuFont.Torus.With(size: 22, weight: FontWeight.Regular),
@@ -305,7 +302,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                             {
                                 Text = team?.FullName.Value ?? "???",
                                 Font = OsuFont.Torus.With(size: 32, weight: FontWeight.SemiBold),
-                                Colour = Color4.Black,
+                                Colour = TournamentGame.TEXT_COLOUR,
                             },
                         }
                     };

From 3a3a2ad2a71126973caac66e7b98ee7acf938caa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 8 Mar 2020 14:47:29 +0900
Subject: [PATCH 0970/1142] Fix video looping not propagating when set too
 early in initialisation

---
 osu.Game.Tournament/Components/TourneyVideo.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Components/TourneyVideo.cs b/osu.Game.Tournament/Components/TourneyVideo.cs
index 7d2eaff515..786b7b3c67 100644
--- a/osu.Game.Tournament/Components/TourneyVideo.cs
+++ b/osu.Game.Tournament/Components/TourneyVideo.cs
@@ -38,7 +38,8 @@ namespace osu.Game.Tournament.Components
                 {
                     RelativeSizeAxes = Axes.Both,
                     FillMode = FillMode.Fit,
-                    Clock = new FramedClock(manualClock = new ManualClock())
+                    Clock = new FramedClock(manualClock = new ManualClock()),
+                    Loop = loop,
                 };
             }
             else if (drawFallbackGradient)
@@ -51,10 +52,13 @@ namespace osu.Game.Tournament.Components
             }
         }
 
+        private bool loop;
+
         public bool Loop
         {
             set
             {
+                loop = value;
                 if (video != null)
                     video.Loop = value;
             }

From a85cef2f064640f6a5d7029b65aded95e9ed353b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 8 Mar 2020 14:23:13 +0900
Subject: [PATCH 0971/1142] Reset win screen video on display; add fade in
 transition

---
 osu.Game.Tournament/Components/TourneyVideo.cs  |  2 ++
 .../Screens/TeamWin/TeamWinScreen.cs            | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Components/TourneyVideo.cs b/osu.Game.Tournament/Components/TourneyVideo.cs
index 7d2eaff515..9b1350ca23 100644
--- a/osu.Game.Tournament/Components/TourneyVideo.cs
+++ b/osu.Game.Tournament/Components/TourneyVideo.cs
@@ -60,6 +60,8 @@ namespace osu.Game.Tournament.Components
             }
         }
 
+        public void Reset() => manualClock.CurrentTime = 0;
+
         protected override void Update()
         {
             base.Update();
diff --git a/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs b/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
index 8b3f4488d0..3870f486e1 100644
--- a/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamWin/TeamWinScreen.cs
@@ -62,7 +62,9 @@ namespace osu.Game.Tournament.Screens.TeamWin
             update();
         }
 
-        private void update()
+        private bool firstDisplay = true;
+
+        private void update() => Schedule(() =>
         {
             var match = currentMatch.Value;
 
@@ -75,6 +77,15 @@ namespace osu.Game.Tournament.Screens.TeamWin
             redWinVideo.Alpha = match.WinnerColour == TeamColour.Red ? 1 : 0;
             blueWinVideo.Alpha = match.WinnerColour == TeamColour.Blue ? 1 : 0;
 
+            if (firstDisplay)
+            {
+                if (match.WinnerColour == TeamColour.Red)
+                    redWinVideo.Reset();
+                else
+                    blueWinVideo.Reset();
+                firstDisplay = false;
+            }
+
             mainContainer.Children = new Drawable[]
             {
                 new DrawableTeamFlag(match.Winner)
@@ -108,6 +119,8 @@ namespace osu.Game.Tournament.Screens.TeamWin
                     }
                 },
             };
-        }
+            mainContainer.FadeOut();
+            mainContainer.Delay(2000).FadeIn(1600, Easing.OutQuint);
+        });
     }
 }

From 5d5910822bc6d45d595f2eb83332b17bdfeb3743 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Mar 2020 16:08:12 +0900
Subject: [PATCH 0972/1142] Initial pass of intro screen design update

---
 .../Screens/TeamIntro/TeamIntroScreen.cs      | 153 +++---------------
 1 file changed, 22 insertions(+), 131 deletions(-)

diff --git a/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
index d584c21058..2daf9d35f3 100644
--- a/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
@@ -6,7 +6,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Platform;
-using osu.Game.Graphics;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
 using osuTK;
@@ -49,141 +48,33 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                 return;
             }
 
+            const float y_flag_offset = 288;
+
+            const float y_offset = 460;
+
             mainContainer.Children = new Drawable[]
             {
-                new TeamWithPlayers(match.NewValue.Team1.Value, true)
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Width = 0.5f,
-                    Height = 0.6f,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.CentreRight
-                },
-                new TeamWithPlayers(match.NewValue.Team2.Value)
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Width = 0.5f,
-                    Height = 0.6f,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.CentreLeft
-                },
                 new RoundDisplay(match.NewValue)
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    Height = 0.25f,
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
-                    Y = 180,
-                }
+                    Position = new Vector2(100, 100)
+                },
+                new DrawableTeamFlag(match.NewValue.Team1.Value)
+                {
+                    Position = new Vector2(160, y_flag_offset),
+                },
+                new DrawableTeamWithPlayers(match.NewValue.Team1.Value, TeamColour.Red)
+                {
+                    Position = new Vector2(160, y_offset),
+                },
+                new DrawableTeamFlag(match.NewValue.Team2.Value)
+                {
+                    Position = new Vector2(740, y_flag_offset),
+                },
+                new DrawableTeamWithPlayers(match.NewValue.Team2.Value, TeamColour.Blue)
+                {
+                    Position = new Vector2(740, y_offset),
+                },
             };
         }
-
-        private class RoundDisplay : CompositeDrawable
-        {
-            public RoundDisplay(TournamentMatch match)
-            {
-                InternalChildren = new Drawable[]
-                {
-                    new FillFlowContainer
-                    {
-                        AutoSizeAxes = Axes.Both,
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
-                        Direction = FillDirection.Vertical,
-                        Spacing = new Vector2(0, 10),
-                        Children = new Drawable[]
-                        {
-                            new TournamentSpriteText
-                            {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
-                                Colour = OsuColour.Gray(0.33f),
-                                Text = match.Round.Value?.Name.Value ?? "Unknown Round",
-                                Font = OsuFont.Torus.With(size: 26, weight: FontWeight.Light)
-                            },
-                        }
-                    }
-                };
-            }
-        }
-
-        private class TeamWithPlayers : CompositeDrawable
-        {
-            public TeamWithPlayers(TournamentTeam team, bool left = false)
-            {
-                FillFlowContainer players;
-                var colour = left ? TournamentGame.COLOUR_RED : TournamentGame.COLOUR_BLUE;
-                InternalChildren = new Drawable[]
-                {
-                    new TeamDisplay(team)
-                    {
-                        Anchor = left ? Anchor.CentreRight : Anchor.CentreLeft,
-                        Origin = Anchor.TopCentre,
-                        RelativePositionAxes = Axes.Both,
-                        X = (left ? -1 : 1) * 0.3145f,
-                        Y = -0.077f,
-                    },
-                    players = new FillFlowContainer
-                    {
-                        Direction = FillDirection.Vertical,
-                        AutoSizeAxes = Axes.Both,
-                        Spacing = new Vector2(0, 5),
-                        Padding = new MarginPadding(20),
-                        Anchor = left ? Anchor.CentreRight : Anchor.CentreLeft,
-                        Origin = left ? Anchor.CentreRight : Anchor.CentreLeft,
-                        RelativePositionAxes = Axes.Both,
-                        X = (left ? -1 : 1) * 0.58f,
-                    },
-                };
-
-                if (team != null)
-                {
-                    foreach (var p in team.Players)
-                    {
-                        players.Add(new TournamentSpriteText
-                        {
-                            Text = p.Username,
-                            Font = OsuFont.Torus.With(size: 24),
-                            Colour = colour,
-                            Anchor = left ? Anchor.CentreRight : Anchor.CentreLeft,
-                            Origin = left ? Anchor.CentreRight : Anchor.CentreLeft,
-                        });
-                    }
-                }
-            }
-
-            private class TeamDisplay : DrawableTournamentTeam
-            {
-                public TeamDisplay(TournamentTeam team)
-                    : base(team)
-                {
-                    AutoSizeAxes = Axes.Both;
-
-                    Flag.Anchor = Flag.Origin = Anchor.TopCentre;
-                    Flag.RelativeSizeAxes = Axes.None;
-                    Flag.Size = new Vector2(300, 200);
-                    Flag.Scale = new Vector2(0.32f);
-
-                    InternalChild = new FillFlowContainer
-                    {
-                        AutoSizeAxes = Axes.Both,
-                        Direction = FillDirection.Vertical,
-                        Spacing = new Vector2(160),
-                        Children = new Drawable[]
-                        {
-                            Flag,
-                            new TournamentSpriteText
-                            {
-                                Text = team?.FullName.Value ?? "???",
-                                Font = OsuFont.Torus.With(size: 20, weight: FontWeight.Regular),
-                                Colour = OsuColour.Gray(0.2f),
-                                Origin = Anchor.TopCentre,
-                                Anchor = Anchor.TopCentre,
-                            },
-                        }
-                    };
-                }
-            }
-        }
     }
 }

From 8e4b15aaa5f0a4e3aeaf66a85d628ecf9f7df54d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 8 Mar 2020 17:43:55 +0900
Subject: [PATCH 0973/1142] Update test scene

---
 osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
index ae7d9d853a..34fa7a4997 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Game.Tournament.Components;
+using osu.Game.Tournament.Screens;
 using osu.Game.Tournament.Screens.Gameplay;
 using osu.Game.Tournament.Screens.Gameplay.Components;
 
@@ -13,7 +14,7 @@ namespace osu.Game.Tournament.Tests.Screens
     public class TestSceneGameplayScreen : TournamentTestScene
     {
         [Cached]
-        private TournamentMatchChatDisplay chat = new TournamentMatchChatDisplay();
+        private TournamentMatchChatDisplay chat = new TournamentMatchChatDisplay { Width = 0.5f };
 
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -22,6 +23,8 @@ namespace osu.Game.Tournament.Tests.Screens
             typeof(TeamDisplay),
             typeof(MatchHeader),
             typeof(MatchScoreDisplay),
+            typeof(BeatmapInfoScreen),
+            typeof(SongBar),
         };
 
         [BackgroundDependencyLoader]

From 0102aaf32a53e6c2a0714ca79a85ca7b24fe949d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 8 Mar 2020 18:11:57 +0900
Subject: [PATCH 0974/1142] Move chat expand/contract logic local to tournament

---
 .../Components/TournamentMatchChatDisplay.cs         |  4 ++++
 osu.Game/Online/Chat/StandAloneChatDisplay.cs        | 12 ------------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs b/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
index 48c5b9bd35..f9cd18be2c 100644
--- a/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
+++ b/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
@@ -66,6 +66,10 @@ namespace osu.Game.Tournament.Components
             }
         }
 
+        public void Expand() => this.FadeIn(300);
+
+        public void Contract() => this.FadeOut(200);
+
         protected override ChatLine CreateMessage(Message message) => new MatchMessage(message);
 
         protected class MatchMessage : StandAloneMessage
diff --git a/osu.Game/Online/Chat/StandAloneChatDisplay.cs b/osu.Game/Online/Chat/StandAloneChatDisplay.cs
index 881dd19d8e..0914f688e9 100644
--- a/osu.Game/Online/Chat/StandAloneChatDisplay.cs
+++ b/osu.Game/Online/Chat/StandAloneChatDisplay.cs
@@ -92,18 +92,6 @@ namespace osu.Game.Online.Chat
             textbox.Text = string.Empty;
         }
 
-        public void Expand()
-        {
-            this.FadeIn(300);
-            this.MoveToY(0, 500, Easing.OutQuint);
-        }
-
-        public void Contract()
-        {
-            this.FadeOut(200);
-            this.MoveToY(100, 500, Easing.In);
-        }
-
         protected virtual ChatLine CreateMessage(Message message) => new StandAloneMessage(message);
 
         private void channelChanged(ValueChangedEvent<Channel> e)

From 3744aaf55f228462c7b1227f1034fb137197eaa1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 8 Mar 2020 18:16:32 +0900
Subject: [PATCH 0975/1142] Update vertical alignment of chroma area

---
 osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index ad00dffac7..4d770855cd 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -52,9 +52,9 @@ namespace osu.Game.Tournament.Screens.Gameplay
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
-                    Y = 5,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
+                    Y = 110,
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
                     Children = new Drawable[]
                     {
                         new Box

From 8b0b910196f693343a7feb3a21be0c49e0a6de85 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 8 Mar 2020 14:46:09 +0900
Subject: [PATCH 0976/1142] Update song / chat / beatmap info display to
 reflect new design

---
 .../Screens/TestSceneGameplayScreen.cs        |   1 +
 osu.Game.Tournament/Components/SongBar.cs     | 204 ++++++++----------
 .../Components/TournamentBeatmapPanel.cs      |   8 +-
 .../Components/TournamentMatchChatDisplay.cs  |   3 +-
 .../Screens/BeatmapInfoScreen.cs              |   1 +
 osu.Game.Tournament/TournamentSceneManager.cs |   7 +-
 6 files changed, 107 insertions(+), 117 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
index 34fa7a4997..1e20687a87 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
@@ -35,3 +35,4 @@ namespace osu.Game.Tournament.Tests.Screens
         }
     }
 }
+
diff --git a/osu.Game.Tournament/Components/SongBar.cs b/osu.Game.Tournament/Components/SongBar.cs
index 48ea36a8f3..8d766ec9ba 100644
--- a/osu.Game.Tournament/Components/SongBar.cs
+++ b/osu.Game.Tournament/Components/SongBar.cs
@@ -4,10 +4,8 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Beatmaps;
@@ -24,6 +22,8 @@ namespace osu.Game.Tournament.Components
     {
         private BeatmapInfo beatmap;
 
+        private const float height = 145;
+
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; }
 
@@ -52,15 +52,7 @@ namespace osu.Game.Tournament.Components
             }
         }
 
-        private Container panelContents;
-        private Container innerPanel;
-        private Container outerPanel;
-        private TournamentBeatmapPanel panel;
-
-        private float panelWidth => expanded ? 0.6f : 1;
-
-        private const float main_width = 0.97f;
-        private const float inner_panel_width = 0.7f;
+        private FillFlowContainer flow;
 
         private bool expanded;
 
@@ -70,86 +62,27 @@ namespace osu.Game.Tournament.Components
             set
             {
                 expanded = value;
-                panel?.ResizeWidthTo(panelWidth, 800, Easing.OutQuint);
-
-                if (expanded)
-                {
-                    innerPanel.ResizeWidthTo(inner_panel_width, 800, Easing.OutQuint);
-                    outerPanel.ResizeWidthTo(main_width, 800, Easing.OutQuint);
-                }
-                else
-                {
-                    innerPanel.ResizeWidthTo(1, 800, Easing.OutQuint);
-                    outerPanel.ResizeWidthTo(0.25f, 800, Easing.OutQuint);
-                }
+                flow.Direction = expanded ? FillDirection.Full : FillDirection.Vertical;
             }
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            RelativeSizeAxes = Axes.Both;
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
 
             InternalChildren = new Drawable[]
             {
-                outerPanel = new Container
+                flow = new FillFlowContainer
                 {
-                    Masking = true,
-                    EdgeEffect = new EdgeEffectParameters
-                    {
-                        Colour = Color4.Black.Opacity(0.2f),
-                        Type = EdgeEffectType.Shadow,
-                        Radius = 5,
-                    },
                     RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    LayoutDuration = 500,
+                    LayoutEasing = Easing.OutQuint,
+                    Direction = FillDirection.Full,
                     Anchor = Anchor.BottomRight,
                     Origin = Anchor.BottomRight,
-                    RelativePositionAxes = Axes.X,
-                    X = -(1 - main_width) / 2,
-                    Y = -10,
-                    Width = main_width,
-                    Height = TournamentBeatmapPanel.HEIGHT,
-                    CornerRadius = TournamentBeatmapPanel.HEIGHT / 2,
-                    CornerExponent = 2,
-                    Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = OsuColour.Gray(0.93f),
-                        },
-                        new OsuLogo
-                        {
-                            Triangles = false,
-                            Colour = OsuColour.Gray(0.33f),
-                            Scale = new Vector2(0.08f),
-                            Margin = new MarginPadding(50),
-                            Anchor = Anchor.CentreRight,
-                            Origin = Anchor.CentreRight,
-                        },
-                        innerPanel = new Container
-                        {
-                            Masking = true,
-                            CornerRadius = TournamentBeatmapPanel.HEIGHT / 2,
-                            CornerExponent = 2,
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            RelativeSizeAxes = Axes.Both,
-                            Width = inner_panel_width,
-                            Children = new Drawable[]
-                            {
-                                new Box
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Colour = OsuColour.Gray(0.86f),
-                                },
-                                panelContents = new Container
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                }
-                            }
-                        }
-                    }
                 }
             };
 
@@ -160,7 +93,7 @@ namespace osu.Game.Tournament.Components
         {
             if (beatmap == null)
             {
-                panelContents.Clear();
+                flow.Clear();
                 return;
             }
 
@@ -219,34 +152,86 @@ namespace osu.Game.Tournament.Components
                     break;
             }
 
-            panelContents.Children = new Drawable[]
+            flow.Children = new Drawable[]
             {
-                new DiffPiece(("Length", TimeSpan.FromMilliseconds(length).ToString(@"mm\:ss")))
+                new Container
                 {
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.BottomLeft,
+                    RelativeSizeAxes = Axes.X,
+                    Height = height / 2,
+                    Width = 0.5f,
+                    Anchor = Anchor.BottomRight,
+                    Origin = Anchor.BottomRight,
+
+                    Children = new Drawable[]
+                    {
+                        new GridContainer
+                        {
+                            RelativeSizeAxes = Axes.Both,
+
+                            Content = new[]
+                            {
+                                new Drawable[]
+                                {
+                                    new FillFlowContainer
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y,
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                        Direction = FillDirection.Vertical,
+                                        Children = new Drawable[]
+                                        {
+                                            new DiffPiece(stats),
+                                            new DiffPiece(("Star Rating", $"{beatmap.StarDifficulty:0.#}{srExtra}"))
+                                        }
+                                    },
+                                    new FillFlowContainer
+                                    {
+                                        RelativeSizeAxes = Axes.X,
+                                        AutoSizeAxes = Axes.Y,
+                                        Anchor = Anchor.Centre,
+                                        Origin = Anchor.Centre,
+                                        Direction = FillDirection.Vertical,
+                                        Children = new Drawable[]
+                                        {
+                                            new DiffPiece(("Length", TimeSpan.FromMilliseconds(length).ToString(@"mm\:ss"))),
+                                            new DiffPiece(("BPM", $"{bpm:0.#}"))
+                                        }
+                                    },
+                                    new Container
+                                    {
+                                        RelativeSizeAxes = Axes.Both,
+                                        Children = new Drawable[]
+                                        {
+                                            new Box
+                                            {
+                                                Colour = Color4.Black,
+                                                RelativeSizeAxes = Axes.Both,
+                                                Alpha = 0.1f,
+                                            },
+                                            new OsuLogo
+                                            {
+                                                Triangles = false,
+                                                Scale = new Vector2(0.08f),
+                                                Margin = new MarginPadding(50),
+                                                X = -10,
+                                                Anchor = Anchor.CentreRight,
+                                                Origin = Anchor.CentreRight,
+                                            },
+                                        }
+                                    },
+                                },
+                            }
+                        }
+                    }
                 },
-                new DiffPiece(("BPM", $"{bpm:0.#}"))
+                new TournamentBeatmapPanel(beatmap)
                 {
-                    Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.TopLeft
-                },
-                new DiffPiece(stats)
-                {
-                    Anchor = Anchor.CentreRight,
-                    Origin = Anchor.BottomRight
-                },
-                new DiffPiece(("Star Rating", $"{beatmap.StarDifficulty:0.#}{srExtra}"))
-                {
-                    Anchor = Anchor.CentreRight,
-                    Origin = Anchor.TopRight
-                },
-                panel = new TournamentBeatmapPanel(beatmap)
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    RelativeSizeAxes = Axes.Both,
-                    Size = new Vector2(panelWidth, 1)
+                    RelativeSizeAxes = Axes.X,
+                    Width = 0.5f,
+                    Height = height / 2,
+                    Anchor = Anchor.BottomRight,
+                    Origin = Anchor.BottomRight,
                 }
             };
         }
@@ -258,10 +243,9 @@ namespace osu.Game.Tournament.Components
                 Margin = new MarginPadding { Horizontal = 15, Vertical = 1 };
                 AutoSizeAxes = Axes.Both;
 
-                static void cp(SpriteText s, Color4 colour)
+                static void cp(SpriteText s, bool bold)
                 {
-                    s.Colour = colour;
-                    s.Font = OsuFont.Torus.With(weight: FontWeight.Bold, size: 15);
+                    s.Font = OsuFont.Torus.With(weight: bold ? FontWeight.Bold : FontWeight.Regular, size: 15);
                 }
 
                 for (var i = 0; i < tuples.Length; i++)
@@ -272,14 +256,14 @@ namespace osu.Game.Tournament.Components
                     {
                         AddText(" / ", s =>
                         {
-                            cp(s, OsuColour.Gray(0.33f));
+                            cp(s, false);
                             s.Spacing = new Vector2(-2, 0);
                         });
                     }
 
-                    AddText(new TournamentSpriteText { Text = heading }, s => cp(s, OsuColour.Gray(0.33f)));
-                    AddText(" ", s => cp(s, OsuColour.Gray(0.33f)));
-                    AddText(new TournamentSpriteText { Text = content }, s => cp(s, OsuColour.Gray(0.5f)));
+                    AddText(new TournamentSpriteText { Text = heading }, s => cp(s, false));
+                    AddText(" ", s => cp(s, false));
+                    AddText(new TournamentSpriteText { Text = content }, s => cp(s, true));
                 }
             }
         }
diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index 394ffe304e..e09af06c89 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -70,8 +70,8 @@ namespace osu.Game.Tournament.Components
                 new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
                     Padding = new MarginPadding(vertical_padding),
                     Direction = FillDirection.Vertical,
                     Children = new Drawable[]
@@ -137,8 +137,8 @@ namespace osu.Game.Tournament.Components
                     Texture = textures.Get($"mods/{mods}"),
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,
-                    Margin = new MarginPadding(20),
-                    Scale = new Vector2(0.5f)
+                    Margin = new MarginPadding(10),
+                    Scale = new Vector2(0.8f)
                 });
             }
         }
diff --git a/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs b/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
index f4fd27784c..8eb1c98ba0 100644
--- a/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
+++ b/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
@@ -9,7 +9,6 @@ using osu.Game.Online.Chat;
 using osu.Game.Overlays.Chat;
 using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Models;
-using osuTK;
 
 namespace osu.Game.Tournament.Components
 {
@@ -22,7 +21,7 @@ namespace osu.Game.Tournament.Components
         public TournamentMatchChatDisplay()
         {
             RelativeSizeAxes = Axes.X;
-            Size = new Vector2(0.5f, 142);
+            Height = 144;
             Anchor = Anchor.BottomLeft;
             Origin = Anchor.BottomLeft;
 
diff --git a/osu.Game.Tournament/Screens/BeatmapInfoScreen.cs b/osu.Game.Tournament/Screens/BeatmapInfoScreen.cs
index fccd35ca9e..0a3163ef43 100644
--- a/osu.Game.Tournament/Screens/BeatmapInfoScreen.cs
+++ b/osu.Game.Tournament/Screens/BeatmapInfoScreen.cs
@@ -21,6 +21,7 @@ namespace osu.Game.Tournament.Screens
             {
                 Anchor = Anchor.BottomRight,
                 Origin = Anchor.BottomRight,
+                Depth = float.MinValue,
             });
         }
 
diff --git a/osu.Game.Tournament/TournamentSceneManager.cs b/osu.Game.Tournament/TournamentSceneManager.cs
index 287e25b1fb..ef8d16011d 100644
--- a/osu.Game.Tournament/TournamentSceneManager.cs
+++ b/osu.Game.Tournament/TournamentSceneManager.cs
@@ -194,9 +194,14 @@ namespace osu.Game.Tournament
 
             switch (currentScreen)
             {
-                case GameplayScreen _:
                 case MapPoolScreen _:
                     chatContainer.FadeIn(TournamentScreen.FADE_DELAY);
+                    chatContainer.ResizeWidthTo(1, 500, Easing.OutQuint);
+                    break;
+
+                case GameplayScreen _:
+                    chatContainer.FadeIn(TournamentScreen.FADE_DELAY);
+                    chatContainer.ResizeWidthTo(0.5f, 500, Easing.OutQuint);
                     break;
 
                 default:

From 9138bafbeb5012f6af842731fd4383e5edecadaf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 8 Mar 2020 18:40:13 +0900
Subject: [PATCH 0977/1142] Fix alignment of flags on team intro screen

---
 osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
index 2daf9d35f3..6c2848897b 100644
--- a/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
@@ -48,7 +48,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                 return;
             }
 
-            const float y_flag_offset = 288;
+            const float y_flag_offset = 292;
 
             const float y_offset = 460;
 
@@ -60,11 +60,11 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                 },
                 new DrawableTeamFlag(match.NewValue.Team1.Value)
                 {
-                    Position = new Vector2(160, y_flag_offset),
+                    Position = new Vector2(165, y_flag_offset),
                 },
                 new DrawableTeamWithPlayers(match.NewValue.Team1.Value, TeamColour.Red)
                 {
-                    Position = new Vector2(160, y_offset),
+                    Position = new Vector2(165, y_offset),
                 },
                 new DrawableTeamFlag(match.NewValue.Team2.Value)
                 {

From 2fe32b7d2b3b584335101c8036a32cbeb108d542 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 8 Mar 2020 19:41:22 +0900
Subject: [PATCH 0978/1142] Remove LadderInfo requirement in DrawableMatchTeam

---
 .../Screens/Ladder/Components/DrawableMatchTeam.cs            | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
index 88d7b95b0c..38e906e07b 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
@@ -37,11 +37,13 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         private readonly Func<bool> isWinner;
         private LadderEditorScreen ladderEditor;
 
-        [Resolved]
+        [Resolved(canBeNull: true)]
         private LadderInfo ladderInfo { get; set; }
 
         private void setCurrent()
         {
+            if (ladderInfo == null) return;
+
             //todo: tournamentgamebase?
             if (ladderInfo.CurrentMatch.Value != null)
                 ladderInfo.CurrentMatch.Value.Current.Value = false;

From cc5cae4db995d6b680022e11b1ba1f272983d3bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 8 Mar 2020 14:08:49 +0100
Subject: [PATCH 0979/1142] Do not transition to result screen

---
 osu.Game/Tests/Visual/ModPerfectTestScene.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Tests/Visual/ModPerfectTestScene.cs b/osu.Game/Tests/Visual/ModPerfectTestScene.cs
index 4bc00425bf..8b8070caf1 100644
--- a/osu.Game/Tests/Visual/ModPerfectTestScene.cs
+++ b/osu.Game/Tests/Visual/ModPerfectTestScene.cs
@@ -36,6 +36,11 @@ namespace osu.Game.Tests.Visual
 
         private class PerfectModTestPlayer : TestPlayer
         {
+            public PerfectModTestPlayer()
+                : base(showResults: false)
+            {
+            }
+
             protected override bool AllowFail => true;
 
             public bool CheckFailed(bool failed)

From c803de2b499a44a8dde5eba44961ddcea684fb4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 8 Mar 2020 14:18:45 +0100
Subject: [PATCH 0980/1142] Fix player instantiation

Since ModTestScene.CreatePlayer would apply mods in addition to
instantiating the player, overriding it could lead to mistakenly also
overriding the code that was supposed to set up the test via
currentTestData.

Make ModTestScene.CreatePlayer sealed, which ensures that mod &
autoplay changes are applied, and expose ModTestScene.CreateModPlayer
instead which has the expected semantics.
---
 osu.Game/Tests/Visual/ModPerfectTestScene.cs | 2 +-
 osu.Game/Tests/Visual/ModTestScene.cs        | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Tests/Visual/ModPerfectTestScene.cs b/osu.Game/Tests/Visual/ModPerfectTestScene.cs
index 8b8070caf1..d6255d2478 100644
--- a/osu.Game/Tests/Visual/ModPerfectTestScene.cs
+++ b/osu.Game/Tests/Visual/ModPerfectTestScene.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual
             PassCondition = () => ((PerfectModTestPlayer)Player).CheckFailed(shouldMiss && testCaseData.FailOnMiss)
         });
 
-        protected override TestPlayer CreatePlayer(Ruleset ruleset) => new PerfectModTestPlayer();
+        protected override TestPlayer CreateModPlayer(Ruleset ruleset) => new PerfectModTestPlayer();
 
         private class PerfectModTestPlayer : TestPlayer
         {
diff --git a/osu.Game/Tests/Visual/ModTestScene.cs b/osu.Game/Tests/Visual/ModTestScene.cs
index eb418304d9..8b41fb5075 100644
--- a/osu.Game/Tests/Visual/ModTestScene.cs
+++ b/osu.Game/Tests/Visual/ModTestScene.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Tests.Visual
 
         protected sealed override IBeatmap CreateBeatmap(RulesetInfo ruleset) => currentTestData?.Beatmap ?? base.CreateBeatmap(ruleset);
 
-        protected override TestPlayer CreatePlayer(Ruleset ruleset)
+        protected sealed override TestPlayer CreatePlayer(Ruleset ruleset)
         {
             var mods = new List<Mod>(SelectedMods.Value);
 
@@ -57,9 +57,11 @@ namespace osu.Game.Tests.Visual
 
             SelectedMods.Value = mods;
 
-            return new ModTestPlayer(AllowFail);
+            return CreateModPlayer(ruleset);
         }
 
+        protected virtual TestPlayer CreateModPlayer(Ruleset ruleset) => new ModTestPlayer(AllowFail);
+
         protected class ModTestPlayer : TestPlayer
         {
             protected override bool AllowFail { get; }

From 0953751d242d4b6a850c4dbd9066d0de1aad125a Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 8 Mar 2020 15:51:57 +0100
Subject: [PATCH 0981/1142] Clamp relative position of judgement ticks in range
 [0;1]

---
 osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
index 208bdd17ad..c7f763e9ab 100644
--- a/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
+++ b/osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
@@ -224,7 +225,7 @@ namespace osu.Game.Screens.Play.HUD.HitErrorMeters
                 , arrow_move_duration, Easing.Out);
         }
 
-        private float getRelativeJudgementPosition(double value) => (float)((value / maxHitWindow) + 1) / 2;
+        private float getRelativeJudgementPosition(double value) => Math.Clamp((float)((value / maxHitWindow) + 1) / 2, 0, 1);
 
         private class JudgementLine : CompositeDrawable
         {

From 414e704d37c456ee10ac333f9e574c17607cd502 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 9 Mar 2020 00:18:28 +0900
Subject: [PATCH 0982/1142] Use existing local function
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game.Tournament/Components/DrawableTeamWithPlayers.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game.Tournament/Components/DrawableTeamWithPlayers.cs b/osu.Game.Tournament/Components/DrawableTeamWithPlayers.cs
index 0b80bef903..e949bf9881 100644
--- a/osu.Game.Tournament/Components/DrawableTeamWithPlayers.cs
+++ b/osu.Game.Tournament/Components/DrawableTeamWithPlayers.cs
@@ -46,12 +46,7 @@ namespace osu.Game.Tournament.Components
                                 {
                                     Direction = FillDirection.Vertical,
                                     AutoSizeAxes = Axes.Both,
-                                    ChildrenEnumerable = team?.Players.Select(p => new TournamentSpriteText
-                                    {
-                                        Text = p.Username,
-                                        Font = OsuFont.Torus.With(size: 24, weight: FontWeight.SemiBold),
-                                        Colour = Color4.White,
-                                    }).Skip(5) ?? Enumerable.Empty<Drawable>()
+                                    ChildrenEnumerable = team?.Players.Select(createPlayerText).Skip(5) ?? Enumerable.Empty<Drawable>()
                                 },
                             }
                         },

From 61297847a74e7412da247a5223e1e01b57eb68c8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 9 Mar 2020 01:21:37 +0900
Subject: [PATCH 0983/1142] Fix compilation failure

---
 osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
index ce17c392d0..01be91dfe5 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
@@ -141,7 +141,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                 currentTeamScore.BindTo(score);
             }
 
-            private void scoreChanged(ValueChangedEvent<int?> score) => counter.CountStars = score.NewValue ?? 0;
+            private void scoreChanged(ValueChangedEvent<int?> score) => counter.Current = score.NewValue ?? 0;
         }
 
         private class TeamDisplay : DrawableTournamentTeam

From c2fbc85e7706a90c715096fe9cc722662d97b287 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 9 Mar 2020 01:26:19 +0900
Subject: [PATCH 0984/1142] Split out test scene for StarCounter

---
 .../Visual/Gameplay/TestSceneScoreCounter.cs  | 37 ------------
 .../Visual/Gameplay/TestSceneStarCounter.cs   | 57 +++++++++++++++++++
 2 files changed, 57 insertions(+), 37 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/Gameplay/TestSceneStarCounter.cs

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
index 88bb83b446..030d420ec0 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs
@@ -3,9 +3,6 @@
 
 using NUnit.Framework;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Utils;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Play.HUD;
 using osuTK;
@@ -45,32 +42,12 @@ namespace osu.Game.Tests.Visual.Gameplay
             };
             Add(accuracyCounter);
 
-            StarCounter stars = new StarCounter
-            {
-                Origin = Anchor.BottomLeft,
-                Anchor = Anchor.BottomLeft,
-                Position = new Vector2(20, -160),
-                Current = 5,
-            };
-            Add(stars);
-
-            SpriteText starsLabel = new OsuSpriteText
-            {
-                Origin = Anchor.BottomLeft,
-                Anchor = Anchor.BottomLeft,
-                Position = new Vector2(20, -190),
-                Text = stars.Current.ToString("0.00"),
-            };
-            Add(starsLabel);
-
             AddStep(@"Reset all", delegate
             {
                 score.Current.Value = 0;
                 comboCounter.Current.Value = 0;
                 numerator = denominator = 0;
                 accuracyCounter.SetFraction(0, 0);
-                stars.Current = 0;
-                starsLabel.Text = stars.Current.ToString("0.00");
             });
 
             AddStep(@"Hit! :D", delegate
@@ -88,20 +65,6 @@ namespace osu.Game.Tests.Visual.Gameplay
                 denominator++;
                 accuracyCounter.SetFraction(numerator, denominator);
             });
-
-            AddStep(@"Alter stars", delegate
-            {
-                stars.Current = RNG.NextSingle() * (stars.StarCount + 1);
-                starsLabel.Text = stars.Current.ToString("0.00");
-            });
-
-            AddStep(@"Stop counters", delegate
-            {
-                score.StopRolling();
-                comboCounter.StopRolling();
-                accuracyCounter.StopRolling();
-                stars.StopAnimation();
-            });
         }
     }
 }
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStarCounter.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStarCounter.cs
new file mode 100644
index 0000000000..709e71d195
--- /dev/null
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStarCounter.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 NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Utils;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    [TestFixture]
+    public class TestSceneStarCounter : OsuTestScene
+    {
+        public TestSceneStarCounter()
+        {
+            StarCounter stars = new StarCounter
+            {
+                Origin = Anchor.Centre,
+                Anchor = Anchor.Centre,
+                Current = 5,
+            };
+
+            Add(stars);
+
+            SpriteText starsLabel = new OsuSpriteText
+            {
+                Origin = Anchor.Centre,
+                Anchor = Anchor.Centre,
+                Scale = new Vector2(2),
+                Y = 50,
+                Text = stars.Current.ToString("0.00"),
+            };
+
+            Add(starsLabel);
+
+            AddRepeatStep(@"random value", delegate
+            {
+                stars.Current = RNG.NextSingle() * (stars.StarCount + 1);
+                starsLabel.Text = stars.Current.ToString("0.00");
+            }, 10);
+
+            AddStep(@"Stop animation", delegate
+            {
+                stars.StopAnimation();
+            });
+
+            AddStep(@"Reset", delegate
+            {
+                stars.Current = 0;
+                starsLabel.Text = stars.Current.ToString("0.00");
+            });
+        }
+    }
+}

From 3903423a37d53b60cd690c1583c968842f2fcdc4 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 8 Mar 2020 19:43:53 -0700
Subject: [PATCH 0985/1142] Fix textbox characters not animating when
 typing/backspacing

---
 osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs | 6 +++++-
 osu.Game/Graphics/UserInterface/OsuTextBox.cs         | 6 +++++-
 osu.Game/Overlays/Comments/CommentEditor.cs           | 6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
index e7699e5255..0c82a869f8 100644
--- a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
@@ -18,7 +18,11 @@ namespace osu.Game.Graphics.UserInterface
 {
     public class OsuPasswordTextBox : OsuTextBox, ISuppressKeyEventLogging
     {
-        protected override Drawable GetDrawableCharacter(char c) => new PasswordMaskChar(CalculatedTextSize);
+        protected override Drawable GetDrawableCharacter(char c) => new FallingDownContainer
+        {
+            AutoSizeAxes = Axes.Both,
+            Child = new PasswordMaskChar(CalculatedTextSize),
+        };
 
         protected override bool AllowClipboardExport => false;
 
diff --git a/osu.Game/Graphics/UserInterface/OsuTextBox.cs b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
index 4abbf8db57..6f440d8138 100644
--- a/osu.Game/Graphics/UserInterface/OsuTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTextBox.cs
@@ -63,7 +63,11 @@ namespace osu.Game.Graphics.UserInterface
             base.OnFocusLost(e);
         }
 
-        protected override Drawable GetDrawableCharacter(char c) => new OsuSpriteText { Text = c.ToString(), Font = OsuFont.GetFont(size: CalculatedTextSize) };
+        protected override Drawable GetDrawableCharacter(char c) => new FallingDownContainer
+        {
+            AutoSizeAxes = Axes.Both,
+            Child = new OsuSpriteText { Text = c.ToString(), Font = OsuFont.GetFont(size: CalculatedTextSize) },
+        };
 
         protected override Caret CreateCaret() => new OsuCaret
         {
diff --git a/osu.Game/Overlays/Comments/CommentEditor.cs b/osu.Game/Overlays/Comments/CommentEditor.cs
index 2fa4cb68f3..7b4bf882dc 100644
--- a/osu.Game/Overlays/Comments/CommentEditor.cs
+++ b/osu.Game/Overlays/Comments/CommentEditor.cs
@@ -158,7 +158,11 @@ namespace osu.Game.Overlays.Comments
                 Font = OsuFont.GetFont(weight: FontWeight.Regular),
             };
 
-            protected override Drawable GetDrawableCharacter(char c) => new OsuSpriteText { Text = c.ToString(), Font = OsuFont.GetFont(size: CalculatedTextSize) };
+            protected override Drawable GetDrawableCharacter(char c) => new FallingDownContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Child = new OsuSpriteText { Text = c.ToString(), Font = OsuFont.GetFont(size: CalculatedTextSize) },
+            };
         }
 
         private class CommitButton : LoadingButton

From b61e56cda519ffa4cb1c284e3134e36077be8a52 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 9 Mar 2020 13:29:17 +0900
Subject: [PATCH 0986/1142] Resolve post-merge issue

---
 osu.Game.Tournament/Screens/Gameplay/Components/TeamScore.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScore.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScore.cs
index 608d98a16a..04fee8cd7d 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScore.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScore.cs
@@ -33,6 +33,6 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             currentTeamScore.BindTo(score);
         }
 
-        private void scoreChanged(ValueChangedEvent<int?> score) => counter.CountStars = score.NewValue ?? 0;
+        private void scoreChanged(ValueChangedEvent<int?> score) => counter.Current = score.NewValue ?? 0;
     }
 }

From 832e64cc958b7c427bc1cf0d58d0291d1990168a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 9 Mar 2020 14:57:19 +0900
Subject: [PATCH 0987/1142] Fix test failures due to null current match

---
 .../Screens/Gameplay/Components/MatchHeader.cs      | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
index 7e9d0178d8..69a68c946b 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
@@ -92,17 +92,20 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
         [BackgroundDependencyLoader]
         private void load(LadderInfo ladder)
         {
-            currentMatch.BindValueChanged(matchChanged);
             currentMatch.BindTo(ladder.CurrentMatch);
+            currentMatch.BindValueChanged(matchChanged, true);
         }
 
         private void matchChanged(ValueChangedEvent<TournamentMatch> match)
         {
             currentTeamScore.UnbindBindings();
-            currentTeamScore.BindTo(teamColour == TeamColour.Red ? match.NewValue.Team1Score : match.NewValue.Team2Score);
-
             currentTeam.UnbindBindings();
-            currentTeam.BindTo(teamColour == TeamColour.Red ? match.NewValue.Team1 : match.NewValue.Team2);
+
+            if (match.NewValue != null)
+            {
+                currentTeamScore.BindTo(teamColour == TeamColour.Red ? match.NewValue.Team1Score : match.NewValue.Team2Score);
+                currentTeam.BindTo(teamColour == TeamColour.Red ? match.NewValue.Team1 : match.NewValue.Team2);
+            }
 
             // team may change to same team, which means score is not in a good state.
             // thus we handle this manually.
@@ -131,7 +134,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
         {
             InternalChildren = new Drawable[]
             {
-                teamDisplay = new TeamDisplay(team, teamColour, currentTeamScore, currentMatch.Value.PointsToWin),
+                teamDisplay = new TeamDisplay(team, teamColour, currentTeamScore, currentMatch.Value?.PointsToWin ?? 0),
             };
         }
     }

From 33f457d663bf6e433664655935dadf764691ea65 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 9 Mar 2020 15:08:24 +0900
Subject: [PATCH 0988/1142] Fix layout issues with TournamentBeatmapPanel

---
 osu.Game.Tournament/Components/TournamentBeatmapPanel.cs | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index e09af06c89..8fa35003e7 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -50,8 +50,6 @@ namespace osu.Game.Tournament.Components
             currentMatch.BindValueChanged(matchChanged);
             currentMatch.BindTo(ladder.CurrentMatch);
 
-            CornerRadius = HEIGHT / 2;
-            CornerExponent = 2;
             Masking = true;
 
             AddRangeInternal(new Drawable[]
@@ -72,14 +70,12 @@ namespace osu.Game.Tournament.Components
                     AutoSizeAxes = Axes.Both,
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
-                    Padding = new MarginPadding(vertical_padding),
+                    Padding = new MarginPadding(15),
                     Direction = FillDirection.Vertical,
                     Children = new Drawable[]
                     {
                         new TournamentSpriteText
                         {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
                             Text = new LocalisedString((
                                 $"{Beatmap.Metadata.ArtistUnicode ?? Beatmap.Metadata.Artist} - {Beatmap.Metadata.TitleUnicode ?? Beatmap.Metadata.Title}",
                                 $"{Beatmap.Metadata.Artist} - {Beatmap.Metadata.Title}")),
@@ -88,9 +84,6 @@ namespace osu.Game.Tournament.Components
                         new FillFlowContainer
                         {
                             AutoSizeAxes = Axes.Both,
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                            Padding = new MarginPadding(vertical_padding),
                             Direction = FillDirection.Horizontal,
                             Children = new Drawable[]
                             {

From 48c46efdd72ea4a8a34243ebbe3f3f56d37d3b05 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 9 Mar 2020 15:09:34 +0900
Subject: [PATCH 0989/1142] Remove rogue newline

---
 osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
index 1e20687a87..34fa7a4997 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs
@@ -35,4 +35,3 @@ namespace osu.Game.Tournament.Tests.Screens
         }
     }
 }
-

From 6421f28ac70964d3438aae62cf0df9888c4ea4f0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 9 Mar 2020 19:07:44 +0900
Subject: [PATCH 0990/1142] Fix nullref

---
 osu.Game.Tournament/Components/TourneyVideo.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Components/TourneyVideo.cs b/osu.Game.Tournament/Components/TourneyVideo.cs
index 687acaa6d5..43088d6b92 100644
--- a/osu.Game.Tournament/Components/TourneyVideo.cs
+++ b/osu.Game.Tournament/Components/TourneyVideo.cs
@@ -64,7 +64,11 @@ namespace osu.Game.Tournament.Components
             }
         }
 
-        public void Reset() => manualClock.CurrentTime = 0;
+        public void Reset()
+        {
+            if (manualClock != null)
+                manualClock.CurrentTime = 0;
+        }
 
         protected override void Update()
         {

From 19ce2d643e39726119d570d008e2af277deebd58 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 10 Mar 2020 09:51:30 +0900
Subject: [PATCH 0991/1142] Remove unused using

---
 .../Screens/Ladder/Components/DrawableTournamentMatch.cs         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
index 18ff8abf61..655beb4bdd 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableTournamentMatch.cs
@@ -9,7 +9,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
-using osu.Game.Graphics;
 using osu.Game.Tournament.Models;
 using osuTK;
 using osuTK.Graphics;

From e7f1f0f38b50946a147828699265e35c6ad9ccaa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Mar 2020 10:07:47 +0900
Subject: [PATCH 0992/1142] Fix hyperdash not initiating correctly when juice
 streams are present

---
 .../TestSceneHyperDash.cs                     | 52 ++++++++++++++++---
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs     |  4 ++
 2 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
index da36673930..7a7c3f4103 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
@@ -1,9 +1,13 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
+using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Catch.Tests
@@ -22,8 +26,17 @@ namespace osu.Game.Rulesets.Catch.Tests
         public void TestHyperDash()
         {
             AddAssert("First note is hyperdash", () => Beatmap.Value.Beatmap.HitObjects[0] is Fruit f && f.HyperDash);
+            AddUntilStep("wait for left hyperdash", () => getCatcher().Scale.X < 0 && getCatcher().HyperDashing);
+
+            for (int i = 0; i < 2; i++)
+            {
+                AddUntilStep("wait for right hyperdash", () => getCatcher().Scale.X > 0 && getCatcher().HyperDashing);
+                AddUntilStep("wait for left hyperdash", () => getCatcher().Scale.X < 0 && getCatcher().HyperDashing);
+            }
         }
 
+        private CatcherArea.Catcher getCatcher() => Player.ChildrenOfType<CatcherArea>().First().MovableCatcher;
+
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {
             var beatmap = new Beatmap
@@ -35,17 +48,40 @@ namespace osu.Game.Rulesets.Catch.Tests
                 }
             };
 
-            // Should produce a hyper-dash
-            beatmap.HitObjects.Add(new Fruit { StartTime = 816, X = 308 / 512f, NewCombo = true });
-            beatmap.HitObjects.Add(new Fruit { StartTime = 1008, X = 56 / 512f, });
+            // Should produce a hyper-dash (edge case test)
+            beatmap.HitObjects.Add(new Fruit { StartTime = 1816, X = 308 / 512f, NewCombo = true });
+            beatmap.HitObjects.Add(new JuiceStream { StartTime = 2008, X = 56 / 512f, });
 
-            for (int i = 0; i < 512; i++)
-            {
-                if (i % 5 < 3)
-                    beatmap.HitObjects.Add(new Fruit { X = i % 10 < 5 ? 0.02f : 0.98f, StartTime = 2000 + i * 100, NewCombo = i % 8 == 0 });
-            }
+            double startTime = 3000;
+
+            const float left_x = 0.02f;
+            const float right_x = 0.98f;
+
+            createObjects(() => new Fruit(), left_x);
+            createObjects(() => new JuiceStream(), right_x);
+            createObjects(() => new JuiceStream(), left_x);
+            createObjects(() => new Fruit(), right_x);
+            createObjects(() => new Fruit(), left_x);
+            createObjects(() => new Fruit(), right_x);
+            createObjects(() => new JuiceStream(), left_x);
 
             return beatmap;
+
+            void createObjects(Func<CatchHitObject> createObject, float x)
+            {
+                const float spacing = 140;
+
+                for (int i = 0; i < 3; i++)
+                {
+                    var hitObject = createObject();
+                    hitObject.X = x;
+                    hitObject.StartTime = startTime + i * spacing;
+
+                    beatmap.HitObjects.Add(hitObject);
+                }
+
+                startTime += 700;
+            }
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index b977d46611..71228f1c07 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -270,6 +270,10 @@ namespace osu.Game.Rulesets.Catch.UI
                     catchObjectPosition >= catcherPosition - halfCatchWidth &&
                     catchObjectPosition <= catcherPosition + halfCatchWidth;
 
+                // only update hyperdash state if we are catching a fruit.
+                // exceptions are Droplets and JuiceStreams.
+                if (!(fruit is Fruit)) return validCatch;
+
                 if (validCatch && fruit.HyperDash)
                 {
                     var target = fruit.HyperDashTarget;

From 059af2a9866ff15d6c1200b1eecdc6b597267b5c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Mar 2020 10:43:06 +0900
Subject: [PATCH 0993/1142] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 97f7a7edb1..6a8e66ee6a 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.304.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.305.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.310.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 855bda3679..cc1ab654ab 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.304.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.305.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.310.0" />
     <PackageReference Include="Sentry" Version="2.1.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index e2c4c09047..04b688cfa3 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.304.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.305.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.310.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
@@ -79,7 +79,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.305.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.310.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From e6858bf1304f0a96e1f3ead46640b0b83fc72d4e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 10 Mar 2020 11:58:33 +0900
Subject: [PATCH 0994/1142] Fix crashes on some storyboards

---
 .../Formats/LegacyStoryboardDecoder.cs        | 81 +++++++++----------
 1 file changed, 40 insertions(+), 41 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
index 6569f76b2d..c81f933bca 100644
--- a/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using osuTK;
 using osuTK.Graphics;
@@ -93,8 +92,8 @@ namespace osu.Game.Beatmaps.Formats
                         var layer = parseLayer(split[1]);
                         var origin = parseOrigin(split[2]);
                         var path = CleanFilename(split[3]);
-                        var x = float.Parse(split[4], NumberFormatInfo.InvariantInfo);
-                        var y = float.Parse(split[5], NumberFormatInfo.InvariantInfo);
+                        var x = Parsing.ParseFloat(split[4], Parsing.MAX_COORDINATE_VALUE);
+                        var y = Parsing.ParseFloat(split[5], Parsing.MAX_COORDINATE_VALUE);
                         storyboardSprite = new StoryboardSprite(path, origin, new Vector2(x, y));
                         storyboard.GetLayer(layer).Add(storyboardSprite);
                         break;
@@ -105,10 +104,10 @@ namespace osu.Game.Beatmaps.Formats
                         var layer = parseLayer(split[1]);
                         var origin = parseOrigin(split[2]);
                         var path = CleanFilename(split[3]);
-                        var x = float.Parse(split[4], NumberFormatInfo.InvariantInfo);
-                        var y = float.Parse(split[5], NumberFormatInfo.InvariantInfo);
-                        var frameCount = int.Parse(split[6]);
-                        var frameDelay = double.Parse(split[7], NumberFormatInfo.InvariantInfo);
+                        var x = Parsing.ParseFloat(split[4], Parsing.MAX_COORDINATE_VALUE);
+                        var y = Parsing.ParseFloat(split[5], Parsing.MAX_COORDINATE_VALUE);
+                        var frameCount = Parsing.ParseInt(split[6]);
+                        var frameDelay = Parsing.ParseDouble(split[7]);
                         var loopType = split.Length > 8 ? (AnimationLoopType)Enum.Parse(typeof(AnimationLoopType), split[8]) : AnimationLoopType.LoopForever;
                         storyboardSprite = new StoryboardAnimation(path, origin, new Vector2(x, y), frameCount, frameDelay, loopType);
                         storyboard.GetLayer(layer).Add(storyboardSprite);
@@ -117,10 +116,10 @@ namespace osu.Game.Beatmaps.Formats
 
                     case LegacyEventType.Sample:
                     {
-                        var time = double.Parse(split[1], CultureInfo.InvariantCulture);
+                        var time = Parsing.ParseDouble(split[1]);
                         var layer = parseLayer(split[2]);
                         var path = CleanFilename(split[3]);
-                        var volume = split.Length > 4 ? float.Parse(split[4], CultureInfo.InvariantCulture) : 100;
+                        var volume = split.Length > 4 ? Parsing.ParseFloat(split[4]) : 100;
                         storyboard.GetLayer(layer).Add(new StoryboardSampleInfo(path, time, (int)volume));
                         break;
                     }
@@ -138,17 +137,17 @@ namespace osu.Game.Beatmaps.Formats
                     case "T":
                     {
                         var triggerName = split[1];
-                        var startTime = split.Length > 2 ? double.Parse(split[2], CultureInfo.InvariantCulture) : double.MinValue;
-                        var endTime = split.Length > 3 ? double.Parse(split[3], CultureInfo.InvariantCulture) : double.MaxValue;
-                        var groupNumber = split.Length > 4 ? int.Parse(split[4]) : 0;
+                        var startTime = split.Length > 2 ? Parsing.ParseDouble(split[2]) : double.MinValue;
+                        var endTime = split.Length > 3 ? Parsing.ParseDouble(split[3]) : double.MaxValue;
+                        var groupNumber = split.Length > 4 ? Parsing.ParseInt(split[4]) : 0;
                         timelineGroup = storyboardSprite?.AddTrigger(triggerName, startTime, endTime, groupNumber);
                         break;
                     }
 
                     case "L":
                     {
-                        var startTime = double.Parse(split[1], CultureInfo.InvariantCulture);
-                        var loopCount = int.Parse(split[2]);
+                        var startTime = Parsing.ParseDouble(split[1]);
+                        var loopCount = Parsing.ParseInt(split[2]);
                         timelineGroup = storyboardSprite?.AddLoop(startTime, loopCount);
                         break;
                     }
@@ -158,52 +157,52 @@ namespace osu.Game.Beatmaps.Formats
                         if (string.IsNullOrEmpty(split[3]))
                             split[3] = split[2];
 
-                        var easing = (Easing)int.Parse(split[1]);
-                        var startTime = double.Parse(split[2], CultureInfo.InvariantCulture);
-                        var endTime = double.Parse(split[3], CultureInfo.InvariantCulture);
+                        var easing = (Easing)Parsing.ParseInt(split[1]);
+                        var startTime = Parsing.ParseDouble(split[2]);
+                        var endTime = Parsing.ParseDouble(split[3]);
 
                         switch (commandType)
                         {
                             case "F":
                             {
-                                var startValue = float.Parse(split[4], CultureInfo.InvariantCulture);
-                                var endValue = split.Length > 5 ? float.Parse(split[5], CultureInfo.InvariantCulture) : startValue;
+                                var startValue = Parsing.ParseFloat(split[4]);
+                                var endValue = split.Length > 5 ? Parsing.ParseFloat(split[5]) : startValue;
                                 timelineGroup?.Alpha.Add(easing, startTime, endTime, startValue, endValue);
                                 break;
                             }
 
                             case "S":
                             {
-                                var startValue = float.Parse(split[4], CultureInfo.InvariantCulture);
-                                var endValue = split.Length > 5 ? float.Parse(split[5], CultureInfo.InvariantCulture) : startValue;
+                                var startValue = Parsing.ParseFloat(split[4]);
+                                var endValue = split.Length > 5 ? Parsing.ParseFloat(split[5]) : startValue;
                                 timelineGroup?.Scale.Add(easing, startTime, endTime, startValue, endValue);
                                 break;
                             }
 
                             case "V":
                             {
-                                var startX = float.Parse(split[4], CultureInfo.InvariantCulture);
-                                var startY = float.Parse(split[5], CultureInfo.InvariantCulture);
-                                var endX = split.Length > 6 ? float.Parse(split[6], CultureInfo.InvariantCulture) : startX;
-                                var endY = split.Length > 7 ? float.Parse(split[7], CultureInfo.InvariantCulture) : startY;
+                                var startX = Parsing.ParseFloat(split[4]);
+                                var startY = Parsing.ParseFloat(split[5]);
+                                var endX = split.Length > 6 ? Parsing.ParseFloat(split[6]) : startX;
+                                var endY = split.Length > 7 ? Parsing.ParseFloat(split[7]) : startY;
                                 timelineGroup?.VectorScale.Add(easing, startTime, endTime, new Vector2(startX, startY), new Vector2(endX, endY));
                                 break;
                             }
 
                             case "R":
                             {
-                                var startValue = float.Parse(split[4], CultureInfo.InvariantCulture);
-                                var endValue = split.Length > 5 ? float.Parse(split[5], CultureInfo.InvariantCulture) : startValue;
+                                var startValue = Parsing.ParseFloat(split[4]);
+                                var endValue = split.Length > 5 ? Parsing.ParseFloat(split[5]) : startValue;
                                 timelineGroup?.Rotation.Add(easing, startTime, endTime, MathUtils.RadiansToDegrees(startValue), MathUtils.RadiansToDegrees(endValue));
                                 break;
                             }
 
                             case "M":
                             {
-                                var startX = float.Parse(split[4], CultureInfo.InvariantCulture);
-                                var startY = float.Parse(split[5], CultureInfo.InvariantCulture);
-                                var endX = split.Length > 6 ? float.Parse(split[6], CultureInfo.InvariantCulture) : startX;
-                                var endY = split.Length > 7 ? float.Parse(split[7], CultureInfo.InvariantCulture) : startY;
+                                var startX = Parsing.ParseFloat(split[4]);
+                                var startY = Parsing.ParseFloat(split[5]);
+                                var endX = split.Length > 6 ? Parsing.ParseFloat(split[6]) : startX;
+                                var endY = split.Length > 7 ? Parsing.ParseFloat(split[7]) : startY;
                                 timelineGroup?.X.Add(easing, startTime, endTime, startX, endX);
                                 timelineGroup?.Y.Add(easing, startTime, endTime, startY, endY);
                                 break;
@@ -211,28 +210,28 @@ namespace osu.Game.Beatmaps.Formats
 
                             case "MX":
                             {
-                                var startValue = float.Parse(split[4], CultureInfo.InvariantCulture);
-                                var endValue = split.Length > 5 ? float.Parse(split[5], CultureInfo.InvariantCulture) : startValue;
+                                var startValue = Parsing.ParseFloat(split[4]);
+                                var endValue = split.Length > 5 ? Parsing.ParseFloat(split[5]) : startValue;
                                 timelineGroup?.X.Add(easing, startTime, endTime, startValue, endValue);
                                 break;
                             }
 
                             case "MY":
                             {
-                                var startValue = float.Parse(split[4], CultureInfo.InvariantCulture);
-                                var endValue = split.Length > 5 ? float.Parse(split[5], CultureInfo.InvariantCulture) : startValue;
+                                var startValue = Parsing.ParseFloat(split[4]);
+                                var endValue = split.Length > 5 ? Parsing.ParseFloat(split[5]) : startValue;
                                 timelineGroup?.Y.Add(easing, startTime, endTime, startValue, endValue);
                                 break;
                             }
 
                             case "C":
                             {
-                                var startRed = float.Parse(split[4], CultureInfo.InvariantCulture);
-                                var startGreen = float.Parse(split[5], CultureInfo.InvariantCulture);
-                                var startBlue = float.Parse(split[6], CultureInfo.InvariantCulture);
-                                var endRed = split.Length > 7 ? float.Parse(split[7], CultureInfo.InvariantCulture) : startRed;
-                                var endGreen = split.Length > 8 ? float.Parse(split[8], CultureInfo.InvariantCulture) : startGreen;
-                                var endBlue = split.Length > 9 ? float.Parse(split[9], CultureInfo.InvariantCulture) : startBlue;
+                                var startRed = Parsing.ParseFloat(split[4]);
+                                var startGreen = Parsing.ParseFloat(split[5]);
+                                var startBlue = Parsing.ParseFloat(split[6]);
+                                var endRed = split.Length > 7 ? Parsing.ParseFloat(split[7]) : startRed;
+                                var endGreen = split.Length > 8 ? Parsing.ParseFloat(split[8]) : startGreen;
+                                var endBlue = split.Length > 9 ? Parsing.ParseFloat(split[9]) : startBlue;
                                 timelineGroup?.Colour.Add(easing, startTime, endTime,
                                     new Color4(startRed / 255f, startGreen / 255f, startBlue / 255f, 1),
                                     new Color4(endRed / 255f, endGreen / 255f, endBlue / 255f, 1));

From 7a9c85d69da0a826ac03fd78fb615e146a0eef96 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 10 Mar 2020 12:21:40 +0900
Subject: [PATCH 0995/1142] Fix now failing test due to parsing ranges

---
 osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs | 2 +-
 osu.Game.Tests/Resources/variable-with-suffix.osb              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
index 96ff6b81e3..76b76aa357 100644
--- a/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
+++ b/osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs
@@ -99,7 +99,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 var storyboard = decoder.Decode(stream);
 
                 StoryboardLayer background = storyboard.Layers.Single(l => l.Depth == 3);
-                Assert.AreEqual(123456, ((StoryboardSprite)background.Elements.Single()).InitialPosition.X);
+                Assert.AreEqual(3456, ((StoryboardSprite)background.Elements.Single()).InitialPosition.X);
             }
         }
     }
diff --git a/osu.Game.Tests/Resources/variable-with-suffix.osb b/osu.Game.Tests/Resources/variable-with-suffix.osb
index 5c9b46ca98..fd284eb055 100644
--- a/osu.Game.Tests/Resources/variable-with-suffix.osb
+++ b/osu.Game.Tests/Resources/variable-with-suffix.osb
@@ -1,5 +1,5 @@
 [Variables]
-$var=1234
+$var=34
 
 [Events]
 Sprite,Background,TopCentre,"img.jpg",$var56,240

From 0d18ea1d2955dd76832d6d75381bfc9ba0994105 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Mar 2020 11:42:08 +0900
Subject: [PATCH 0996/1142] Add animation and fallback catcher support

---
 .../special-skin/fruit-catcher-idle-0@2x.png  | Bin 0 -> 57593 bytes
 .../special-skin/fruit-catcher-idle-1@2x.png  | Bin 0 -> 57011 bytes
 .../special-skin/fruit-catcher-idle-2@2x.png  | Bin 0 -> 57264 bytes
 .../special-skin/fruit-catcher-idle-3@2x.png  | Bin 0 -> 57077 bytes
 .../special-skin/fruit-catcher-idle-4@2x.png  | Bin 0 -> 56155 bytes
 .../special-skin/fruit-catcher-idle-5@2x.png  | Bin 0 -> 57143 bytes
 .../special-skin/fruit-catcher-idle.png       | Bin 133664 -> 0 bytes
 .../TestSceneCatcher.cs                       |   1 +
 .../CatchSkinComponents.cs                    |   3 ++-
 .../Skinning/CatchLegacySkinTransformer.cs    |   4 +++
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs     |  10 +++++---
 osu.Game.Rulesets.Catch/UI/CatcherSprite.cs   |  24 ++++++++++--------
 12 files changed, 27 insertions(+), 15 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-0@2x.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-1@2x.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-2@2x.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-3@2x.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-4@2x.png
 create mode 100644 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-5@2x.png
 delete mode 100755 osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle.png

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-0@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-0@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..786e5cc25ad2e175251acdee06825f936c8c9ea7
GIT binary patch
literal 57593
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
C8(cg9

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-1@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-1@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e93530fb1679e6534defa46c19f1b97ae4d3d45e
GIT binary patch
literal 57011
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-2@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-2@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f51257742747717958c71c1fb20ea22c9210af1
GIT binary patch
literal 57264
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-3@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-3@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..953a04d4e4f9cdde644d6ac6e9715b6256631438
GIT binary patch
literal 57077
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
GLSTaP8u`Ki

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-4@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-4@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..66a3cf9e0bd48f4b7de37080ff925f6cf174959b
GIT binary patch
literal 56155
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
U(-XH$Gynhq07*qoM6N<$f+jyxY5)KL

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-5@2x.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle-5@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec4487f8fb890b5bea833075d8c6f50c2d97c7fc
GIT binary patch
literal 57143
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%0De+0On*?HK2~R-AV=mQc<g%H-
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
UdR>+8=l}o!07*qoM6N<$f`WRQng9R*

literal 0
HcmV?d00001

diff --git a/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle.png b/osu.Game.Rulesets.Catch.Tests/Resources/special-skin/fruit-catcher-idle.png
deleted file mode 100755
index 17177f3246cafff0cf81669bca7efd0a22599f44..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 133664
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
O0000<MNUMnLSTX~Qng3`

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index 4ff9f7a7fe..fbbe00bb6c 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -17,6 +17,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(CatcherArea),
+            typeof(CatcherSprite)
         };
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game.Rulesets.Catch/CatchSkinComponents.cs b/osu.Game.Rulesets.Catch/CatchSkinComponents.cs
index 02c045f363..08bff36401 100644
--- a/osu.Game.Rulesets.Catch/CatchSkinComponents.cs
+++ b/osu.Game.Rulesets.Catch/CatchSkinComponents.cs
@@ -10,6 +10,7 @@ namespace osu.Game.Rulesets.Catch
         FruitGrapes,
         FruitOrange,
         FruitPear,
-        Droplet
+        Droplet,
+        CatcherIdle
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
index 36164c5543..af7c60b929 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
@@ -44,6 +44,10 @@ namespace osu.Game.Rulesets.Catch.Skinning
                         return new LegacyFruitPiece("fruit-drop") { Scale = new Vector2(0.8f) };
 
                     break;
+
+                case CatchSkinComponents.CatcherIdle:
+                    return this.GetAnimation("fruit-catcher-idle", true, true, true) ??
+                           this.GetAnimation("fruit-ryuuta", true, true, true);
             }
 
             return null;
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index b977d46611..2015937f2a 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -155,7 +155,10 @@ namespace osu.Game.Rulesets.Catch.UI
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.BottomCentre,
                     },
-                    createCatcherSprite(),
+                    createCatcherSprite().With(c =>
+                    {
+                        c.Anchor = Anchor.TopCentre;
+                    })
                 };
             }
 
@@ -205,12 +208,11 @@ namespace osu.Game.Rulesets.Catch.UI
                 var additive = createCatcherSprite();
 
                 additive.Anchor = Anchor;
-                additive.OriginPosition += new Vector2(DrawWidth / 2, 0); // also temporary to align sprite correctly.
-                additive.Position = Position;
                 additive.Scale = Scale;
                 additive.Colour = HyperDashing ? Color4.Red : Color4.White;
-                additive.RelativePositionAxes = RelativePositionAxes;
                 additive.Blending = BlendingParameters.Additive;
+                additive.RelativePositionAxes = RelativePositionAxes;
+                additive.Position = Position;
 
                 AdditiveTarget.Add(additive);
 
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherSprite.cs b/osu.Game.Rulesets.Catch/UI/CatcherSprite.cs
index 025fa9c56e..78020114cd 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherSprite.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherSprite.cs
@@ -3,31 +3,35 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
 using osu.Game.Skinning;
 using osuTK;
 
 namespace osu.Game.Rulesets.Catch.UI
 {
-    public class CatcherSprite : CompositeDrawable
+    public class CatcherSprite : SkinnableDrawable
     {
+        protected override bool ApplySizeRestrictionsToDefault => true;
+
         public CatcherSprite()
+            : base(new CatchSkinComponent(CatchSkinComponents.CatcherIdle), _ =>
+                new DefaultCatcherSprite(), confineMode: ConfineMode.ScaleDownToFit)
         {
+            RelativeSizeAxes = Axes.None;
             Size = new Vector2(CatcherArea.CATCHER_SIZE);
 
             // Sets the origin roughly to the centre of the catcher's plate to allow for correct scaling.
-            OriginPosition = new Vector2(-0.02f, 0.06f) * CatcherArea.CATCHER_SIZE;
+            OriginPosition = new Vector2(0.5f, 0.06f) * CatcherArea.CATCHER_SIZE;
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        private class DefaultCatcherSprite : Sprite
         {
-            InternalChild = new SkinnableSprite("Gameplay/catch/fruit-catcher-idle", confineMode: ConfineMode.ScaleDownToFit)
+            [BackgroundDependencyLoader]
+            private void load(TextureStore textures)
             {
-                RelativeSizeAxes = Axes.Both,
-                Anchor = Anchor.TopCentre,
-                Origin = Anchor.TopCentre,
-            };
+                Texture = textures.Get("Gameplay/catch/fruit-catcher-idle");
+            }
         }
     }
 }

From 9d5327b1accc07234637f51f7903cacb2b9966ea Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 10 Mar 2020 15:00:23 +0900
Subject: [PATCH 0997/1142] Fix osu! shaking instead of missing for early hits

---
 .../TestSceneEarlyMissJudgement.cs            | 70 +++++++++++++++++++
 .../Scoring/OsuHitWindows.cs                  |  2 +-
 2 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Rulesets.Osu.Tests/TestSceneEarlyMissJudgement.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneEarlyMissJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneEarlyMissJudgement.cs
new file mode 100644
index 0000000000..27a32aa96e
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneEarlyMissJudgement.cs
@@ -0,0 +1,70 @@
+// 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.Game.Beatmaps;
+using osu.Game.Replays;
+using osu.Game.Rulesets.Osu.Beatmaps;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Rulesets.Osu.Replays;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Tests.Visual;
+using osu.Game.Users;
+using osuTK;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    public class TestSceneEarlyMissJudgement : ModTestScene
+    {
+        public TestSceneEarlyMissJudgement()
+            : base(new OsuRuleset())
+        {
+        }
+
+        [Test]
+        public void TestHitCircleEarly() => CreateModTest(new ModTestData
+        {
+            Autoplay = false,
+            Mod = new TestAutoMod(),
+            Beatmap = new Beatmap
+            {
+                HitObjects = { new HitCircle { Position = new Vector2(256, 192) } }
+            },
+            PassCondition = () => Player.Results.Count > 0 && Player.Results[0].TimeOffset < 0 && Player.Results[0].Type == HitResult.Miss
+        });
+
+        private class TestAutoMod : OsuModAutoplay
+        {
+            public override Score CreateReplayScore(IBeatmap beatmap) => new Score
+            {
+                ScoreInfo = new ScoreInfo { User = new User { Username = "Autoplay" } },
+                Replay = new MissingAutoGenerator(beatmap).Generate()
+            };
+        }
+
+        private class MissingAutoGenerator : OsuAutoGeneratorBase
+        {
+            public new OsuBeatmap Beatmap => (OsuBeatmap)base.Beatmap;
+
+            public MissingAutoGenerator(IBeatmap beatmap)
+                : base(beatmap)
+            {
+            }
+
+            public override Replay Generate()
+            {
+                AddFrameToReplay(new OsuReplayFrame(-100000, new Vector2(256, 500)));
+                AddFrameToReplay(new OsuReplayFrame(Beatmap.HitObjects[0].StartTime - 1500, new Vector2(256, 500)));
+                AddFrameToReplay(new OsuReplayFrame(Beatmap.HitObjects[0].StartTime - 1500, new Vector2(256, 500)));
+
+                AddFrameToReplay(new OsuReplayFrame(Beatmap.HitObjects[0].StartTime - 450, Beatmap.HitObjects[0].StackedPosition));
+                AddFrameToReplay(new OsuReplayFrame(Beatmap.HitObjects[0].StartTime - 350, Beatmap.HitObjects[0].StackedPosition, OsuAction.LeftButton));
+                AddFrameToReplay(new OsuReplayFrame(Beatmap.HitObjects[0].StartTime - 325, Beatmap.HitObjects[0].StackedPosition));
+
+                return Replay;
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu/Scoring/OsuHitWindows.cs b/osu.Game.Rulesets.Osu/Scoring/OsuHitWindows.cs
index a6491bb3f3..6f2998006f 100644
--- a/osu.Game.Rulesets.Osu/Scoring/OsuHitWindows.cs
+++ b/osu.Game.Rulesets.Osu/Scoring/OsuHitWindows.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Scoring
             new DifficultyRange(HitResult.Great, 80, 50, 20),
             new DifficultyRange(HitResult.Good, 140, 100, 60),
             new DifficultyRange(HitResult.Meh, 200, 150, 100),
-            new DifficultyRange(HitResult.Miss, 200, 200, 200),
+            new DifficultyRange(HitResult.Miss, 400, 400, 400),
         };
 
         public override bool IsHitResultAllowed(HitResult result)

From 7069cef9ce6a92cfddf6cb8a25d2cb2dbf48e9b8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Mar 2020 15:26:39 +0900
Subject: [PATCH 0998/1142] Add catcher kiai/fail animation states

---
 .../TestSceneCatcherArea.cs                   | 58 +++++++++++++++++--
 .../CatchSkinComponents.cs                    |  4 +-
 .../Skinning/CatchLegacySkinTransformer.cs    |  8 +++
 .../UI/CatcherAnimationState.cs               | 12 ++++
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs     | 36 ++++++++++--
 osu.Game.Rulesets.Catch/UI/CatcherSprite.cs   | 30 ++++++++--
 6 files changed, 134 insertions(+), 14 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch/UI/CatcherAnimationState.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index df1ac4c725..caaad2f704 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -10,9 +10,15 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets.Catch.Beatmaps;
+using osu.Game.Rulesets.Catch.Judgements;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.Objects.Drawables;
 using osu.Game.Rulesets.Catch.UI;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.UI;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Catch.Tests
@@ -34,9 +40,41 @@ namespace osu.Game.Rulesets.Catch.Tests
                 CreatedDrawables.OfType<CatchInputManager>().Select(i => i.Child)
                                 .OfType<TestCatcherArea>().ForEach(c => c.ToggleHyperDash(t)));
 
-            AddRepeatStep("catch fruit", () =>
-                this.ChildrenOfType<CatcherArea>().ForEach(area =>
-                    area.MovableCatcher.PlaceOnPlate(new DrawableFruit(new TestSceneFruitObjects.TestCatchFruit(FruitVisualRepresentation.Grape)))), 20);
+            AddRepeatStep("catch fruit", () => catchFruit(new TestFruit(false)
+            {
+                X = this.ChildrenOfType<CatcherArea>().First().MovableCatcher.X
+            }), 20);
+            AddRepeatStep("catch fruit last in combo", () => catchFruit(new TestFruit(false)
+            {
+                X = this.ChildrenOfType<CatcherArea>().First().MovableCatcher.X,
+                LastInCombo = true,
+            }), 20);
+            AddRepeatStep("catch kiai fruit", () => catchFruit(new TestFruit(true)
+            {
+                X = this.ChildrenOfType<CatcherArea>().First().MovableCatcher.X,
+            }), 20);
+            AddRepeatStep("miss fruit", () => catchFruit(new Fruit
+            {
+                X = this.ChildrenOfType<CatcherArea>().First().MovableCatcher.X + 100,
+                LastInCombo = true,
+            }, true), 20);
+        }
+
+        private void catchFruit(Fruit fruit, bool miss = false)
+        {
+            this.ChildrenOfType<CatcherArea>().ForEach(area =>
+            {
+                DrawableFruit drawable = new DrawableFruit(fruit);
+                area.Add(drawable);
+
+                Schedule(() =>
+                {
+                    area.AttemptCatch(fruit);
+                    area.OnResult(drawable, new JudgementResult(fruit, new CatchJudgement()) { Type = miss ? HitResult.Miss : HitResult.Great });
+
+                    drawable.Expire();
+                });
+            });
         }
 
         private void createCatcher(float size)
@@ -47,7 +85,8 @@ namespace osu.Game.Rulesets.Catch.Tests
                 Child = new TestCatcherArea(new BeatmapDifficulty { CircleSize = size })
                 {
                     Anchor = Anchor.CentreLeft,
-                    Origin = Anchor.TopLeft
+                    Origin = Anchor.TopLeft,
+                    CreateDrawableRepresentation = ((DrawableRuleset<CatchHitObject>)catchRuleset.CreateInstance().CreateDrawableRulesetWith(new CatchBeatmap())).CreateDrawableRepresentation
                 },
             });
         }
@@ -58,6 +97,17 @@ namespace osu.Game.Rulesets.Catch.Tests
             catchRuleset = rulesets.GetRuleset(2);
         }
 
+        public class TestFruit : Fruit
+        {
+            public TestFruit(bool kiai)
+            {
+                var kiaiCpi = new ControlPointInfo();
+                kiaiCpi.Add(0, new EffectControlPoint { KiaiMode = kiai });
+
+                ApplyDefaultsToSelf(kiaiCpi, new BeatmapDifficulty());
+            }
+        }
+
         private class TestCatcherArea : CatcherArea
         {
             public TestCatcherArea(BeatmapDifficulty beatmapDifficulty)
diff --git a/osu.Game.Rulesets.Catch/CatchSkinComponents.cs b/osu.Game.Rulesets.Catch/CatchSkinComponents.cs
index 08bff36401..80390705fe 100644
--- a/osu.Game.Rulesets.Catch/CatchSkinComponents.cs
+++ b/osu.Game.Rulesets.Catch/CatchSkinComponents.cs
@@ -11,6 +11,8 @@ namespace osu.Game.Rulesets.Catch
         FruitOrange,
         FruitPear,
         Droplet,
-        CatcherIdle
+        CatcherIdle,
+        CatcherFail,
+        CatcherKiai
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
index af7c60b929..65e6e6f209 100644
--- a/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
+++ b/osu.Game.Rulesets.Catch/Skinning/CatchLegacySkinTransformer.cs
@@ -48,6 +48,14 @@ namespace osu.Game.Rulesets.Catch.Skinning
                 case CatchSkinComponents.CatcherIdle:
                     return this.GetAnimation("fruit-catcher-idle", true, true, true) ??
                            this.GetAnimation("fruit-ryuuta", true, true, true);
+
+                case CatchSkinComponents.CatcherFail:
+                    return this.GetAnimation("fruit-catcher-fail", true, true, true) ??
+                           this.GetAnimation("fruit-ryuuta", true, true, true);
+
+                case CatchSkinComponents.CatcherKiai:
+                    return this.GetAnimation("fruit-catcher-kiai", true, true, true) ??
+                           this.GetAnimation("fruit-ryuuta", true, true, true);
             }
 
             return null;
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherAnimationState.cs b/osu.Game.Rulesets.Catch/UI/CatcherAnimationState.cs
new file mode 100644
index 0000000000..566e9d1911
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/UI/CatcherAnimationState.cs
@@ -0,0 +1,12 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace osu.Game.Rulesets.Catch.UI
+{
+    public enum CatcherAnimationState
+    {
+        Idle,
+        Fail,
+        Kiai
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index dfeaf6e89f..2beda02398 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -155,11 +155,21 @@ namespace osu.Game.Rulesets.Catch.UI
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.BottomCentre,
                     },
-                    createCatcherSprite().With(c =>
-                    {
-                        c.Anchor = Anchor.TopCentre;
-                    })
                 };
+
+                updateCatcher();
+            }
+
+            private Drawable catcherSprite;
+
+            private void updateCatcher()
+            {
+                catcherSprite?.Expire();
+
+                Add(catcherSprite = createCatcherSprite().With(c =>
+                {
+                    c.Anchor = Anchor.TopCentre;
+                }));
             }
 
             private int currentDirection;
@@ -222,7 +232,7 @@ namespace osu.Game.Rulesets.Catch.UI
                 Scheduler.AddDelayed(beginTrail, HyperDashing ? 25 : 50);
             }
 
-            private Drawable createCatcherSprite() => new CatcherSprite();
+            private Drawable createCatcherSprite() => new CatcherSprite(currentState);
 
             /// <summary>
             /// Add a caught fruit to the catcher's stack.
@@ -290,9 +300,25 @@ namespace osu.Game.Rulesets.Catch.UI
                     SetHyperDashState();
                 }
 
+                if (validCatch)
+                    updateState(fruit.Kiai ? CatcherAnimationState.Kiai : CatcherAnimationState.Idle);
+                else
+                    updateState(CatcherAnimationState.Fail);
+
                 return validCatch;
             }
 
+            private void updateState(CatcherAnimationState state)
+            {
+                if (currentState == state)
+                    return;
+
+                currentState = state;
+                updateCatcher();
+            }
+
+            private CatcherAnimationState currentState;
+
             private double hyperDashModifier = 1;
             private int hyperDashDirection;
             private float hyperDashTargetPosition;
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherSprite.cs b/osu.Game.Rulesets.Catch/UI/CatcherSprite.cs
index 78020114cd..52eb8d597e 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherSprite.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherSprite.cs
@@ -14,9 +14,9 @@ namespace osu.Game.Rulesets.Catch.UI
     {
         protected override bool ApplySizeRestrictionsToDefault => true;
 
-        public CatcherSprite()
-            : base(new CatchSkinComponent(CatchSkinComponents.CatcherIdle), _ =>
-                new DefaultCatcherSprite(), confineMode: ConfineMode.ScaleDownToFit)
+        public CatcherSprite(CatcherAnimationState state)
+            : base(new CatchSkinComponent(componentFromState(state)), _ =>
+                new DefaultCatcherSprite(state), confineMode: ConfineMode.ScaleDownToFit)
         {
             RelativeSizeAxes = Axes.None;
             Size = new Vector2(CatcherArea.CATCHER_SIZE);
@@ -25,12 +25,34 @@ namespace osu.Game.Rulesets.Catch.UI
             OriginPosition = new Vector2(0.5f, 0.06f) * CatcherArea.CATCHER_SIZE;
         }
 
+        private static CatchSkinComponents componentFromState(CatcherAnimationState state)
+        {
+            switch (state)
+            {
+                case CatcherAnimationState.Fail:
+                    return CatchSkinComponents.CatcherFail;
+
+                case CatcherAnimationState.Kiai:
+                    return CatchSkinComponents.CatcherKiai;
+
+                default:
+                    return CatchSkinComponents.CatcherIdle;
+            }
+        }
+
         private class DefaultCatcherSprite : Sprite
         {
+            private readonly CatcherAnimationState state;
+
+            public DefaultCatcherSprite(CatcherAnimationState state)
+            {
+                this.state = state;
+            }
+
             [BackgroundDependencyLoader]
             private void load(TextureStore textures)
             {
-                Texture = textures.Get("Gameplay/catch/fruit-catcher-idle");
+                Texture = textures.Get($"Gameplay/catch/fruit-catcher-{state.ToString().ToLower()}");
             }
         }
     }

From 678f33eea36615c5a2ac2463ff13fc3c6f50a704 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 10 Mar 2020 15:45:21 +0900
Subject: [PATCH 0999/1142] Add late miss judgements

---
 ...cs => TestSceneMissHitWindowJudgements.cs} | 49 +++++++++++++++----
 1 file changed, 40 insertions(+), 9 deletions(-)
 rename osu.Game.Rulesets.Osu.Tests/{TestSceneEarlyMissJudgement.cs => TestSceneMissHitWindowJudgements.cs} (58%)

diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneEarlyMissJudgement.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
similarity index 58%
rename from osu.Game.Rulesets.Osu.Tests/TestSceneEarlyMissJudgement.cs
rename to osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
index 27a32aa96e..5f3596976d 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneEarlyMissJudgement.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneMissHitWindowJudgements.cs
@@ -8,6 +8,7 @@ using osu.Game.Rulesets.Osu.Beatmaps;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Osu.Replays;
+using osu.Game.Rulesets.Osu.Scoring;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Tests.Visual;
@@ -16,24 +17,54 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Tests
 {
-    public class TestSceneEarlyMissJudgement : ModTestScene
+    public class TestSceneMissHitWindowJudgements : ModTestScene
     {
-        public TestSceneEarlyMissJudgement()
+        public TestSceneMissHitWindowJudgements()
             : base(new OsuRuleset())
         {
         }
 
         [Test]
-        public void TestHitCircleEarly() => CreateModTest(new ModTestData
+        public void TestMissViaEarlyHit()
         {
-            Autoplay = false,
-            Mod = new TestAutoMod(),
-            Beatmap = new Beatmap
+            var beatmap = new Beatmap
             {
                 HitObjects = { new HitCircle { Position = new Vector2(256, 192) } }
-            },
-            PassCondition = () => Player.Results.Count > 0 && Player.Results[0].TimeOffset < 0 && Player.Results[0].Type == HitResult.Miss
-        });
+            };
+
+            var hitWindows = new OsuHitWindows();
+            hitWindows.SetDifficulty(beatmap.BeatmapInfo.BaseDifficulty.OverallDifficulty);
+
+            CreateModTest(new ModTestData
+            {
+                Autoplay = false,
+                Mod = new TestAutoMod(),
+                Beatmap = new Beatmap
+                {
+                    HitObjects = { new HitCircle { Position = new Vector2(256, 192) } }
+                },
+                PassCondition = () => Player.Results.Count > 0 && Player.Results[0].TimeOffset < -hitWindows.WindowFor(HitResult.Meh) && Player.Results[0].Type == HitResult.Miss
+            });
+        }
+
+        [Test]
+        public void TestMissViaNotHitting()
+        {
+            var beatmap = new Beatmap
+            {
+                HitObjects = { new HitCircle { Position = new Vector2(256, 192) } }
+            };
+
+            var hitWindows = new OsuHitWindows();
+            hitWindows.SetDifficulty(beatmap.BeatmapInfo.BaseDifficulty.OverallDifficulty);
+
+            CreateModTest(new ModTestData
+            {
+                Autoplay = false,
+                Beatmap = beatmap,
+                PassCondition = () => Player.Results.Count > 0 && Player.Results[0].TimeOffset >= hitWindows.WindowFor(HitResult.Meh) && Player.Results[0].Type == HitResult.Miss
+            });
+        }
 
         private class TestAutoMod : OsuModAutoplay
         {

From 2b33594400dae72c9dc05d428f927353b53fe407 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Mar 2020 15:59:13 +0900
Subject: [PATCH 1000/1142] Add random rotation and scale factors to osu!catch
 bananas

---
 .../TestSceneBananaShower.cs                    |  2 ++
 .../Objects/Drawables/DrawableBanana.cs         | 17 +++++++++++++++++
 osu.Game/Tests/Visual/ScreenTestScene.cs        |  5 ++---
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs
index 20911b8d06..024c4cefb0 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs
@@ -18,7 +18,9 @@ namespace osu.Game.Rulesets.Catch.Tests
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(BananaShower),
+            typeof(Banana),
             typeof(DrawableBananaShower),
+            typeof(DrawableBanana),
 
             typeof(CatchRuleset),
             typeof(DrawableCatchRuleset),
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
index cf7231ebb2..2e7618b8df 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using osu.Framework.Graphics;
 using osu.Framework.Utils;
 using osuTK.Graphics;
 
@@ -22,6 +23,22 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             return colour ??= getBananaColour();
         }
 
+        protected override void UpdateInitialTransforms()
+        {
+            base.UpdateInitialTransforms();
+
+            const float end_scale = 0.6f;
+            const float random_scale_range = 1.6f;
+
+            ScaleContainer.ScaleTo(HitObject.Scale * (end_scale + random_scale_range * RNG.NextSingle()))
+                          .Then().ScaleTo(HitObject.Scale * end_scale, HitObject.TimePreempt);
+
+            const float random_angle_range = 180;
+
+            ScaleContainer.RotateTo(random_angle_range * (RNG.NextSingle() * 2 - 1))
+                          .Then().RotateTo(random_angle_range * (RNG.NextSingle() * 2 - 1), HitObject.TimePreempt);
+        }
+
         private Color4 getBananaColour()
         {
             switch (RNG.Next(0, 3))
diff --git a/osu.Game/Tests/Visual/ScreenTestScene.cs b/osu.Game/Tests/Visual/ScreenTestScene.cs
index d26aacf2bc..1a6ebed425 100644
--- a/osu.Game/Tests/Visual/ScreenTestScene.cs
+++ b/osu.Game/Tests/Visual/ScreenTestScene.cs
@@ -38,12 +38,11 @@ namespace osu.Game.Tests.Visual
 
         private void addExitAllScreensStep()
         {
-            AddUntilStep("exit all screens", () =>
+            AddStep("exit all screens", () =>
             {
-                if (Stack.CurrentScreen == null) return true;
+                if (Stack.CurrentScreen == null) return;
 
                 Stack.Exit();
-                return false;
             });
         }
     }

From eab544b49f47d2543ff25d80a281a3531f636f4e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Mar 2020 16:41:08 +0900
Subject: [PATCH 1001/1142] Add afterimage glow when entering hyperdash

---
 .../TestSceneCatcherArea.cs                   |  5 ----
 .../TestSceneHyperDash.cs                     |  6 ++++
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs     | 30 ++++++++++++++-----
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index df1ac4c725..0eea352603 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -22,11 +22,6 @@ namespace osu.Game.Rulesets.Catch.Tests
     {
         private RulesetInfo catchRuleset;
 
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(CatcherArea),
-        };
-
         public TestSceneCatcherArea()
         {
             AddSliderStep<float>("CircleSize", 0, 8, 5, createCatcher);
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
index 7a7c3f4103..30df2202f5 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.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 NUnit.Framework;
 using osu.Framework.Testing;
@@ -15,6 +16,11 @@ namespace osu.Game.Rulesets.Catch.Tests
     [TestFixture]
     public class TestSceneHyperDash : PlayerTestScene
     {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(CatcherArea),
+        };
+
         public TestSceneHyperDash()
             : base(new CatchRuleset())
         {
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index dfeaf6e89f..cc0f41a14f 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -205,21 +205,28 @@ namespace osu.Game.Rulesets.Catch.UI
 
                 if (!Trail) return;
 
+                var additive = createAdditiveSprite(HyperDashing);
+
+                additive.FadeTo(0.4f).FadeOut(800, Easing.OutQuint);
+                additive.Expire(true);
+
+                Scheduler.AddDelayed(beginTrail, HyperDashing ? 25 : 50);
+            }
+
+            private Drawable createAdditiveSprite(bool hyperDash)
+            {
                 var additive = createCatcherSprite();
 
                 additive.Anchor = Anchor;
                 additive.Scale = Scale;
-                additive.Colour = HyperDashing ? Color4.Red : Color4.White;
+                additive.Colour = hyperDash ? Color4.Red : Color4.White;
                 additive.Blending = BlendingParameters.Additive;
                 additive.RelativePositionAxes = RelativePositionAxes;
                 additive.Position = Position;
 
                 AdditiveTarget.Add(additive);
 
-                additive.FadeTo(0.4f).FadeOut(800, Easing.OutQuint);
-                additive.Expire(true);
-
-                Scheduler.AddDelayed(beginTrail, HyperDashing ? 25 : 50);
+                return additive;
             }
 
             private Drawable createCatcherSprite() => new CatcherSprite();
@@ -311,14 +318,14 @@ namespace osu.Game.Rulesets.Catch.UI
             {
                 const float hyper_dash_transition_length = 180;
 
-                bool previouslyHyperDashing = HyperDashing;
+                bool wasHyperDashing = HyperDashing;
 
                 if (modifier <= 1 || X == targetPosition)
                 {
                     hyperDashModifier = 1;
                     hyperDashDirection = 0;
 
-                    if (previouslyHyperDashing)
+                    if (wasHyperDashing)
                     {
                         this.FadeColour(Color4.White, hyper_dash_transition_length, Easing.OutQuint);
                         this.FadeTo(1, hyper_dash_transition_length, Easing.OutQuint);
@@ -331,11 +338,18 @@ namespace osu.Game.Rulesets.Catch.UI
                     hyperDashDirection = Math.Sign(targetPosition - X);
                     hyperDashTargetPosition = targetPosition;
 
-                    if (!previouslyHyperDashing)
+                    if (!wasHyperDashing)
                     {
                         this.FadeColour(Color4.OrangeRed, hyper_dash_transition_length, Easing.OutQuint);
                         this.FadeTo(0.2f, hyper_dash_transition_length, Easing.OutQuint);
                         Trail = true;
+
+                        var hyperDashEndGlow = createAdditiveSprite(true);
+
+                        hyperDashEndGlow.MoveToOffset(new Vector2(0, -20), 1200, Easing.In);
+                        hyperDashEndGlow.ScaleTo(hyperDashEndGlow.Scale * 0.9f).ScaleTo(hyperDashEndGlow.Scale * 1.2f, 1200, Easing.In);
+                        hyperDashEndGlow.FadeOut(1200);
+                        hyperDashEndGlow.Expire(true);
                     }
                 }
             }

From 8ad44952f8da454f5d8d77172b6615099f86ebe0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Mar 2020 16:47:53 +0900
Subject: [PATCH 1002/1142] Remove unused usings

---
 osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
index 0eea352603..cf4843c200 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs
@@ -1,8 +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 System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;

From 5329b222f6de157989225761aeaf5dd89c60d72f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Mar 2020 17:49:51 +0900
Subject: [PATCH 1003/1142] Fix hyperdash test having a zero-length juice
 stream

---
 .../TestSceneHyperDash.cs                     | 45 ++++++++++++-------
 .../Objects/JuiceStream.cs                    |  4 +-
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
index 7a7c3f4103..5b3a114506 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
@@ -8,7 +8,9 @@ using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Objects;
 using osu.Game.Rulesets.Catch.UI;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Tests.Visual;
+using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
@@ -26,9 +28,11 @@ namespace osu.Game.Rulesets.Catch.Tests
         public void TestHyperDash()
         {
             AddAssert("First note is hyperdash", () => Beatmap.Value.Beatmap.HitObjects[0] is Fruit f && f.HyperDash);
-            AddUntilStep("wait for left hyperdash", () => getCatcher().Scale.X < 0 && getCatcher().HyperDashing);
+            AddUntilStep("wait for right movement", () => getCatcher().Scale.X > 0); // don't check hyperdashing as it happens too fast.
 
-            for (int i = 0; i < 2; i++)
+            AddUntilStep("wait for left movement", () => getCatcher().Scale.X < 0);
+
+            for (int i = 0; i < 3; i++)
             {
                 AddUntilStep("wait for right hyperdash", () => getCatcher().Scale.X > 0 && getCatcher().HyperDashing);
                 AddUntilStep("wait for left hyperdash", () => getCatcher().Scale.X < 0 && getCatcher().HyperDashing);
@@ -49,39 +53,50 @@ namespace osu.Game.Rulesets.Catch.Tests
             };
 
             // Should produce a hyper-dash (edge case test)
-            beatmap.HitObjects.Add(new Fruit { StartTime = 1816, X = 308 / 512f, NewCombo = true });
-            beatmap.HitObjects.Add(new JuiceStream { StartTime = 2008, X = 56 / 512f, });
+            beatmap.HitObjects.Add(new Fruit { StartTime = 1816, X = 56 / 512f, NewCombo = true });
+            beatmap.HitObjects.Add(new Fruit { StartTime = 2008, X = 308 / 512f, NewCombo = true });
 
             double startTime = 3000;
 
             const float left_x = 0.02f;
             const float right_x = 0.98f;
 
-            createObjects(() => new Fruit(), left_x);
-            createObjects(() => new JuiceStream(), right_x);
-            createObjects(() => new JuiceStream(), left_x);
-            createObjects(() => new Fruit(), right_x);
-            createObjects(() => new Fruit(), left_x);
-            createObjects(() => new Fruit(), right_x);
-            createObjects(() => new JuiceStream(), left_x);
+            createObjects(() => new Fruit { X = left_x });
+            createObjects(() => new TestJuiceStream(right_x), 1);
+            createObjects(() => new TestJuiceStream(left_x), 1);
+            createObjects(() => new Fruit { X = right_x });
+            createObjects(() => new Fruit { X = left_x });
+            createObjects(() => new Fruit { X = right_x });
+            createObjects(() => new TestJuiceStream(left_x), 1);
 
             return beatmap;
 
-            void createObjects(Func<CatchHitObject> createObject, float x)
+            void createObjects(Func<CatchHitObject> createObject, int count = 3)
             {
                 const float spacing = 140;
 
-                for (int i = 0; i < 3; i++)
+                for (int i = 0; i < count; i++)
                 {
                     var hitObject = createObject();
-                    hitObject.X = x;
                     hitObject.StartTime = startTime + i * spacing;
-
                     beatmap.HitObjects.Add(hitObject);
                 }
 
                 startTime += 700;
             }
         }
+
+        private class TestJuiceStream : JuiceStream
+        {
+            public TestJuiceStream(float x)
+            {
+                X = x;
+                Path = new SliderPath(new[]
+                {
+                    new PathControlPoint(new Vector2(x, 0)),
+                    new PathControlPoint(new Vector2(x + 30, 0)),
+                });
+            }
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index 642ff0246e..bcc2d9d9bb 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -24,8 +24,8 @@ namespace osu.Game.Rulesets.Catch.Objects
 
         public int RepeatCount { get; set; }
 
-        public double Velocity;
-        public double TickDistance;
+        public double Velocity { get; private set; }
+        public double TickDistance { get; private set; }
 
         /// <summary>
         /// The length of one span of this <see cref="JuiceStream"/>.

From 14192c069f8a694dd7fd7b28a6d6785af44ceb6b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Mar 2020 18:05:44 +0900
Subject: [PATCH 1004/1142] Don't play samples on catching a tiny droplet

---
 osu.Game.Rulesets.Catch/Objects/JuiceStream.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index 642ff0246e..1e4d8e15db 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Rulesets.Catch.Objects
         {
             base.CreateNestedHitObjects();
 
-            var tickSamples = Samples.Select(s => new HitSampleInfo
+            var dropletSamples = Samples.Select(s => new HitSampleInfo
             {
                 Bank = s.Bank,
                 Name = @"slidertick",
@@ -75,7 +75,6 @@ namespace osu.Game.Rulesets.Catch.Objects
                         {
                             AddNested(new TinyDroplet
                             {
-                                Samples = tickSamples,
                                 StartTime = t + lastEvent.Value.Time,
                                 X = X + Path.PositionAt(
                                     lastEvent.Value.PathProgress + (t / sinceLastTick) * (e.PathProgress - lastEvent.Value.PathProgress)).X / CatchPlayfield.BASE_WIDTH,
@@ -93,7 +92,7 @@ namespace osu.Game.Rulesets.Catch.Objects
                     case SliderEventType.Tick:
                         AddNested(new Droplet
                         {
-                            Samples = tickSamples,
+                            Samples = dropletSamples,
                             StartTime = e.Time,
                             X = X + Path.PositionAt(e.PathProgress).X / CatchPlayfield.BASE_WIDTH,
                         });

From 4daba48a1df153bd543d9251a9060aa163cbcd36 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Mar 2020 19:30:31 +0900
Subject: [PATCH 1005/1142] Stop rotating DrawableCatchHitObjects at the top
 level

---
 osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs | 2 +-
 osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
index 0a8e830af9..cad8892283 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableDroplet.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             float startRotation = RNG.NextSingle() * 20;
             double duration = HitObject.TimePreempt + 2000;
 
-            this.RotateTo(startRotation).RotateTo(startRotation + 720, duration);
+            ScaleContainer.RotateTo(startRotation).RotateTo(startRotation + 720, duration);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
index 197ad41247..fae5a10d04 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
@@ -13,7 +13,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         public DrawableFruit(Fruit h)
             : base(h)
         {
-            Rotation = (float)(RNG.NextDouble() - 0.5f) * 40;
         }
 
         [BackgroundDependencyLoader]
@@ -21,6 +20,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         {
             ScaleContainer.Child = new SkinnableDrawable(
                 new CatchSkinComponent(getComponent(HitObject.VisualRepresentation)), _ => new FruitPiece());
+
+            ScaleContainer.Rotation = (float)(RNG.NextDouble() - 0.5f) * 40;
         }
 
         private CatchSkinComponents getComponent(FruitVisualRepresentation hitObjectVisualRepresentation)

From 9ad519e5a5dd1207f4f6cca8b3cfbae6bb9906fe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Mar 2020 19:35:08 +0900
Subject: [PATCH 1006/1142] Remove fade and custom InitialLifetimeOffset

---
 .../Objects/Drawables/DrawableCatchHitObject.cs               | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
index 5bfe0515a1..6844be5941 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableCatchHitObject.cs
@@ -91,10 +91,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
                 ApplyResult(r => r.Type = CheckPosition.Invoke(HitObject) ? HitResult.Perfect : HitResult.Miss);
         }
 
-        protected sealed override double InitialLifetimeOffset => HitObject.TimePreempt;
-
-        protected override void UpdateInitialTransforms() => this.FadeInFromZero(200);
-
         protected override void UpdateStateTransforms(ArmedState state)
         {
             var endTime = HitObject.GetEndTime();

From 8ec2c35c4f6833a745eecc5ee98fb7c1eca7e422 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Mar 2020 19:34:52 +0900
Subject: [PATCH 1007/1142] Change origin of nested objects inside JuiceStream
 to fix visibility issues

---
 .../Objects/Drawables/DrawableJuiceStream.cs               | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableJuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableJuiceStream.cs
index 932464cfd1..7bc016d94f 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableJuiceStream.cs
@@ -6,6 +6,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
+using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
@@ -14,11 +15,13 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         private readonly Func<CatchHitObject, DrawableHitObject<CatchHitObject>> createDrawableRepresentation;
         private readonly Container dropletContainer;
 
+        public override Vector2 OriginPosition => base.OriginPosition - new Vector2(0, CatchHitObject.OBJECT_RADIUS);
+
         public DrawableJuiceStream(JuiceStream s, Func<CatchHitObject, DrawableHitObject<CatchHitObject>> createDrawableRepresentation = null)
             : base(s)
         {
             this.createDrawableRepresentation = createDrawableRepresentation;
-            RelativeSizeAxes = Axes.Both;
+            RelativeSizeAxes = Axes.X;
             Origin = Anchor.BottomLeft;
             X = 0;
 
@@ -27,6 +30,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
         protected override void AddNestedHitObject(DrawableHitObject hitObject)
         {
+            hitObject.Origin = Anchor.BottomCentre;
+
             base.AddNestedHitObject(hitObject);
             dropletContainer.Add(hitObject);
         }

From 8294dd0b717a2f6f0071eee12078d899eca10dc5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Mar 2020 19:59:49 +0900
Subject: [PATCH 1008/1142] Fix changing ruleset at song selectnot scrolling
 the current selection back into view

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 1db97af2f0..71744d8b80 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -189,7 +189,7 @@ namespace osu.Game.Screens.Select
 
             root.AddChild(newSet);
 
-            applyActiveCriteria(false, false);
+            applyActiveCriteria(false);
 
             //check if we can/need to maintain our current selection.
             if (previouslySelectedID != null)
@@ -239,7 +239,7 @@ namespace osu.Game.Screens.Select
                     {
                         Debug.Assert(bypassFilters);
 
-                        applyActiveCriteria(false, true);
+                        applyActiveCriteria(false);
                     }
 
                     return true;
@@ -396,7 +396,7 @@ namespace osu.Game.Screens.Select
         {
             if (PendingFilter?.Completed == false)
             {
-                applyActiveCriteria(false, false);
+                applyActiveCriteria(false);
                 Update();
             }
         }
@@ -406,10 +406,10 @@ namespace osu.Game.Screens.Select
             if (newCriteria != null)
                 activeCriteria = newCriteria;
 
-            applyActiveCriteria(debounce, true);
+            applyActiveCriteria(debounce);
         }
 
-        private void applyActiveCriteria(bool debounce, bool scroll)
+        private void applyActiveCriteria(bool debounce)
         {
             if (root.Children.Any() != true) return;
 
@@ -419,7 +419,7 @@ namespace osu.Game.Screens.Select
 
                 root.Filter(activeCriteria);
                 itemsCache.Invalidate();
-                if (scroll) scrollPositionCache.Invalidate();
+                scrollPositionCache.Invalidate();
             }
 
             PendingFilter?.Cancel();

From ad7cda87357d32be258e39104a5350ee9f6798a1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 10 Mar 2020 20:11:06 +0900
Subject: [PATCH 1009/1142] Fix download failures causing a non-safe drawable
 change

---
 osu.Game/Database/IModelDownloader.cs        | 2 ++
 osu.Game/Online/DownloadTrackingComposite.cs | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Database/IModelDownloader.cs b/osu.Game/Database/IModelDownloader.cs
index 17f1ccab06..99aeb4eacf 100644
--- a/osu.Game/Database/IModelDownloader.cs
+++ b/osu.Game/Database/IModelDownloader.cs
@@ -15,11 +15,13 @@ namespace osu.Game.Database
     {
         /// <summary>
         /// Fired when a <typeparamref name="TModel"/> download begins.
+        /// This is NOT run on the update thread and should be scheduled.
         /// </summary>
         event Action<ArchiveDownloadRequest<TModel>> DownloadBegan;
 
         /// <summary>
         /// Fired when a <typeparamref name="TModel"/> download is interrupted, either due to user cancellation or failure.
+        /// This is NOT run on the update thread and should be scheduled.
         /// </summary>
         event Action<ArchiveDownloadRequest<TModel>> DownloadFailed;
 
diff --git a/osu.Game/Online/DownloadTrackingComposite.cs b/osu.Game/Online/DownloadTrackingComposite.cs
index 6e7ef99c6d..0769be2998 100644
--- a/osu.Game/Online/DownloadTrackingComposite.cs
+++ b/osu.Game/Online/DownloadTrackingComposite.cs
@@ -53,17 +53,17 @@ namespace osu.Game.Online
             manager.ItemRemoved += itemRemoved;
         }
 
-        private void downloadBegan(ArchiveDownloadRequest<TModel> request)
+        private void downloadBegan(ArchiveDownloadRequest<TModel> request) => Schedule(() =>
         {
             if (request.Model.Equals(Model.Value))
                 attachDownload(request);
-        }
+        });
 
-        private void downloadFailed(ArchiveDownloadRequest<TModel> request)
+        private void downloadFailed(ArchiveDownloadRequest<TModel> request) => Schedule(() =>
         {
             if (request.Model.Equals(Model.Value))
                 attachDownload(null);
-        }
+        });
 
         private ArchiveDownloadRequest<TModel> attachedRequest;
 

From 0be423183daad7a77e186e5834bffdb623c4d08d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Mar 2020 00:36:56 +0900
Subject: [PATCH 1010/1142] Rename data class

---
 .../Mods/TestSceneCatchModPerfect.cs                   | 10 +++++-----
 .../Mods/TestSceneManiaModPerfect.cs                   |  4 ++--
 .../Mods/TestSceneOsuModPerfect.cs                     |  6 +++---
 .../Mods/TestSceneTaikoModPerfect.cs                   |  6 +++---
 osu.Game/Tests/Visual/ModPerfectTestScene.cs           | 10 +++++-----
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs
index 56d2fe1ee0..47e91e50d4 100644
--- a/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs
+++ b/osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs
@@ -20,11 +20,11 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
 
         [TestCase(false)]
         [TestCase(true)]
-        public void TestBananaShower(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestCase(new BananaShower { StartTime = 1000, EndTime = 3000 }, false), shouldMiss);
+        public void TestBananaShower(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new BananaShower { StartTime = 1000, EndTime = 3000 }, false), shouldMiss);
 
         [TestCase(false)]
         [TestCase(true)]
-        public void TestFruit(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestCase(new Fruit { StartTime = 1000 }), shouldMiss);
+        public void TestFruit(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new Fruit { StartTime = 1000 }), shouldMiss);
 
         [TestCase(false)]
         [TestCase(true)]
@@ -40,15 +40,15 @@ namespace osu.Game.Rulesets.Catch.Tests.Mods
                 })
             };
 
-            CreateHitObjectTest(new HitObjectTestCase(stream), shouldMiss);
+            CreateHitObjectTest(new HitObjectTestData(stream), shouldMiss);
         }
 
         // We only care about testing misses, hits are tested via JuiceStream
         [TestCase(true)]
-        public void TestDroplet(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestCase(new Droplet { StartTime = 1000 }), shouldMiss);
+        public void TestDroplet(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new Droplet { StartTime = 1000 }), shouldMiss);
 
         // We only care about testing misses, hits are tested via JuiceStream
         [TestCase(true)]
-        public void TestTinyDroplet(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestCase(new TinyDroplet { StartTime = 1000 }), shouldMiss);
+        public void TestTinyDroplet(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new TinyDroplet { StartTime = 1000 }), shouldMiss);
     }
 }
diff --git a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
index 4e11a302c9..607d42a1bb 100644
--- a/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
+++ b/osu.Game.Rulesets.Mania.Tests/Mods/TestSceneManiaModPerfect.cs
@@ -17,10 +17,10 @@ namespace osu.Game.Rulesets.Mania.Tests.Mods
 
         [TestCase(false)]
         [TestCase(true)]
-        public void TestNote(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestCase(new Note { StartTime = 1000 }), shouldMiss);
+        public void TestNote(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new Note { StartTime = 1000 }), shouldMiss);
 
         [TestCase(false)]
         [TestCase(true)]
-        public void TestHoldNote(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestCase(new HoldNote { StartTime = 1000, EndTime = 3000 }), shouldMiss);
+        public void TestHoldNote(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new HoldNote { StartTime = 1000, EndTime = 3000 }), shouldMiss);
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs
index fc2dfa16ec..b03a894085 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModPerfect.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
 
         [TestCase(false)]
         [TestCase(true)]
-        public void TestHitCircle(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestCase(new HitCircle { StartTime = 1000 }), shouldMiss);
+        public void TestHitCircle(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new HitCircle { StartTime = 1000 }), shouldMiss);
 
         [TestCase(false)]
         [TestCase(true)]
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                 Path = new SliderPath(PathType.Linear, new[] { Vector2.Zero, new Vector2(100, 0), })
             };
 
-            CreateHitObjectTest(new HitObjectTestCase(slider), shouldMiss);
+            CreateHitObjectTest(new HitObjectTestData(slider), shouldMiss);
         }
 
         [TestCase(false)]
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
                 Position = new Vector2(256, 192)
             };
 
-            CreateHitObjectTest(new HitObjectTestCase(spinner), shouldMiss);
+            CreateHitObjectTest(new HitObjectTestData(spinner), shouldMiss);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModPerfect.cs b/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModPerfect.cs
index fd9d01a3db..d3be2cdf0d 100644
--- a/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModPerfect.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/Mods/TestSceneTaikoModPerfect.cs
@@ -19,15 +19,15 @@ namespace osu.Game.Rulesets.Taiko.Tests.Mods
 
         [TestCase(false)]
         [TestCase(true)]
-        public void TestHit(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestCase(new CentreHit { StartTime = 1000 }), shouldMiss);
+        public void TestHit(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new CentreHit { StartTime = 1000 }), shouldMiss);
 
         [TestCase(false)]
         [TestCase(true)]
-        public void TestDrumRoll(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestCase(new DrumRoll { StartTime = 1000, EndTime = 3000 }), shouldMiss);
+        public void TestDrumRoll(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new DrumRoll { StartTime = 1000, EndTime = 3000 }), shouldMiss);
 
         [TestCase(false)]
         [TestCase(true)]
-        public void TestSwell(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestCase(new Swell { StartTime = 1000, EndTime = 3000 }), shouldMiss);
+        public void TestSwell(bool shouldMiss) => CreateHitObjectTest(new HitObjectTestData(new Swell { StartTime = 1000, EndTime = 3000 }), shouldMiss);
 
         private class TestTaikoRuleset : TaikoRuleset
         {
diff --git a/osu.Game/Tests/Visual/ModPerfectTestScene.cs b/osu.Game/Tests/Visual/ModPerfectTestScene.cs
index d6255d2478..798947eb40 100644
--- a/osu.Game/Tests/Visual/ModPerfectTestScene.cs
+++ b/osu.Game/Tests/Visual/ModPerfectTestScene.cs
@@ -20,16 +20,16 @@ namespace osu.Game.Tests.Visual
             this.mod = mod;
         }
 
-        protected void CreateHitObjectTest(HitObjectTestCase testCaseData, bool shouldMiss) => CreateModTest(new ModTestData
+        protected void CreateHitObjectTest(HitObjectTestData testData, bool shouldMiss) => CreateModTest(new ModTestData
         {
             Mod = mod,
             Beatmap = new Beatmap
             {
                 BeatmapInfo = { Ruleset = ruleset.RulesetInfo },
-                HitObjects = { testCaseData.HitObject }
+                HitObjects = { testData.HitObject }
             },
             Autoplay = !shouldMiss,
-            PassCondition = () => ((PerfectModTestPlayer)Player).CheckFailed(shouldMiss && testCaseData.FailOnMiss)
+            PassCondition = () => ((PerfectModTestPlayer)Player).CheckFailed(shouldMiss && testData.FailOnMiss)
         });
 
         protected override TestPlayer CreateModPlayer(Ruleset ruleset) => new PerfectModTestPlayer();
@@ -52,12 +52,12 @@ namespace osu.Game.Tests.Visual
             }
         }
 
-        protected class HitObjectTestCase
+        protected class HitObjectTestData
         {
             public readonly HitObject HitObject;
             public readonly bool FailOnMiss;
 
-            public HitObjectTestCase(HitObject hitObject, bool failOnMiss = true)
+            public HitObjectTestData(HitObject hitObject, bool failOnMiss = true)
             {
                 HitObject = hitObject;
                 FailOnMiss = failOnMiss;

From 998ca05a0cf144bb30a8b7f7605369e35cac45e5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Mar 2020 02:35:36 +0900
Subject: [PATCH 1011/1142] Fix disclaimer test scene supporter toggle

---
 osu.Game.Tests/Visual/Menus/TestSceneDisclaimer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneDisclaimer.cs b/osu.Game.Tests/Visual/Menus/TestSceneDisclaimer.cs
index 681bf1b40b..49fab08ded 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneDisclaimer.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneDisclaimer.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Tests.Visual.Menus
                 API.LocalUser.Value = new User
                 {
                     Username = API.LocalUser.Value.Username,
-                    Id = API.LocalUser.Value.Id,
+                    Id = API.LocalUser.Value.Id + 1,
                     IsSupporter = !API.LocalUser.Value.IsSupporter,
                 };
             });

From 7b368dca359f9ec9a766877cc77d7edbfe821fdb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Mar 2020 02:59:24 +0900
Subject: [PATCH 1012/1142] Add test coverage

---
 .../SongSelect/TestScenePlaySongSelect.cs     | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 51d302123b..105d96cdfe 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -465,6 +465,43 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("carousel still correct", () => songSelect.Carousel.SelectedBeatmap.OnlineBeatmapID == target.OnlineBeatmapID);
         }
 
+        [Test]
+        public void TestExternalBeatmapChangeWhileFilteredThenRefilter()
+        {
+            createSongSelect();
+            addManyTestMaps();
+
+            changeRuleset(0);
+
+            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmap != null);
+
+            AddStep("set filter text", () => songSelect.FilterControl.ChildrenOfType<SearchTextBox>().First().Text = "nonono");
+
+            AddUntilStep("dummy selected", () => Beatmap.Value is DummyWorkingBeatmap);
+
+            AddUntilStep("has no selection", () => songSelect.Carousel.SelectedBeatmap == null);
+
+            BeatmapInfo target = null;
+
+            AddStep("select beatmap externally", () =>
+            {
+                target = manager.GetAllUsableBeatmapSets().Where(b => b.Beatmaps.Any(bi => bi.RulesetID == 1))
+                                .ElementAt(5).Beatmaps.First();
+
+                Beatmap.Value = manager.GetWorkingBeatmap(target);
+            });
+
+            AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmap != null);
+
+            AddUntilStep("carousel has correct", () => songSelect.Carousel.SelectedBeatmap?.OnlineBeatmapID == target.OnlineBeatmapID);
+            AddUntilStep("game has correct", () => Beatmap.Value.BeatmapInfo.OnlineBeatmapID == target.OnlineBeatmapID);
+
+            AddStep("set filter text", () => songSelect.FilterControl.ChildrenOfType<SearchTextBox>().First().Text = "nononoo");
+
+            AddUntilStep("game lost selection", () => Beatmap.Value is DummyWorkingBeatmap);
+            AddAssert("carousel lost selection", () => songSelect.Carousel.SelectedBeatmap == null);
+        }
+
         [Test]
         public void TestAutoplayViaCtrlEnter()
         {

From ed837d311529bfe180871ac4600824daff890a21 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Mar 2020 10:18:41 +0900
Subject: [PATCH 1013/1142] Use framework extension method for FromHex

---
 .../Objects/Drawables/DrawableSpinner.cs      |   4 +-
 .../Visual/Online/TestSceneChatLink.cs        |   3 +-
 .../Components/TournamentMatchChatDisplay.cs  |   2 +-
 .../Screens/Gameplay/Components/TeamScore.cs  |   4 +-
 .../Ladder/Components/DrawableMatchTeam.cs    |   9 +-
 .../Screens/Ladder/LadderScreen.cs            |   4 +-
 osu.Game.Tournament/TournamentGame.cs         |  12 +-
 osu.Game/Graphics/OsuColour.cs                | 214 +++++++-----------
 .../UserInterface/DrawableOsuMenuItem.cs      |   5 +-
 .../UserInterfaceV2/LabelledDrawable.cs       |   3 +-
 osu.Game/Online/Leaderboards/DrawableRank.cs  |  24 +-
 .../Online/Leaderboards/LeaderboardScore.cs   |   8 +-
 osu.Game/Overlays/BeatmapSet/BasicStats.cs    |   5 +-
 .../BeatmapSet/Buttons/HeaderButton.cs        |   8 +-
 osu.Game/Overlays/Chat/ChatLine.cs            |  68 +++---
 .../Chat/Selection/ChannelSelectionOverlay.cs |  10 +-
 .../Chat/Tabs/PrivateChannelTabItem.cs        |   2 +-
 osu.Game/Overlays/Dialog/PopupDialog.cs       |   7 +-
 osu.Game/Overlays/Dialog/PopupDialogButton.cs |   4 +-
 osu.Game/Overlays/Direct/FilterControl.cs     |   3 +-
 osu.Game/Overlays/Direct/Header.cs            |   3 +-
 osu.Game/Overlays/DirectOverlay.cs            |   7 +-
 osu.Game/Overlays/MedalOverlay.cs             |   6 +-
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |   8 +-
 .../Profile/Header/TopHeaderContainer.cs      |   3 +-
 osu.Game/Overlays/Profile/ProfileHeader.cs    |   3 +-
 osu.Game/Overlays/Social/FilterControl.cs     |   4 +-
 osu.Game/Overlays/Social/Header.cs            |   3 +-
 osu.Game/Overlays/SocialOverlay.cs            |   8 +-
 .../Edit/Components/Menus/EditorMenuBar.cs    |   3 +-
 .../Components/Timeline/TimelineArea.cs       |   8 +-
 osu.Game/Screens/Menu/IntroSequence.cs        |  12 +-
 osu.Game/Screens/Menu/OsuLogo.cs              |   8 +-
 .../Multi/Components/DrawableGameType.cs      |   3 +-
 .../Multi/Components/ParticipantsList.cs      |   4 +-
 osu.Game/Screens/Multi/Header.cs              |   3 +-
 .../Multi/Lounge/Components/DrawableRoom.cs   |   2 +-
 .../Screens/Multi/Match/Components/Footer.cs  |   3 +-
 .../Match/Components/MatchSettingsOverlay.cs  |   4 +-
 .../Match/Components/PurpleTriangleButton.cs  |   8 +-
 .../Components/RoomAvailabilityPicker.cs      |   3 +-
 osu.Game/Screens/Multi/Multiplayer.cs         |  11 +-
 osu.Game/Screens/Select/BeatmapInfoWedge.cs   |   4 +-
 .../Carousel/DrawableCarouselBeatmap.cs       |   5 +-
 44 files changed, 249 insertions(+), 276 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index de11ab6419..0ec7f2ebfe 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -36,8 +36,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private readonly SpriteIcon symbol;
 
-        private readonly Color4 baseColour = OsuColour.FromHex(@"002c3c");
-        private readonly Color4 fillColour = OsuColour.FromHex(@"005b7c");
+        private readonly Color4 baseColour = Color4Extensions.FromHex(@"002c3c");
+        private readonly Color4 fillColour = Color4Extensions.FromHex(@"005b7c");
 
         private readonly IBindable<Vector2> positionBindable = new Bindable<Vector2>();
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
index a1c77e2db0..c76d4fd5b8 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
@@ -102,7 +103,7 @@ namespace osu.Game.Tests.Visual.Online
             {
                 bool hasBackground = !string.IsNullOrEmpty(newLine.Message.Sender.Colour);
 
-                Color4 textColour = isAction && hasBackground ? OsuColour.FromHex(newLine.Message.Sender.Colour) : Color4.White;
+                Color4 textColour = isAction && hasBackground ? Color4Extensions.FromHex(newLine.Message.Sender.Colour) : Color4.White;
 
                 var linkCompilers = newLine.ContentFlow.Where(d => d is DrawableLinkCompiler).ToList();
                 var linkSprites = linkCompilers.SelectMany(comp => ((DrawableLinkCompiler)comp).Parts);
diff --git a/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs b/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
index 8eb1c98ba0..2a183d0d45 100644
--- a/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
+++ b/osu.Game.Tournament/Components/TournamentMatchChatDisplay.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Tournament.Components
                 // else if (info.CurrentMatch.Value.Team2.Value.Players.Any(u => u.Id == Message.Sender.Id))
                 //     SenderText.Colour = TournamentGame.COLOUR_BLUE;
                 // else if (Message.Sender.Colour != null)
-                //     SenderText.Colour = ColourBox.Colour = OsuColour.FromHex(Message.Sender.Colour);
+                //     SenderText.Colour = ColourBox.Colour = Color4Extensions.FromHex(Message.Sender.Colour);
             }
         }
     }
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScore.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScore.cs
index c7071484ca..36c78c5ac1 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScore.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScore.cs
@@ -76,7 +76,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                         },
                         box = new Box
                         {
-                            Colour = OsuColour.FromHex("#FFE8AD"),
+                            Colour = Color4Extensions.FromHex("#FFE8AD"),
                             RelativeSizeAxes = Axes.Both,
                         },
                     };
@@ -85,7 +85,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                     EdgeEffect = new EdgeEffectParameters
                     {
                         Type = EdgeEffectType.Glow,
-                        Colour = OsuColour.FromHex("#FFE8AD").Opacity(0.1f),
+                        Colour = Color4Extensions.FromHex("#FFE8AD").Opacity(0.1f),
                         Hollow = true,
                         Radius = 20,
                         Roundness = 10,
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
index fe7e80873c..15cb7e44cb 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/DrawableMatchTeam.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
@@ -85,8 +86,8 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
             this.ladderEditor = ladderEditor;
 
             colourWinner = losers
-                ? OsuColour.FromHex("#8E7F48")
-                : OsuColour.FromHex("#1462AA");
+                ? Color4Extensions.FromHex("#8E7F48")
+                : Color4Extensions.FromHex("#1462AA");
 
             InternalChildren = new Drawable[]
             {
@@ -180,8 +181,8 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         {
             bool winner = completed.Value && isWinner?.Invoke() == true;
 
-            background.FadeColour(winner ? Color4.White : OsuColour.FromHex("#444"), winner ? 500 : 0, Easing.OutQuint);
-            backgroundRight.FadeColour(winner ? colourWinner : OsuColour.FromHex("#333"), winner ? 500 : 0, Easing.OutQuint);
+            background.FadeColour(winner ? Color4.White : Color4Extensions.FromHex("#444"), winner ? 500 : 0, Easing.OutQuint);
+            backgroundRight.FadeColour(winner ? colourWinner : Color4Extensions.FromHex("#333"), winner ? 500 : 0, Easing.OutQuint);
 
             AcronymText.Colour = winner ? Color4.Black : Color4.White;
 
diff --git a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
index c7e59cfa7b..6f62b3ddba 100644
--- a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
+++ b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
@@ -32,8 +32,8 @@ namespace osu.Game.Tournament.Screens.Ladder
         [BackgroundDependencyLoader]
         private void load(OsuColour colours, Storage storage)
         {
-            normalPathColour = OsuColour.FromHex("#66D1FF");
-            losersPathColour = OsuColour.FromHex("#FFC700");
+            normalPathColour = Color4Extensions.FromHex("#66D1FF");
+            losersPathColour = Color4Extensions.FromHex("#FFC700");
 
             RelativeSizeAxes = Axes.Both;
 
diff --git a/osu.Game.Tournament/TournamentGame.cs b/osu.Game.Tournament/TournamentGame.cs
index 6d597d5e7d..78bb66d553 100644
--- a/osu.Game.Tournament/TournamentGame.cs
+++ b/osu.Game.Tournament/TournamentGame.cs
@@ -1,9 +1,9 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
-using osu.Game.Graphics;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Tournament.Models;
 using osuTK.Graphics;
@@ -14,13 +14,13 @@ namespace osu.Game.Tournament
     {
         public static ColourInfo GetTeamColour(TeamColour teamColour) => teamColour == TeamColour.Red ? COLOUR_RED : COLOUR_BLUE;
 
-        public static readonly Color4 COLOUR_RED = OsuColour.FromHex("#AA1414");
-        public static readonly Color4 COLOUR_BLUE = OsuColour.FromHex("#1462AA");
+        public static readonly Color4 COLOUR_RED = Color4Extensions.FromHex("#AA1414");
+        public static readonly Color4 COLOUR_BLUE = Color4Extensions.FromHex("#1462AA");
 
-        public static readonly Color4 ELEMENT_BACKGROUND_COLOUR = OsuColour.FromHex("#fff");
-        public static readonly Color4 ELEMENT_FOREGROUND_COLOUR = OsuColour.FromHex("#000");
+        public static readonly Color4 ELEMENT_BACKGROUND_COLOUR = Color4Extensions.FromHex("#fff");
+        public static readonly Color4 ELEMENT_FOREGROUND_COLOUR = Color4Extensions.FromHex("#000");
 
-        public static readonly Color4 TEXT_COLOUR = OsuColour.FromHex("#fff");
+        public static readonly Color4 TEXT_COLOUR = Color4Extensions.FromHex("#fff");
 
         protected override void LoadComplete()
         {
diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index 59dd823266..984f5e52d1 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -1,8 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
-using System.Globalization;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Game.Beatmaps;
 using osuTK.Graphics;
 
@@ -13,45 +12,6 @@ namespace osu.Game.Graphics
         public static Color4 Gray(float amt) => new Color4(amt, amt, amt, 1f);
         public static Color4 Gray(byte amt) => new Color4(amt, amt, amt, 255);
 
-        public static Color4 FromHex(string hex)
-        {
-            var hexSpan = hex[0] == '#' ? hex.AsSpan().Slice(1) : hex.AsSpan();
-
-            switch (hexSpan.Length)
-            {
-                default:
-                    throw new ArgumentException(@"Invalid hex string length!");
-
-                case 3:
-                    return new Color4(
-                        (byte)(byte.Parse(hexSpan.Slice(0, 1), NumberStyles.HexNumber) * 17),
-                        (byte)(byte.Parse(hexSpan.Slice(1, 1), NumberStyles.HexNumber) * 17),
-                        (byte)(byte.Parse(hexSpan.Slice(2, 1), NumberStyles.HexNumber) * 17),
-                        255);
-
-                case 6:
-                    return new Color4(
-                        byte.Parse(hexSpan.Slice(0, 2), NumberStyles.HexNumber),
-                        byte.Parse(hexSpan.Slice(2, 2), NumberStyles.HexNumber),
-                        byte.Parse(hexSpan.Slice(4, 2), NumberStyles.HexNumber),
-                        255);
-
-                case 4:
-                    return new Color4(
-                        (byte)(byte.Parse(hexSpan.Slice(0, 1), NumberStyles.HexNumber) * 17),
-                        (byte)(byte.Parse(hexSpan.Slice(1, 1), NumberStyles.HexNumber) * 17),
-                        (byte)(byte.Parse(hexSpan.Slice(0, 1), NumberStyles.HexNumber) * 17),
-                        (byte)(byte.Parse(hexSpan.Slice(0, 1), NumberStyles.HexNumber) * 17));
-
-                case 8:
-                    return new Color4(
-                        byte.Parse(hexSpan.Slice(0, 2), NumberStyles.HexNumber),
-                        byte.Parse(hexSpan.Slice(2, 2), NumberStyles.HexNumber),
-                        byte.Parse(hexSpan.Slice(4, 2), NumberStyles.HexNumber),
-                        byte.Parse(hexSpan.Slice(6, 2), NumberStyles.HexNumber));
-            }
-        }
-
         public Color4 ForDifficultyRating(DifficultyRating difficulty, bool useLighterColour = false)
         {
             switch (difficulty)
@@ -78,105 +38,105 @@ namespace osu.Game.Graphics
         }
 
         // See https://github.com/ppy/osu-web/blob/master/resources/assets/less/colors.less
-        public readonly Color4 PurpleLighter = FromHex(@"eeeeff");
-        public readonly Color4 PurpleLight = FromHex(@"aa88ff");
-        public readonly Color4 PurpleLightAlternative = FromHex(@"cba4da");
-        public readonly Color4 Purple = FromHex(@"8866ee");
-        public readonly Color4 PurpleDark = FromHex(@"6644cc");
-        public readonly Color4 PurpleDarkAlternative = FromHex(@"312436");
-        public readonly Color4 PurpleDarker = FromHex(@"441188");
+        public readonly Color4 PurpleLighter = Color4Extensions.FromHex(@"eeeeff");
+        public readonly Color4 PurpleLight = Color4Extensions.FromHex(@"aa88ff");
+        public readonly Color4 PurpleLightAlternative = Color4Extensions.FromHex(@"cba4da");
+        public readonly Color4 Purple = Color4Extensions.FromHex(@"8866ee");
+        public readonly Color4 PurpleDark = Color4Extensions.FromHex(@"6644cc");
+        public readonly Color4 PurpleDarkAlternative = Color4Extensions.FromHex(@"312436");
+        public readonly Color4 PurpleDarker = Color4Extensions.FromHex(@"441188");
 
-        public readonly Color4 PinkLighter = FromHex(@"ffddee");
-        public readonly Color4 PinkLight = FromHex(@"ff99cc");
-        public readonly Color4 Pink = FromHex(@"ff66aa");
-        public readonly Color4 PinkDark = FromHex(@"cc5288");
-        public readonly Color4 PinkDarker = FromHex(@"bb1177");
+        public readonly Color4 PinkLighter = Color4Extensions.FromHex(@"ffddee");
+        public readonly Color4 PinkLight = Color4Extensions.FromHex(@"ff99cc");
+        public readonly Color4 Pink = Color4Extensions.FromHex(@"ff66aa");
+        public readonly Color4 PinkDark = Color4Extensions.FromHex(@"cc5288");
+        public readonly Color4 PinkDarker = Color4Extensions.FromHex(@"bb1177");
 
-        public readonly Color4 BlueLighter = FromHex(@"ddffff");
-        public readonly Color4 BlueLight = FromHex(@"99eeff");
-        public readonly Color4 Blue = FromHex(@"66ccff");
-        public readonly Color4 BlueDark = FromHex(@"44aadd");
-        public readonly Color4 BlueDarker = FromHex(@"2299bb");
+        public readonly Color4 BlueLighter = Color4Extensions.FromHex(@"ddffff");
+        public readonly Color4 BlueLight = Color4Extensions.FromHex(@"99eeff");
+        public readonly Color4 Blue = Color4Extensions.FromHex(@"66ccff");
+        public readonly Color4 BlueDark = Color4Extensions.FromHex(@"44aadd");
+        public readonly Color4 BlueDarker = Color4Extensions.FromHex(@"2299bb");
 
-        public readonly Color4 YellowLighter = FromHex(@"ffffdd");
-        public readonly Color4 YellowLight = FromHex(@"ffdd55");
-        public readonly Color4 Yellow = FromHex(@"ffcc22");
-        public readonly Color4 YellowDark = FromHex(@"eeaa00");
-        public readonly Color4 YellowDarker = FromHex(@"cc6600");
+        public readonly Color4 YellowLighter = Color4Extensions.FromHex(@"ffffdd");
+        public readonly Color4 YellowLight = Color4Extensions.FromHex(@"ffdd55");
+        public readonly Color4 Yellow = Color4Extensions.FromHex(@"ffcc22");
+        public readonly Color4 YellowDark = Color4Extensions.FromHex(@"eeaa00");
+        public readonly Color4 YellowDarker = Color4Extensions.FromHex(@"cc6600");
 
-        public readonly Color4 GreenLighter = FromHex(@"eeffcc");
-        public readonly Color4 GreenLight = FromHex(@"b3d944");
-        public readonly Color4 Green = FromHex(@"88b300");
-        public readonly Color4 GreenDark = FromHex(@"668800");
-        public readonly Color4 GreenDarker = FromHex(@"445500");
+        public readonly Color4 GreenLighter = Color4Extensions.FromHex(@"eeffcc");
+        public readonly Color4 GreenLight = Color4Extensions.FromHex(@"b3d944");
+        public readonly Color4 Green = Color4Extensions.FromHex(@"88b300");
+        public readonly Color4 GreenDark = Color4Extensions.FromHex(@"668800");
+        public readonly Color4 GreenDarker = Color4Extensions.FromHex(@"445500");
 
-        public readonly Color4 Sky = FromHex(@"6bb5ff");
-        public readonly Color4 GreySkyLighter = FromHex(@"c6e3f4");
-        public readonly Color4 GreySkyLight = FromHex(@"8ab3cc");
-        public readonly Color4 GreySky = FromHex(@"405461");
-        public readonly Color4 GreySkyDark = FromHex(@"303d47");
-        public readonly Color4 GreySkyDarker = FromHex(@"21272c");
+        public readonly Color4 Sky = Color4Extensions.FromHex(@"6bb5ff");
+        public readonly Color4 GreySkyLighter = Color4Extensions.FromHex(@"c6e3f4");
+        public readonly Color4 GreySkyLight = Color4Extensions.FromHex(@"8ab3cc");
+        public readonly Color4 GreySky = Color4Extensions.FromHex(@"405461");
+        public readonly Color4 GreySkyDark = Color4Extensions.FromHex(@"303d47");
+        public readonly Color4 GreySkyDarker = Color4Extensions.FromHex(@"21272c");
 
-        public readonly Color4 Seafoam = FromHex(@"05ffa2");
-        public readonly Color4 GreySeafoamLighter = FromHex(@"9ebab1");
-        public readonly Color4 GreySeafoamLight = FromHex(@"4d7365");
-        public readonly Color4 GreySeafoam = FromHex(@"33413c");
-        public readonly Color4 GreySeafoamDark = FromHex(@"2c3532");
-        public readonly Color4 GreySeafoamDarker = FromHex(@"1e2422");
+        public readonly Color4 Seafoam = Color4Extensions.FromHex(@"05ffa2");
+        public readonly Color4 GreySeafoamLighter = Color4Extensions.FromHex(@"9ebab1");
+        public readonly Color4 GreySeafoamLight = Color4Extensions.FromHex(@"4d7365");
+        public readonly Color4 GreySeafoam = Color4Extensions.FromHex(@"33413c");
+        public readonly Color4 GreySeafoamDark = Color4Extensions.FromHex(@"2c3532");
+        public readonly Color4 GreySeafoamDarker = Color4Extensions.FromHex(@"1e2422");
 
-        public readonly Color4 Cyan = FromHex(@"05f4fd");
-        public readonly Color4 GreyCyanLighter = FromHex(@"77b1b3");
-        public readonly Color4 GreyCyanLight = FromHex(@"436d6f");
-        public readonly Color4 GreyCyan = FromHex(@"293d3e");
-        public readonly Color4 GreyCyanDark = FromHex(@"243536");
-        public readonly Color4 GreyCyanDarker = FromHex(@"1e2929");
+        public readonly Color4 Cyan = Color4Extensions.FromHex(@"05f4fd");
+        public readonly Color4 GreyCyanLighter = Color4Extensions.FromHex(@"77b1b3");
+        public readonly Color4 GreyCyanLight = Color4Extensions.FromHex(@"436d6f");
+        public readonly Color4 GreyCyan = Color4Extensions.FromHex(@"293d3e");
+        public readonly Color4 GreyCyanDark = Color4Extensions.FromHex(@"243536");
+        public readonly Color4 GreyCyanDarker = Color4Extensions.FromHex(@"1e2929");
 
-        public readonly Color4 Lime = FromHex(@"82ff05");
-        public readonly Color4 GreyLimeLighter = FromHex(@"deff87");
-        public readonly Color4 GreyLimeLight = FromHex(@"657259");
-        public readonly Color4 GreyLime = FromHex(@"3f443a");
-        public readonly Color4 GreyLimeDark = FromHex(@"32352e");
-        public readonly Color4 GreyLimeDarker = FromHex(@"2e302b");
+        public readonly Color4 Lime = Color4Extensions.FromHex(@"82ff05");
+        public readonly Color4 GreyLimeLighter = Color4Extensions.FromHex(@"deff87");
+        public readonly Color4 GreyLimeLight = Color4Extensions.FromHex(@"657259");
+        public readonly Color4 GreyLime = Color4Extensions.FromHex(@"3f443a");
+        public readonly Color4 GreyLimeDark = Color4Extensions.FromHex(@"32352e");
+        public readonly Color4 GreyLimeDarker = Color4Extensions.FromHex(@"2e302b");
 
-        public readonly Color4 Violet = FromHex(@"bf04ff");
-        public readonly Color4 GreyVioletLighter = FromHex(@"ebb8fe");
-        public readonly Color4 GreyVioletLight = FromHex(@"685370");
-        public readonly Color4 GreyViolet = FromHex(@"46334d");
-        public readonly Color4 GreyVioletDark = FromHex(@"2c2230");
-        public readonly Color4 GreyVioletDarker = FromHex(@"201823");
+        public readonly Color4 Violet = Color4Extensions.FromHex(@"bf04ff");
+        public readonly Color4 GreyVioletLighter = Color4Extensions.FromHex(@"ebb8fe");
+        public readonly Color4 GreyVioletLight = Color4Extensions.FromHex(@"685370");
+        public readonly Color4 GreyViolet = Color4Extensions.FromHex(@"46334d");
+        public readonly Color4 GreyVioletDark = Color4Extensions.FromHex(@"2c2230");
+        public readonly Color4 GreyVioletDarker = Color4Extensions.FromHex(@"201823");
 
-        public readonly Color4 Carmine = FromHex(@"ff0542");
-        public readonly Color4 GreyCarmineLighter = FromHex(@"deaab4");
-        public readonly Color4 GreyCarmineLight = FromHex(@"644f53");
-        public readonly Color4 GreyCarmine = FromHex(@"342b2d");
-        public readonly Color4 GreyCarmineDark = FromHex(@"302a2b");
-        public readonly Color4 GreyCarmineDarker = FromHex(@"241d1e");
+        public readonly Color4 Carmine = Color4Extensions.FromHex(@"ff0542");
+        public readonly Color4 GreyCarmineLighter = Color4Extensions.FromHex(@"deaab4");
+        public readonly Color4 GreyCarmineLight = Color4Extensions.FromHex(@"644f53");
+        public readonly Color4 GreyCarmine = Color4Extensions.FromHex(@"342b2d");
+        public readonly Color4 GreyCarmineDark = Color4Extensions.FromHex(@"302a2b");
+        public readonly Color4 GreyCarmineDarker = Color4Extensions.FromHex(@"241d1e");
 
-        public readonly Color4 Gray0 = FromHex(@"000");
-        public readonly Color4 Gray1 = FromHex(@"111");
-        public readonly Color4 Gray2 = FromHex(@"222");
-        public readonly Color4 Gray3 = FromHex(@"333");
-        public readonly Color4 Gray4 = FromHex(@"444");
-        public readonly Color4 Gray5 = FromHex(@"555");
-        public readonly Color4 Gray6 = FromHex(@"666");
-        public readonly Color4 Gray7 = FromHex(@"777");
-        public readonly Color4 Gray8 = FromHex(@"888");
-        public readonly Color4 Gray9 = FromHex(@"999");
-        public readonly Color4 GrayA = FromHex(@"aaa");
-        public readonly Color4 GrayB = FromHex(@"bbb");
-        public readonly Color4 GrayC = FromHex(@"ccc");
-        public readonly Color4 GrayD = FromHex(@"ddd");
-        public readonly Color4 GrayE = FromHex(@"eee");
-        public readonly Color4 GrayF = FromHex(@"fff");
+        public readonly Color4 Gray0 = Color4Extensions.FromHex(@"000");
+        public readonly Color4 Gray1 = Color4Extensions.FromHex(@"111");
+        public readonly Color4 Gray2 = Color4Extensions.FromHex(@"222");
+        public readonly Color4 Gray3 = Color4Extensions.FromHex(@"333");
+        public readonly Color4 Gray4 = Color4Extensions.FromHex(@"444");
+        public readonly Color4 Gray5 = Color4Extensions.FromHex(@"555");
+        public readonly Color4 Gray6 = Color4Extensions.FromHex(@"666");
+        public readonly Color4 Gray7 = Color4Extensions.FromHex(@"777");
+        public readonly Color4 Gray8 = Color4Extensions.FromHex(@"888");
+        public readonly Color4 Gray9 = Color4Extensions.FromHex(@"999");
+        public readonly Color4 GrayA = Color4Extensions.FromHex(@"aaa");
+        public readonly Color4 GrayB = Color4Extensions.FromHex(@"bbb");
+        public readonly Color4 GrayC = Color4Extensions.FromHex(@"ccc");
+        public readonly Color4 GrayD = Color4Extensions.FromHex(@"ddd");
+        public readonly Color4 GrayE = Color4Extensions.FromHex(@"eee");
+        public readonly Color4 GrayF = Color4Extensions.FromHex(@"fff");
 
-        public readonly Color4 RedLighter = FromHex(@"ffeded");
-        public readonly Color4 RedLight = FromHex(@"ed7787");
-        public readonly Color4 Red = FromHex(@"ed1121");
-        public readonly Color4 RedDark = FromHex(@"ba0011");
-        public readonly Color4 RedDarker = FromHex(@"870000");
+        public readonly Color4 RedLighter = Color4Extensions.FromHex(@"ffeded");
+        public readonly Color4 RedLight = Color4Extensions.FromHex(@"ed7787");
+        public readonly Color4 Red = Color4Extensions.FromHex(@"ed1121");
+        public readonly Color4 RedDark = Color4Extensions.FromHex(@"ba0011");
+        public readonly Color4 RedDarker = Color4Extensions.FromHex(@"870000");
 
-        public readonly Color4 ChatBlue = FromHex(@"17292e");
+        public readonly Color4 ChatBlue = Color4Extensions.FromHex(@"17292e");
 
-        public readonly Color4 ContextMenuGray = FromHex(@"223034");
+        public readonly Color4 ContextMenuGray = Color4Extensions.FromHex(@"223034");
     }
 }
diff --git a/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs b/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
index 591ed3df83..a3ca851341 100644
--- a/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/DrawableOsuMenuItem.cs
@@ -4,6 +4,7 @@
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -38,7 +39,7 @@ namespace osu.Game.Graphics.UserInterface
             sampleClick = audio.Samples.Get(@"UI/generic-select");
 
             BackgroundColour = Color4.Transparent;
-            BackgroundColourHover = OsuColour.FromHex(@"172023");
+            BackgroundColourHover = Color4Extensions.FromHex(@"172023");
 
             updateTextColour();
         }
@@ -57,7 +58,7 @@ namespace osu.Game.Graphics.UserInterface
                     break;
 
                 case MenuItemType.Highlighted:
-                    text.Colour = OsuColour.FromHex(@"ffcc22");
+                    text.Colour = Color4Extensions.FromHex(@"ffcc22");
                     break;
             }
         }
diff --git a/osu.Game/Graphics/UserInterfaceV2/LabelledDrawable.cs b/osu.Game/Graphics/UserInterfaceV2/LabelledDrawable.cs
index f44bd72aee..0e995ca73d 100644
--- a/osu.Game/Graphics/UserInterfaceV2/LabelledDrawable.cs
+++ b/osu.Game/Graphics/UserInterfaceV2/LabelledDrawable.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -42,7 +43,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = OsuColour.FromHex("1c2125"),
+                    Colour = Color4Extensions.FromHex("1c2125"),
                 },
                 new FillFlowContainer
                 {
diff --git a/osu.Game/Online/Leaderboards/DrawableRank.cs b/osu.Game/Online/Leaderboards/DrawableRank.cs
index 20bda4601f..45b91bbf81 100644
--- a/osu.Game/Online/Leaderboards/DrawableRank.cs
+++ b/osu.Game/Online/Leaderboards/DrawableRank.cs
@@ -80,23 +80,23 @@ namespace osu.Game.Online.Leaderboards
             {
                 case ScoreRank.XH:
                 case ScoreRank.X:
-                    return OsuColour.FromHex(@"ce1c9d");
+                    return Color4Extensions.FromHex(@"ce1c9d");
 
                 case ScoreRank.SH:
                 case ScoreRank.S:
-                    return OsuColour.FromHex(@"00a8b5");
+                    return Color4Extensions.FromHex(@"00a8b5");
 
                 case ScoreRank.A:
-                    return OsuColour.FromHex(@"7cce14");
+                    return Color4Extensions.FromHex(@"7cce14");
 
                 case ScoreRank.B:
-                    return OsuColour.FromHex(@"e3b130");
+                    return Color4Extensions.FromHex(@"e3b130");
 
                 case ScoreRank.C:
-                    return OsuColour.FromHex(@"f18252");
+                    return Color4Extensions.FromHex(@"f18252");
 
                 default:
-                    return OsuColour.FromHex(@"e95353");
+                    return Color4Extensions.FromHex(@"e95353");
             }
         }
 
@@ -109,23 +109,23 @@ namespace osu.Game.Online.Leaderboards
             {
                 case ScoreRank.XH:
                 case ScoreRank.SH:
-                    return ColourInfo.GradientVertical(Color4.White, OsuColour.FromHex("afdff0"));
+                    return ColourInfo.GradientVertical(Color4.White, Color4Extensions.FromHex("afdff0"));
 
                 case ScoreRank.X:
                 case ScoreRank.S:
-                    return ColourInfo.GradientVertical(OsuColour.FromHex(@"ffe7a8"), OsuColour.FromHex(@"ffb800"));
+                    return ColourInfo.GradientVertical(Color4Extensions.FromHex(@"ffe7a8"), Color4Extensions.FromHex(@"ffb800"));
 
                 case ScoreRank.A:
-                    return OsuColour.FromHex(@"275227");
+                    return Color4Extensions.FromHex(@"275227");
 
                 case ScoreRank.B:
-                    return OsuColour.FromHex(@"553a2b");
+                    return Color4Extensions.FromHex(@"553a2b");
 
                 case ScoreRank.C:
-                    return OsuColour.FromHex(@"473625");
+                    return Color4Extensions.FromHex(@"473625");
 
                 default:
-                    return OsuColour.FromHex(@"512525");
+                    return Color4Extensions.FromHex(@"512525");
             }
         }
     }
diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index ba92b993a2..1469f29874 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -200,7 +200,7 @@ namespace osu.Game.Online.Leaderboards
                                         scoreLabel = new GlowingSpriteText
                                         {
                                             TextColour = Color4.White,
-                                            GlowColour = OsuColour.FromHex(@"83ccfa"),
+                                            GlowColour = Color4Extensions.FromHex(@"83ccfa"),
                                             Text = score.TotalScore.ToString(@"N0"),
                                             Font = OsuFont.Numeric.With(size: 23),
                                         },
@@ -325,7 +325,7 @@ namespace osu.Game.Online.Leaderboards
                                     Origin = Anchor.Centre,
                                     Size = new Vector2(icon_size),
                                     Rotation = 45,
-                                    Colour = OsuColour.FromHex(@"3087ac"),
+                                    Colour = Color4Extensions.FromHex(@"3087ac"),
                                     Icon = FontAwesome.Solid.Square,
                                     Shadow = true,
                                 },
@@ -334,7 +334,7 @@ namespace osu.Game.Online.Leaderboards
                                     Anchor = Anchor.Centre,
                                     Origin = Anchor.Centre,
                                     Size = new Vector2(icon_size - 6),
-                                    Colour = OsuColour.FromHex(@"a4edff"),
+                                    Colour = Color4Extensions.FromHex(@"a4edff"),
                                     Icon = statistic.Icon,
                                 },
                             },
@@ -344,7 +344,7 @@ namespace osu.Game.Online.Leaderboards
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
                             TextColour = Color4.White,
-                            GlowColour = OsuColour.FromHex(@"83ccfa"),
+                            GlowColour = Color4Extensions.FromHex(@"83ccfa"),
                             Text = statistic.Value,
                             Font = OsuFont.GetFont(size: 17, weight: FontWeight.Bold),
                         },
diff --git a/osu.Game/Overlays/BeatmapSet/BasicStats.cs b/osu.Game/Overlays/BeatmapSet/BasicStats.cs
index ba0a62ec2f..a2464bef09 100644
--- a/osu.Game/Overlays/BeatmapSet/BasicStats.cs
+++ b/osu.Game/Overlays/BeatmapSet/BasicStats.cs
@@ -3,6 +3,7 @@
 
 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;
@@ -124,7 +125,7 @@ namespace osu.Game.Overlays.BeatmapSet
                                 Icon = FontAwesome.Solid.Square,
                                 Size = new Vector2(12),
                                 Rotation = 45,
-                                Colour = OsuColour.FromHex(@"441288"),
+                                Colour = Color4Extensions.FromHex(@"441288"),
                             },
                             new SpriteIcon
                             {
@@ -132,7 +133,7 @@ namespace osu.Game.Overlays.BeatmapSet
                                 Origin = Anchor.Centre,
                                 Icon = icon,
                                 Size = new Vector2(12),
-                                Colour = OsuColour.FromHex(@"f7dd55"),
+                                Colour = Color4Extensions.FromHex(@"f7dd55"),
                                 Scale = new Vector2(0.8f),
                             },
                             value = new OsuSpriteText
diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/HeaderButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/HeaderButton.cs
index 6de1d3fca7..99b0b2ed3b 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/HeaderButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/HeaderButton.cs
@@ -2,8 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
-using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.BeatmapSet.Buttons
@@ -19,9 +19,9 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
         [BackgroundDependencyLoader]
         private void load()
         {
-            BackgroundColour = OsuColour.FromHex(@"094c5f");
-            Triangles.ColourLight = OsuColour.FromHex(@"0f7c9b");
-            Triangles.ColourDark = OsuColour.FromHex(@"094c5f");
+            BackgroundColour = Color4Extensions.FromHex(@"094c5f");
+            Triangles.ColourLight = Color4Extensions.FromHex(@"0f7c9b");
+            Triangles.ColourDark = Color4Extensions.FromHex(@"094c5f");
             Triangles.TriangleScale = 1.5f;
         }
     }
diff --git a/osu.Game/Overlays/Chat/ChatLine.cs b/osu.Game/Overlays/Chat/ChatLine.cs
index 8abde8a24f..496986dc56 100644
--- a/osu.Game/Overlays/Chat/ChatLine.cs
+++ b/osu.Game/Overlays/Chat/ChatLine.cs
@@ -123,7 +123,7 @@ namespace osu.Game.Overlays.Chat
                         EdgeEffect = new EdgeEffectParameters
                         {
                             Radius = 1,
-                            Colour = OsuColour.FromHex(message.Sender.Colour),
+                            Colour = Color4Extensions.FromHex(message.Sender.Colour),
                             Type = EdgeEffectType.Shadow,
                         },
                         Padding = new MarginPadding { Left = 3, Right = 3, Bottom = 1, Top = -3 },
@@ -172,7 +172,7 @@ namespace osu.Game.Overlays.Chat
                                 t.Font = OsuFont.GetFont(italics: true);
 
                                 if (senderHasBackground)
-                                    t.Colour = OsuColour.FromHex(message.Sender.Colour);
+                                    t.Colour = Color4Extensions.FromHex(message.Sender.Colour);
                             }
 
                             t.Font = t.Font.With(size: TextSize);
@@ -249,41 +249,41 @@ namespace osu.Game.Overlays.Chat
 
         private static readonly Color4[] username_colours =
         {
-            OsuColour.FromHex("588c7e"),
-            OsuColour.FromHex("b2a367"),
-            OsuColour.FromHex("c98f65"),
-            OsuColour.FromHex("bc5151"),
-            OsuColour.FromHex("5c8bd6"),
-            OsuColour.FromHex("7f6ab7"),
-            OsuColour.FromHex("a368ad"),
-            OsuColour.FromHex("aa6880"),
+            Color4Extensions.FromHex("588c7e"),
+            Color4Extensions.FromHex("b2a367"),
+            Color4Extensions.FromHex("c98f65"),
+            Color4Extensions.FromHex("bc5151"),
+            Color4Extensions.FromHex("5c8bd6"),
+            Color4Extensions.FromHex("7f6ab7"),
+            Color4Extensions.FromHex("a368ad"),
+            Color4Extensions.FromHex("aa6880"),
 
-            OsuColour.FromHex("6fad9b"),
-            OsuColour.FromHex("f2e394"),
-            OsuColour.FromHex("f2ae72"),
-            OsuColour.FromHex("f98f8a"),
-            OsuColour.FromHex("7daef4"),
-            OsuColour.FromHex("a691f2"),
-            OsuColour.FromHex("c894d3"),
-            OsuColour.FromHex("d895b0"),
+            Color4Extensions.FromHex("6fad9b"),
+            Color4Extensions.FromHex("f2e394"),
+            Color4Extensions.FromHex("f2ae72"),
+            Color4Extensions.FromHex("f98f8a"),
+            Color4Extensions.FromHex("7daef4"),
+            Color4Extensions.FromHex("a691f2"),
+            Color4Extensions.FromHex("c894d3"),
+            Color4Extensions.FromHex("d895b0"),
 
-            OsuColour.FromHex("53c4a1"),
-            OsuColour.FromHex("eace5c"),
-            OsuColour.FromHex("ea8c47"),
-            OsuColour.FromHex("fc4f4f"),
-            OsuColour.FromHex("3d94ea"),
-            OsuColour.FromHex("7760ea"),
-            OsuColour.FromHex("af52c6"),
-            OsuColour.FromHex("e25696"),
+            Color4Extensions.FromHex("53c4a1"),
+            Color4Extensions.FromHex("eace5c"),
+            Color4Extensions.FromHex("ea8c47"),
+            Color4Extensions.FromHex("fc4f4f"),
+            Color4Extensions.FromHex("3d94ea"),
+            Color4Extensions.FromHex("7760ea"),
+            Color4Extensions.FromHex("af52c6"),
+            Color4Extensions.FromHex("e25696"),
 
-            OsuColour.FromHex("677c66"),
-            OsuColour.FromHex("9b8732"),
-            OsuColour.FromHex("8c5129"),
-            OsuColour.FromHex("8c3030"),
-            OsuColour.FromHex("1f5d91"),
-            OsuColour.FromHex("4335a5"),
-            OsuColour.FromHex("812a96"),
-            OsuColour.FromHex("992861"),
+            Color4Extensions.FromHex("677c66"),
+            Color4Extensions.FromHex("9b8732"),
+            Color4Extensions.FromHex("8c5129"),
+            Color4Extensions.FromHex("8c3030"),
+            Color4Extensions.FromHex("1f5d91"),
+            Color4Extensions.FromHex("4335a5"),
+            Color4Extensions.FromHex("812a96"),
+            Color4Extensions.FromHex("992861"),
         };
     }
 }
diff --git a/osu.Game/Overlays/Chat/Selection/ChannelSelectionOverlay.cs b/osu.Game/Overlays/Chat/Selection/ChannelSelectionOverlay.cs
index 25a9a51638..b46ca6b040 100644
--- a/osu.Game/Overlays/Chat/Selection/ChannelSelectionOverlay.cs
+++ b/osu.Game/Overlays/Chat/Selection/ChannelSelectionOverlay.cs
@@ -41,10 +41,10 @@ namespace osu.Game.Overlays.Chat.Selection
         {
             RelativeSizeAxes = Axes.X;
 
-            Waves.FirstWaveColour = OsuColour.FromHex("353535");
-            Waves.SecondWaveColour = OsuColour.FromHex("434343");
-            Waves.ThirdWaveColour = OsuColour.FromHex("515151");
-            Waves.FourthWaveColour = OsuColour.FromHex("595959");
+            Waves.FirstWaveColour = Color4Extensions.FromHex("353535");
+            Waves.SecondWaveColour = Color4Extensions.FromHex("434343");
+            Waves.ThirdWaveColour = Color4Extensions.FromHex("515151");
+            Waves.FourthWaveColour = Color4Extensions.FromHex("595959");
 
             Children = new Drawable[]
             {
@@ -154,7 +154,7 @@ namespace osu.Game.Overlays.Chat.Selection
         {
             bg.Colour = colours.Gray3;
             triangles.ColourDark = colours.Gray3;
-            triangles.ColourLight = OsuColour.FromHex(@"353535");
+            triangles.ColourLight = Color4Extensions.FromHex(@"353535");
 
             headerBg.Colour = colours.Gray2.Opacity(0.75f);
         }
diff --git a/osu.Game/Overlays/Chat/Tabs/PrivateChannelTabItem.cs b/osu.Game/Overlays/Chat/Tabs/PrivateChannelTabItem.cs
index 1413b8fe78..5b428a3825 100644
--- a/osu.Game/Overlays/Chat/Tabs/PrivateChannelTabItem.cs
+++ b/osu.Game/Overlays/Chat/Tabs/PrivateChannelTabItem.cs
@@ -89,7 +89,7 @@ namespace osu.Game.Overlays.Chat.Tabs
         {
             var user = Value.Users.First();
 
-            BackgroundActive = user.Colour != null ? OsuColour.FromHex(user.Colour) : colours.BlueDark;
+            BackgroundActive = user.Colour != null ? Color4Extensions.FromHex(user.Colour) : colours.BlueDark;
             BackgroundInactive = BackgroundActive.Darken(0.5f);
         }
     }
diff --git a/osu.Game/Overlays/Dialog/PopupDialog.cs b/osu.Game/Overlays/Dialog/PopupDialog.cs
index 37db78faa1..02ef900dc5 100644
--- a/osu.Game/Overlays/Dialog/PopupDialog.cs
+++ b/osu.Game/Overlays/Dialog/PopupDialog.cs
@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Events;
-using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Containers;
 using osuTK;
@@ -114,13 +113,13 @@ namespace osu.Game.Overlays.Dialog
                                 new Box
                                 {
                                     RelativeSizeAxes = Axes.Both,
-                                    Colour = OsuColour.FromHex(@"221a21"),
+                                    Colour = Color4Extensions.FromHex(@"221a21"),
                                 },
                                 new Triangles
                                 {
                                     RelativeSizeAxes = Axes.Both,
-                                    ColourLight = OsuColour.FromHex(@"271e26"),
-                                    ColourDark = OsuColour.FromHex(@"1e171e"),
+                                    ColourLight = Color4Extensions.FromHex(@"271e26"),
+                                    ColourDark = Color4Extensions.FromHex(@"1e171e"),
                                     TriangleScale = 4,
                                 },
                             },
diff --git a/osu.Game/Overlays/Dialog/PopupDialogButton.cs b/osu.Game/Overlays/Dialog/PopupDialogButton.cs
index 75bae25b73..76ee438d6d 100644
--- a/osu.Game/Overlays/Dialog/PopupDialogButton.cs
+++ b/osu.Game/Overlays/Dialog/PopupDialogButton.cs
@@ -1,7 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Game.Graphics;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Dialog
@@ -11,7 +11,7 @@ namespace osu.Game.Overlays.Dialog
         public PopupDialogButton()
         {
             Height = 50;
-            BackgroundColour = OsuColour.FromHex(@"150e14");
+            BackgroundColour = Color4Extensions.FromHex(@"150e14");
             TextSize = 18;
         }
     }
diff --git a/osu.Game/Overlays/Direct/FilterControl.cs b/osu.Game/Overlays/Direct/FilterControl.cs
index 70a3ab54fb..e5b2b5cc34 100644
--- a/osu.Game/Overlays/Direct/FilterControl.cs
+++ b/osu.Game/Overlays/Direct/FilterControl.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Game.Graphics;
 using osu.Game.Online.API.Requests;
@@ -16,7 +17,7 @@ namespace osu.Game.Overlays.Direct
     {
         private DirectRulesetSelector rulesetSelector;
 
-        protected override Color4 BackgroundColour => OsuColour.FromHex(@"384552");
+        protected override Color4 BackgroundColour => Color4Extensions.FromHex(@"384552");
         protected override DirectSortCriteria DefaultTab => DirectSortCriteria.Ranked;
         protected override BeatmapSearchCategory DefaultCategory => BeatmapSearchCategory.Leaderboard;
 
diff --git a/osu.Game/Overlays/Direct/Header.cs b/osu.Game/Overlays/Direct/Header.cs
index 80870dcb68..5b3e394a18 100644
--- a/osu.Game/Overlays/Direct/Header.cs
+++ b/osu.Game/Overlays/Direct/Header.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.ComponentModel;
+using osu.Framework.Extensions.Color4Extensions;
 using osuTK.Graphics;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
@@ -13,7 +14,7 @@ namespace osu.Game.Overlays.Direct
 {
     public class Header : SearchableListHeader<DirectTab>
     {
-        protected override Color4 BackgroundColour => OsuColour.FromHex(@"252f3a");
+        protected override Color4 BackgroundColour => Color4Extensions.FromHex(@"252f3a");
 
         protected override DirectTab DefaultTab => DirectTab.Search;
         protected override Drawable CreateHeaderText() => new OsuSpriteText { Text = @"osu!direct", Font = OsuFont.GetFont(size: 25) };
diff --git a/osu.Game/Overlays/DirectOverlay.cs b/osu.Game/Overlays/DirectOverlay.cs
index a6f8b65a0d..61986d1cf0 100644
--- a/osu.Game/Overlays/DirectOverlay.cs
+++ b/osu.Game/Overlays/DirectOverlay.cs
@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using Humanizer;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Threading;
@@ -34,9 +35,9 @@ namespace osu.Game.Overlays
         private readonly OsuSpriteText resultCountsText;
         private FillFlowContainer<DirectPanel> panels;
 
-        protected override Color4 BackgroundColour => OsuColour.FromHex(@"485e74");
-        protected override Color4 TrianglesColourLight => OsuColour.FromHex(@"465b71");
-        protected override Color4 TrianglesColourDark => OsuColour.FromHex(@"3f5265");
+        protected override Color4 BackgroundColour => Color4Extensions.FromHex(@"485e74");
+        protected override Color4 TrianglesColourLight => Color4Extensions.FromHex(@"465b71");
+        protected override Color4 TrianglesColourDark => Color4Extensions.FromHex(@"3f5265");
 
         protected override SearchableListHeader<DirectTab> CreateHeader() => new Header();
         protected override SearchableListFilterControl<DirectSortCriteria, BeatmapSearchCategory> CreateFilterControl() => new FilterControl();
diff --git a/osu.Game/Overlays/MedalOverlay.cs b/osu.Game/Overlays/MedalOverlay.cs
index aa28b0659d..4425c2f168 100644
--- a/osu.Game/Overlays/MedalOverlay.cs
+++ b/osu.Game/Overlays/MedalOverlay.cs
@@ -126,14 +126,14 @@ namespace osu.Game.Overlays
                             new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                Colour = OsuColour.FromHex(@"05262f"),
+                                Colour = Color4Extensions.FromHex(@"05262f"),
                             },
                             new Triangles
                             {
                                 RelativeSizeAxes = Axes.Both,
                                 TriangleScale = 2,
-                                ColourDark = OsuColour.FromHex(@"04222b"),
-                                ColourLight = OsuColour.FromHex(@"052933"),
+                                ColourDark = Color4Extensions.FromHex(@"04222b"),
+                                ColourLight = Color4Extensions.FromHex(@"052933"),
                             },
                             innerSpin = new Sprite
                             {
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 466c953151..e9b3598625 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -63,10 +63,10 @@ namespace osu.Game.Overlays.Mods
 
         public ModSelectOverlay()
         {
-            Waves.FirstWaveColour = OsuColour.FromHex(@"19b0e2");
-            Waves.SecondWaveColour = OsuColour.FromHex(@"2280a2");
-            Waves.ThirdWaveColour = OsuColour.FromHex(@"005774");
-            Waves.FourthWaveColour = OsuColour.FromHex(@"003a4e");
+            Waves.FirstWaveColour = Color4Extensions.FromHex(@"19b0e2");
+            Waves.SecondWaveColour = Color4Extensions.FromHex(@"2280a2");
+            Waves.ThirdWaveColour = Color4Extensions.FromHex(@"005774");
+            Waves.FourthWaveColour = Color4Extensions.FromHex(@"003a4e");
 
             RelativeSizeAxes = Axes.Both;
 
diff --git a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
index 6ed4fc3187..2cc1f6533f 100644
--- a/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
+++ b/osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -170,7 +171,7 @@ namespace osu.Game.Overlays.Profile.Header
             userCountryText.Text = user?.Country?.FullName ?? "Alien";
             supporterTag.SupportLevel = user?.SupportLevel ?? 0;
             titleText.Text = user?.Title ?? string.Empty;
-            titleText.Colour = OsuColour.FromHex(user?.Colour ?? "fff");
+            titleText.Colour = Color4Extensions.FromHex(user?.Colour ?? "fff");
 
             userStats.Clear();
 
diff --git a/osu.Game/Overlays/Profile/ProfileHeader.cs b/osu.Game/Overlays/Profile/ProfileHeader.cs
index 3e78423a5a..f7c09e33c1 100644
--- a/osu.Game/Overlays/Profile/ProfileHeader.cs
+++ b/osu.Game/Overlays/Profile/ProfileHeader.cs
@@ -7,7 +7,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Overlays.Profile.Header;
 using osu.Game.Users;
@@ -48,7 +47,7 @@ namespace osu.Game.Overlays.Profile
                     new Box
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Colour = ColourInfo.GradientVertical(OsuColour.FromHex("222").Opacity(0.8f), OsuColour.FromHex("222").Opacity(0.2f))
+                        Colour = ColourInfo.GradientVertical(Color4Extensions.FromHex("222").Opacity(0.8f), Color4Extensions.FromHex("222").Opacity(0.2f))
                     },
                 }
             };
diff --git a/osu.Game/Overlays/Social/FilterControl.cs b/osu.Game/Overlays/Social/FilterControl.cs
index 1c2cb95dfe..93fcc3c401 100644
--- a/osu.Game/Overlays/Social/FilterControl.cs
+++ b/osu.Game/Overlays/Social/FilterControl.cs
@@ -1,16 +1,16 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Extensions.Color4Extensions;
 using osuTK.Graphics;
 using osu.Framework.Graphics;
-using osu.Game.Graphics;
 using osu.Game.Overlays.SearchableList;
 
 namespace osu.Game.Overlays.Social
 {
     public class FilterControl : SearchableListFilterControl<SocialSortCriteria, SortDirection>
     {
-        protected override Color4 BackgroundColour => OsuColour.FromHex(@"47253a");
+        protected override Color4 BackgroundColour => Color4Extensions.FromHex(@"47253a");
         protected override SocialSortCriteria DefaultTab => SocialSortCriteria.Rank;
         protected override SortDirection DefaultCategory => SortDirection.Ascending;
 
diff --git a/osu.Game/Overlays/Social/Header.cs b/osu.Game/Overlays/Social/Header.cs
index 22bca9b421..22e0fdcd56 100644
--- a/osu.Game/Overlays/Social/Header.cs
+++ b/osu.Game/Overlays/Social/Header.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Framework.Allocation;
 using System.ComponentModel;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics.Sprites;
 
 namespace osu.Game.Overlays.Social
@@ -17,7 +18,7 @@ namespace osu.Game.Overlays.Social
     {
         private OsuSpriteText browser;
 
-        protected override Color4 BackgroundColour => OsuColour.FromHex(@"38202e");
+        protected override Color4 BackgroundColour => Color4Extensions.FromHex(@"38202e");
 
         protected override SocialTab DefaultTab => SocialTab.AllPlayers;
         protected override IconUsage Icon => FontAwesome.Solid.Users;
diff --git a/osu.Game/Overlays/SocialOverlay.cs b/osu.Game/Overlays/SocialOverlay.cs
index 54c978738d..50c05e1b54 100644
--- a/osu.Game/Overlays/SocialOverlay.cs
+++ b/osu.Game/Overlays/SocialOverlay.cs
@@ -9,7 +9,6 @@ using osuTK;
 using osuTK.Graphics;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
@@ -18,6 +17,7 @@ using osu.Game.Overlays.Social;
 using osu.Game.Users;
 using System.Threading;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Threading;
 
 namespace osu.Game.Overlays
@@ -27,9 +27,9 @@ namespace osu.Game.Overlays
         private readonly LoadingSpinner loading;
         private FillFlowContainer<SocialPanel> panels;
 
-        protected override Color4 BackgroundColour => OsuColour.FromHex(@"60284b");
-        protected override Color4 TrianglesColourLight => OsuColour.FromHex(@"672b51");
-        protected override Color4 TrianglesColourDark => OsuColour.FromHex(@"5c2648");
+        protected override Color4 BackgroundColour => Color4Extensions.FromHex(@"60284b");
+        protected override Color4 TrianglesColourLight => Color4Extensions.FromHex(@"672b51");
+        protected override Color4 TrianglesColourDark => Color4Extensions.FromHex(@"5c2648");
 
         protected override SearchableListHeader<SocialTab> CreateHeader() => new Header();
         protected override SearchableListFilterControl<SocialSortCriteria, SortDirection> CreateFilterControl() => new FilterControl();
diff --git a/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs b/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
index 752615245e..afd9e3d760 100644
--- a/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
+++ b/osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -26,7 +27,7 @@ namespace osu.Game.Screens.Edit.Components.Menus
 
             MaskingContainer.CornerRadius = 0;
             ItemsContainer.Padding = new MarginPadding { Left = 100 };
-            BackgroundColour = OsuColour.FromHex("111");
+            BackgroundColour = Color4Extensions.FromHex("111");
 
             ScreenSelectionTabControl tabControl;
             AddRangeInternal(new Drawable[]
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
index 02e5db306d..b99a053859 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineArea.cs
@@ -2,11 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osuTK;
 
@@ -31,7 +31,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = OsuColour.FromHex("111")
+                    Colour = Color4Extensions.FromHex("111")
                 },
                 new GridContainer
                 {
@@ -49,7 +49,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                                     new Box
                                     {
                                         RelativeSizeAxes = Axes.Both,
-                                        Colour = OsuColour.FromHex("222")
+                                        Colour = Color4Extensions.FromHex("222")
                                     },
                                     new FillFlowContainer
                                     {
@@ -76,7 +76,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                                     new Box
                                     {
                                         RelativeSizeAxes = Axes.Both,
-                                        Colour = OsuColour.FromHex("333")
+                                        Colour = Color4Extensions.FromHex("333")
                                     },
                                     new Container<TimelineButton>
                                     {
diff --git a/osu.Game/Screens/Menu/IntroSequence.cs b/osu.Game/Screens/Menu/IntroSequence.cs
index e2dd14b18c..6731fef6f7 100644
--- a/osu.Game/Screens/Menu/IntroSequence.cs
+++ b/osu.Game/Screens/Menu/IntroSequence.cs
@@ -94,7 +94,7 @@ namespace osu.Game.Screens.Menu
                         },
                     }
                 },
-                bigRing = new Ring(OsuColour.FromHex(@"B6C5E9"), 0.85f),
+                bigRing = new Ring(Color4Extensions.FromHex(@"B6C5E9"), 0.85f),
                 mediumRing = new Ring(Color4.White.Opacity(130), 0.7f),
                 smallRing = new Ring(Color4.White, 0.6f),
                 welcomeText = new OsuSpriteText
@@ -121,7 +121,7 @@ namespace osu.Game.Screens.Menu
                             Origin = Anchor.Centre,
                             RelativeSizeAxes = Axes.Both,
                             Height = 0,
-                            Colour = OsuColour.FromHex(@"C6D8FF").Opacity(160),
+                            Colour = Color4Extensions.FromHex(@"C6D8FF").Opacity(160),
                         },
                         foregroundFill = new Box
                         {
@@ -139,28 +139,28 @@ namespace osu.Game.Screens.Menu
                     Anchor = Anchor.Centre,
                     Origin = Anchor.TopCentre,
                     Position = new Vector2(0, circle_offset),
-                    Colour = OsuColour.FromHex(@"AA92FF"),
+                    Colour = Color4Extensions.FromHex(@"AA92FF"),
                 },
                 blueCircle = new Circle
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.CentreRight,
                     Position = new Vector2(-circle_offset, 0),
-                    Colour = OsuColour.FromHex(@"8FE5FE"),
+                    Colour = Color4Extensions.FromHex(@"8FE5FE"),
                 },
                 yellowCircle = new Circle
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.BottomCentre,
                     Position = new Vector2(0, -circle_offset),
-                    Colour = OsuColour.FromHex(@"FFD64C"),
+                    Colour = Color4Extensions.FromHex(@"FFD64C"),
                 },
                 pinkCircle = new Circle
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.CentreLeft,
                     Position = new Vector2(circle_offset, 0),
-                    Colour = OsuColour.FromHex(@"e967a1"),
+                    Colour = Color4Extensions.FromHex(@"e967a1"),
                 },
             };
 
diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index be2f29cbe9..800520100e 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -6,6 +6,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Audio.Track;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -14,7 +15,6 @@ using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.Containers;
 using osuTK;
@@ -28,7 +28,7 @@ namespace osu.Game.Screens.Menu
     /// </summary>
     public class OsuLogo : BeatSyncedContainer
     {
-        public readonly Color4 OsuPink = OsuColour.FromHex(@"e967a1");
+        public readonly Color4 OsuPink = Color4Extensions.FromHex(@"e967a1");
 
         private const double transition_length = 300;
 
@@ -176,8 +176,8 @@ namespace osu.Game.Screens.Menu
                                                                         triangles = new Triangles
                                                                         {
                                                                             TriangleScale = 4,
-                                                                            ColourLight = OsuColour.FromHex(@"ff7db7"),
-                                                                            ColourDark = OsuColour.FromHex(@"de5b95"),
+                                                                            ColourLight = Color4Extensions.FromHex(@"ff7db7"),
+                                                                            ColourDark = Color4Extensions.FromHex(@"de5b95"),
                                                                             RelativeSizeAxes = Axes.Both,
                                                                         },
                                                                     }
diff --git a/osu.Game/Screens/Multi/Components/DrawableGameType.cs b/osu.Game/Screens/Multi/Components/DrawableGameType.cs
index f4941dd73a..28240f0796 100644
--- a/osu.Game/Screens/Multi/Components/DrawableGameType.cs
+++ b/osu.Game/Screens/Multi/Components/DrawableGameType.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
@@ -27,7 +28,7 @@ namespace osu.Game.Screens.Multi.Components
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = OsuColour.FromHex(@"545454"),
+                    Colour = Color4Extensions.FromHex(@"545454"),
                 },
             };
         }
diff --git a/osu.Game/Screens/Multi/Components/ParticipantsList.cs b/osu.Game/Screens/Multi/Components/ParticipantsList.cs
index 5a2dc19b66..79d130adf5 100644
--- a/osu.Game/Screens/Multi/Components/ParticipantsList.cs
+++ b/osu.Game/Screens/Multi/Components/ParticipantsList.cs
@@ -2,12 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 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.Threading;
-using osu.Game.Graphics;
 using osu.Game.Users;
 using osu.Game.Users.Drawables;
 using osuTK;
@@ -114,7 +114,7 @@ namespace osu.Game.Screens.Multi.Components
                     new Box
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Colour = OsuColour.FromHex(@"27252d"),
+                        Colour = Color4Extensions.FromHex(@"27252d"),
                     },
                     avatar = new UpdateableAvatar { RelativeSizeAxes = Axes.Both },
                 };
diff --git a/osu.Game/Screens/Multi/Header.cs b/osu.Game/Screens/Multi/Header.cs
index 1cbf2a45e7..0a05472ba3 100644
--- a/osu.Game/Screens/Multi/Header.cs
+++ b/osu.Game/Screens/Multi/Header.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -30,7 +31,7 @@ namespace osu.Game.Screens.Multi
                 new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = OsuColour.FromHex(@"2f2043"),
+                    Colour = Color4Extensions.FromHex(@"2f2043"),
                 },
                 new Container
                 {
diff --git a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
index d45dac1ae6..de02d779e1 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                             new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                Colour = OsuColour.FromHex(@"212121"),
+                                Colour = Color4Extensions.FromHex(@"212121"),
                             },
                             new StatusColouredContainer(transition_duration)
                             {
diff --git a/osu.Game/Screens/Multi/Match/Components/Footer.cs b/osu.Game/Screens/Multi/Match/Components/Footer.cs
index c0c866d815..94d7df6194 100644
--- a/osu.Game/Screens/Multi/Match/Components/Footer.cs
+++ b/osu.Game/Screens/Multi/Match/Components/Footer.cs
@@ -4,6 +4,7 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -44,7 +45,7 @@ namespace osu.Game.Screens.Multi.Match.Components
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            background.Colour = OsuColour.FromHex(@"28242d");
+            background.Colour = Color4Extensions.FromHex(@"28242d");
         }
     }
 }
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
index 115ac5037a..5d68de9ce6 100644
--- a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
+++ b/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Screens.Multi.Match.Components
                             new Box
                             {
                                 RelativeSizeAxes = Axes.Both,
-                                Colour = OsuColour.FromHex(@"28242d"),
+                                Colour = Color4Extensions.FromHex(@"28242d"),
                             },
                             new GridContainer
                             {
@@ -270,7 +270,7 @@ namespace osu.Game.Screens.Multi.Match.Components
                                                 new Box
                                                 {
                                                     RelativeSizeAxes = Axes.Both,
-                                                    Colour = OsuColour.FromHex(@"28242d").Darken(0.5f).Opacity(1f),
+                                                    Colour = Color4Extensions.FromHex(@"28242d").Darken(0.5f).Opacity(1f),
                                                 },
                                                 new FillFlowContainer
                                                 {
diff --git a/osu.Game/Screens/Multi/Match/Components/PurpleTriangleButton.cs b/osu.Game/Screens/Multi/Match/Components/PurpleTriangleButton.cs
index 8a0369ceba..1d93116d07 100644
--- a/osu.Game/Screens/Multi/Match/Components/PurpleTriangleButton.cs
+++ b/osu.Game/Screens/Multi/Match/Components/PurpleTriangleButton.cs
@@ -2,7 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Game.Graphics;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Screens.Multi.Match.Components
@@ -12,9 +12,9 @@ namespace osu.Game.Screens.Multi.Match.Components
         [BackgroundDependencyLoader]
         private void load()
         {
-            BackgroundColour = OsuColour.FromHex(@"593790");
-            Triangles.ColourLight = OsuColour.FromHex(@"7247b6");
-            Triangles.ColourDark = OsuColour.FromHex(@"593790");
+            BackgroundColour = Color4Extensions.FromHex(@"593790");
+            Triangles.ColourLight = Color4Extensions.FromHex(@"7247b6");
+            Triangles.ColourDark = Color4Extensions.FromHex(@"593790");
         }
     }
 }
diff --git a/osu.Game/Screens/Multi/Match/Components/RoomAvailabilityPicker.cs b/osu.Game/Screens/Multi/Match/Components/RoomAvailabilityPicker.cs
index 9de4a61cde..7ef39c2a74 100644
--- a/osu.Game/Screens/Multi/Match/Components/RoomAvailabilityPicker.cs
+++ b/osu.Game/Screens/Multi/Match/Components/RoomAvailabilityPicker.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Extensions;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
@@ -52,7 +53,7 @@ namespace osu.Game.Screens.Multi.Match.Components
                     new Box
                     {
                         RelativeSizeAxes = Axes.Both,
-                        Colour = OsuColour.FromHex(@"3d3943"),
+                        Colour = Color4Extensions.FromHex(@"3d3943"),
                     },
                     selection = new Box
                     {
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index b0d773869a..863a28609b 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -13,7 +13,6 @@ using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
-using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input;
@@ -75,7 +74,7 @@ namespace osu.Game.Screens.Multi
             RelativeSizeAxes = Axes.Both;
             Padding = new MarginPadding { Horizontal = -HORIZONTAL_OVERFLOW_PADDING };
 
-            var backgroundColour = OsuColour.FromHex(@"3e3a44");
+            var backgroundColour = Color4Extensions.FromHex(@"3e3a44");
 
             InternalChild = waves = new MultiplayerWaveContainer
             {
@@ -386,10 +385,10 @@ namespace osu.Game.Screens.Multi
 
             public MultiplayerWaveContainer()
             {
-                FirstWaveColour = OsuColour.FromHex(@"654d8c");
-                SecondWaveColour = OsuColour.FromHex(@"554075");
-                ThirdWaveColour = OsuColour.FromHex(@"44325e");
-                FourthWaveColour = OsuColour.FromHex(@"392850");
+                FirstWaveColour = Color4Extensions.FromHex(@"654d8c");
+                SecondWaveColour = Color4Extensions.FromHex(@"554075");
+                ThirdWaveColour = Color4Extensions.FromHex(@"44325e");
+                FourthWaveColour = Color4Extensions.FromHex(@"392850");
             }
         }
 
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index cf49cf0228..f84aac3081 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -384,7 +384,7 @@ namespace osu.Game.Screens.Select
                                     Anchor = Anchor.Centre,
                                     Origin = Anchor.Centre,
                                     RelativeSizeAxes = Axes.Both,
-                                    Colour = OsuColour.FromHex(@"441288"),
+                                    Colour = Color4Extensions.FromHex(@"441288"),
                                     Icon = FontAwesome.Solid.Square,
                                     Rotation = 45,
                                 },
@@ -394,7 +394,7 @@ namespace osu.Game.Screens.Select
                                     Origin = Anchor.Centre,
                                     RelativeSizeAxes = Axes.Both,
                                     Scale = new Vector2(0.8f),
-                                    Colour = OsuColour.FromHex(@"f7dd55"),
+                                    Colour = Color4Extensions.FromHex(@"f7dd55"),
                                     Icon = statistic.Icon,
                                 },
                             }
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
index 50419a5fb9..841bbf415c 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
@@ -69,8 +70,8 @@ namespace osu.Game.Screens.Select.Carousel
                 {
                     TriangleScale = 2,
                     RelativeSizeAxes = Axes.Both,
-                    ColourLight = OsuColour.FromHex(@"3a7285"),
-                    ColourDark = OsuColour.FromHex(@"123744")
+                    ColourLight = Color4Extensions.FromHex(@"3a7285"),
+                    ColourDark = Color4Extensions.FromHex(@"123744")
                 },
                 new FillFlowContainer
                 {

From 9683c0756d391930d6514e4d3a93ba9021ad623a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Mar 2020 12:56:12 +0900
Subject: [PATCH 1014/1142] Start path at (0,0)

---
 osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
index 5b3a114506..f39395ba44 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
@@ -91,10 +91,11 @@ namespace osu.Game.Rulesets.Catch.Tests
             public TestJuiceStream(float x)
             {
                 X = x;
+
                 Path = new SliderPath(new[]
                 {
-                    new PathControlPoint(new Vector2(x, 0)),
-                    new PathControlPoint(new Vector2(x + 30, 0)),
+                    new PathControlPoint(Vector2.Zero),
+                    new PathControlPoint(new Vector2(30, 0)),
                 });
             }
         }

From 638a9a24aa20d9c028dd750ae59b6075f781e93c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Mar 2020 02:35:49 +0900
Subject: [PATCH 1015/1142] Initial disclaimer updates

---
 osu.Game/Screens/Menu/Disclaimer.cs | 89 ++++++++++++++++++++---------
 1 file changed, 62 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Screens/Menu/Disclaimer.cs b/osu.Game/Screens/Menu/Disclaimer.cs
index bcab73715b..2c1b0c3166 100644
--- a/osu.Game/Screens/Menu/Disclaimer.cs
+++ b/osu.Game/Screens/Menu/Disclaimer.cs
@@ -9,6 +9,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Screens;
+using osu.Framework.Utils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Online.API;
@@ -33,6 +34,7 @@ namespace osu.Game.Screens.Menu
         private readonly OsuScreen nextScreen;
 
         private readonly Bindable<User> currentUser = new Bindable<User>();
+        private FillFlowContainer fill;
 
         public Disclaimer(OsuScreen nextScreen = null)
         {
@@ -49,16 +51,16 @@ namespace osu.Game.Screens.Menu
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
-                    Icon = FontAwesome.Solid.ExclamationTriangle,
+                    Icon = FontAwesome.Solid.Poo,
                     Size = new Vector2(icon_size),
                     Y = icon_y,
                 },
-                new FillFlowContainer
+                fill = new FillFlowContainer
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
                     Direction = FillDirection.Vertical,
-                    Y = icon_y + icon_size,
+                    Y = icon_y,
                     Anchor = Anchor.Centre,
                     Origin = Anchor.TopCentre,
                     Children = new Drawable[]
@@ -71,6 +73,8 @@ namespace osu.Game.Screens.Menu
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.TopCentre,
                             Spacing = new Vector2(0, 2),
+                            LayoutDuration = 2000,
+                            LayoutEasing = Easing.OutQuint
                         },
                         supportFlow = new LinkFlowContainer
                         {
@@ -86,23 +90,16 @@ namespace osu.Game.Screens.Menu
                 }
             };
 
-            textFlow.AddText("This is an ", t => t.Font = t.Font.With(Typeface.Exo, 30, FontWeight.Light));
-            textFlow.AddText("early development build", t => t.Font = t.Font.With(Typeface.Exo, 30, FontWeight.SemiBold));
+            textFlow.AddText("This project is an ongoing ", t => t.Font = t.Font.With(Typeface.Exo, 30, FontWeight.Light));
+            textFlow.AddText("work in progress", t => t.Font = t.Font.With(Typeface.Exo, 30, FontWeight.SemiBold));
 
-            textFlow.AddParagraph("Things may not work as expected", t => t.Font = t.Font.With(size: 20));
             textFlow.NewParagraph();
 
             static void format(SpriteText t) => t.Font = OsuFont.GetFont(size: 15, weight: FontWeight.SemiBold);
 
-            textFlow.AddParagraph("Detailed bug reports are welcomed via github issues.", format);
+            textFlow.AddParagraph(getRandomTip(), t => t.Font = t.Font.With(Typeface.Exo, 20, FontWeight.SemiBold));
             textFlow.NewParagraph();
 
-            textFlow.AddText("Visit ", format);
-            textFlow.AddLink("discord.gg/ppy", "https://discord.gg/ppy", creationParameters: format);
-            textFlow.AddText(" to help out or follow progress!", format);
-
-            textFlow.NewParagraph();
-            textFlow.NewParagraph();
             textFlow.NewParagraph();
 
             iconColour = colours.Yellow;
@@ -114,7 +111,7 @@ namespace osu.Game.Screens.Menu
 
                 if (e.NewValue.IsSupporter)
                 {
-                    supportFlow.AddText("Thank you for supporting osu!", format);
+                    supportFlow.AddText("Eternal thanks to you for supporting osu!", format);
                 }
                 else
                 {
@@ -125,7 +122,7 @@ namespace osu.Game.Screens.Menu
 
                 heart = supportFlow.AddIcon(FontAwesome.Solid.Heart, t =>
                 {
-                    t.Padding = new MarginPadding { Left = 5 };
+                    t.Padding = new MarginPadding { Left = 5, Top = 3 };
                     t.Font = t.Font.With(size: 12);
                     t.Origin = Anchor.Centre;
                     t.Colour = colours.Pink;
@@ -139,11 +136,6 @@ namespace osu.Game.Screens.Menu
             }, true);
         }
 
-        private void animateHeart()
-        {
-            heart.FlashColour(Color4.White, 750, Easing.OutQuint).Loop();
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
@@ -155,15 +147,28 @@ namespace osu.Game.Screens.Menu
         {
             base.OnEntering(last);
 
-            icon.Delay(1000).FadeColour(iconColour, 200, Easing.OutQuint);
-            icon.Delay(1000)
-                .MoveToY(icon_y * 1.1f, 160, Easing.OutCirc)
-                .RotateTo(-10, 160, Easing.OutCirc)
-                .Then()
-                .MoveToY(icon_y, 160, Easing.InCirc)
-                .RotateTo(0, 160, Easing.InCirc);
+            icon.RotateTo(10);
+            icon.FadeOut();
+            icon.ScaleTo(0.5f);
+
+            icon.Delay(500).FadeIn(500).ScaleTo(1, 500, Easing.OutQuint);
+
+            using (BeginDelayedSequence(3000, true))
+            {
+                icon.FadeColour(iconColour, 200, Easing.OutQuint);
+                icon.MoveToY(icon_y * 1.3f, 500, Easing.OutCirc)
+                    .RotateTo(-360, 520, Easing.OutQuint)
+                    .Then()
+                    .MoveToY(icon_y, 160, Easing.InQuart)
+                    .FadeColour(Color4.White, 160);
+
+                fill.Delay(520 + 160).MoveToOffset(new Vector2(0, 15), 160, Easing.OutQuart);
+            }
 
             supportFlow.FadeOut().Delay(2000).FadeIn(500);
+            double delay = 500;
+            foreach (var c in textFlow.Children)
+                c.FadeTo(0.001f).Delay(delay += 20).FadeIn(500);
 
             animateHeart();
 
@@ -178,5 +183,35 @@ namespace osu.Game.Screens.Menu
                         this.Push(nextScreen);
                 });
         }
+
+        private string getRandomTip()
+        {
+            string[] tips =
+            {
+                "You can press Ctrl-T anywhere in the game to toggle the toolbar!",
+                "You can press Ctrl-O anywhere in the game to access options!",
+                "All settings are dynamic and take effect in real-time. Try changing the skin while playing!",
+                "New features are coming online every update. Make sure to stay up-to-date!",
+                "If you find the UI too large or small, try adjusting UI scale in settings!",
+                "Try adjusting the \"Screen Scaling\" mode to change your gameplay or UI area, even in fullscreen!",
+                "For now, osu!direct is available to all users on lazer. You can access it anywhere using Ctrl-D!",
+                "Seeking in replays is available by dragging on the difficulty bar at the bottom of the screen!",
+                "Multithreading support means that even with low \"FPS\" your input and judgements will be accurate!",
+                "Try scrolling down in the mod select panel to find a bunch of new fun mods!",
+                "Most of the web content (profiles, rankings, etc.) are available natively in-game from the icons on the toolbar!",
+                "Get more details, hide or delete a beatmap by right-clicking on its panel at song select!",
+                "All delete operations are temoprary until quit. Restore accidentally deleted content from the maintenance settings!",
+                "Check out the \"timeshift\" multiplayer system, which has local permanent leaderboards and playlist support!",
+                "Toggle advanced frame / thread statistics with Ctrl-F11!",
+                "Take a look under the hood at performance counters and enable verbose performance logging with Ctrl-F2!",
+            };
+
+            return tips[RNG.Next(0, tips.Length)];
+        }
+
+        private void animateHeart()
+        {
+            heart.FlashColour(Color4.White, 750, Easing.OutQuint).Loop();
+        }
     }
 }

From b8d3e644166381e5f3d3b3e52a4c213dd939253c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Mar 2020 02:49:20 +0900
Subject: [PATCH 1016/1142] Rename loader test scene

---
 .../Menus/{TestSceneLoaderAnimation.cs => TestSceneLoader.cs} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename osu.Game.Tests/Visual/Menus/{TestSceneLoaderAnimation.cs => TestSceneLoader.cs} (96%)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneLoaderAnimation.cs b/osu.Game.Tests/Visual/Menus/TestSceneLoader.cs
similarity index 96%
rename from osu.Game.Tests/Visual/Menus/TestSceneLoaderAnimation.cs
rename to osu.Game.Tests/Visual/Menus/TestSceneLoader.cs
index 61fed3013e..82b0139155 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneLoaderAnimation.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneLoader.cs
@@ -14,14 +14,14 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.Menus
 {
     [TestFixture]
-    public class TestSceneLoaderAnimation : ScreenTestScene
+    public class TestSceneLoader : ScreenTestScene
     {
         private TestLoader loader;
 
         [Cached]
         private OsuLogo logo;
 
-        public TestSceneLoaderAnimation()
+        public TestSceneLoader()
         {
             Child = logo = new OsuLogo
             {

From 4012e878b06dedfe739a6725cb30b7b515bad78c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Mar 2020 02:49:34 +0900
Subject: [PATCH 1017/1142] Update loader look

---
 .../Graphics/UserInterface/LoadingSpinner.cs  |  6 ++-
 osu.Game/Screens/Loader.cs                    | 39 ++++++++-----------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/LoadingSpinner.cs b/osu.Game/Graphics/UserInterface/LoadingSpinner.cs
index 36d429b8c1..fed3dda579 100644
--- a/osu.Game/Graphics/UserInterface/LoadingSpinner.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingSpinner.cs
@@ -27,7 +27,8 @@ namespace osu.Game.Graphics.UserInterface
         /// Constuct a new loading spinner.
         /// </summary>
         /// <param name="withBox">Whether the spinner should have a surrounding black box for visibility.</param>
-        public LoadingSpinner(bool withBox = false)
+        /// <param name="inverted">Whether colours should be inverted (black spinner instead of white).</param>
+        public LoadingSpinner(bool withBox = false, bool inverted = false)
         {
             Size = new Vector2(60);
 
@@ -45,7 +46,7 @@ namespace osu.Game.Graphics.UserInterface
                 {
                     new Box
                     {
-                        Colour = Color4.Black,
+                        Colour = inverted ? Color4.White : Color4.Black,
                         RelativeSizeAxes = Axes.Both,
                         Alpha = withBox ? 0.7f : 0
                     },
@@ -53,6 +54,7 @@ namespace osu.Game.Graphics.UserInterface
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
+                        Colour = inverted ? Color4.Black : Color4.White,
                         Scale = new Vector2(withBox ? 0.6f : 1),
                         RelativeSizeAxes = Axes.Both,
                         Icon = FontAwesome.Solid.CircleNotch
diff --git a/osu.Game/Screens/Loader.cs b/osu.Game/Screens/Loader.cs
index 289413c65a..d26dc0d660 100644
--- a/osu.Game/Screens/Loader.cs
+++ b/osu.Game/Screens/Loader.cs
@@ -8,9 +8,10 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shaders;
 using osu.Framework.Utils;
 using osu.Game.Screens.Menu;
-using osuTK;
 using osu.Framework.Screens;
+using osu.Framework.Threading;
 using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
 using IntroSequence = osu.Game.Configuration.IntroSequence;
 
 namespace osu.Game.Screens
@@ -24,31 +25,12 @@ namespace osu.Game.Screens
             ValidForResume = false;
         }
 
-        protected override void LogoArriving(OsuLogo logo, bool resuming)
-        {
-            base.LogoArriving(logo, resuming);
-
-            logo.BeatMatching = false;
-            logo.Triangles = false;
-            logo.RelativePositionAxes = Axes.None;
-            logo.Origin = Anchor.BottomRight;
-            logo.Anchor = Anchor.BottomRight;
-            logo.Position = new Vector2(-40);
-            logo.Scale = new Vector2(0.2f);
-
-            logo.Delay(500).FadeInFromZero(1000, Easing.OutQuint);
-        }
-
-        protected override void LogoSuspending(OsuLogo logo)
-        {
-            base.LogoSuspending(logo);
-            logo.FadeOut(logo.Alpha * 400);
-        }
-
         private OsuScreen loadableScreen;
         private ShaderPrecompiler precompiler;
 
         private IntroSequence introSequence;
+        private LoadingSpinner spinner;
+        private ScheduledDelegate spinnerShow;
 
         protected virtual OsuScreen CreateLoadableScreen()
         {
@@ -82,6 +64,17 @@ namespace osu.Game.Screens
             LoadComponentAsync(precompiler = CreateShaderPrecompiler(), AddInternal);
             LoadComponentAsync(loadableScreen = CreateLoadableScreen());
 
+            LoadComponentAsync(spinner = new LoadingSpinner(true, true)
+            {
+                Anchor = Anchor.BottomRight,
+                Origin = Anchor.BottomRight,
+                Margin = new MarginPadding(40),
+            }, _ =>
+            {
+                AddInternal(spinner);
+                spinnerShow = Scheduler.AddDelayed(spinner.Show, 200);
+            });
+
             checkIfLoaded();
         }
 
@@ -93,6 +86,8 @@ namespace osu.Game.Screens
                 return;
             }
 
+            spinnerShow?.Cancel();
+            spinner.Hide();
             this.Push(loadableScreen);
         }
 

From ec88f7a71250bb5acf50273fadcdbb3da1bd3ee7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Mar 2020 13:20:31 +0900
Subject: [PATCH 1018/1142] Update tests and delay push animation until loader
 is done disappearing

---
 .../Visual/Menus/TestSceneLoader.cs           | 23 +++++++++++--------
 .../Graphics/UserInterface/LoadingSpinner.cs  |  2 +-
 osu.Game/Screens/Loader.cs                    | 11 +++++++--
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneLoader.cs b/osu.Game.Tests/Visual/Menus/TestSceneLoader.cs
index 82b0139155..6003d05ecd 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneLoader.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneLoader.cs
@@ -1,12 +1,15 @@
 // 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 System.Threading;
 using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Screens;
+using osu.Framework.Testing;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens;
 using osu.Game.Screens.Menu;
 using osuTK.Graphics;
@@ -42,33 +45,33 @@ namespace osu.Game.Tests.Visual.Menus
 
                 LoadScreen(loader);
             });
+
+            AddAssert("spinner did not display", () => loader.LoadingSpinner.Alpha == 0);
+
+            AddUntilStep("loaded", () => loader.ScreenLoaded);
+            AddUntilStep("not current", () => !loader.IsCurrentScreen());
         }
 
         [Test]
         public void TestDelayedLoad()
         {
             AddStep("begin loading", () => LoadScreen(loader = new TestLoader()));
-            AddUntilStep("wait for logo visible", () => loader.Logo?.Alpha > 0);
+            AddUntilStep("wait for spinner visible", () => loader.LoadingSpinner?.Alpha > 0);
             AddStep("finish loading", () => loader.AllowLoad.Set());
-            AddUntilStep("loaded", () => loader.Logo != null && loader.ScreenLoaded);
-            AddUntilStep("logo gone", () => loader.Logo?.Alpha == 0);
+            AddUntilStep("spinner gone", () => loader.LoadingSpinner?.Alpha == 0);
+            AddUntilStep("loaded", () => loader.ScreenLoaded);
+            AddUntilStep("not current", () => !loader.IsCurrentScreen());
         }
 
         private class TestLoader : Loader
         {
             public readonly ManualResetEventSlim AllowLoad = new ManualResetEventSlim();
 
-            public OsuLogo Logo;
+            public LoadingSpinner LoadingSpinner => this.ChildrenOfType<LoadingSpinner>().Single();
             private TestScreen screen;
 
             public bool ScreenLoaded => screen.IsCurrentScreen();
 
-            protected override void LogoArriving(OsuLogo logo, bool resuming)
-            {
-                Logo = logo;
-                base.LogoArriving(logo, resuming);
-            }
-
             protected override OsuScreen CreateLoadableScreen() => screen = new TestScreen();
             protected override ShaderPrecompiler CreateShaderPrecompiler() => new TestShaderPrecompiler(AllowLoad);
 
diff --git a/osu.Game/Graphics/UserInterface/LoadingSpinner.cs b/osu.Game/Graphics/UserInterface/LoadingSpinner.cs
index fed3dda579..4f4607c114 100644
--- a/osu.Game/Graphics/UserInterface/LoadingSpinner.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingSpinner.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Graphics.UserInterface
 
         protected Container MainContents;
 
-        protected const float TRANSITION_DURATION = 500;
+        public const float TRANSITION_DURATION = 500;
 
         private const float spin_duration = 900;
 
diff --git a/osu.Game/Screens/Loader.cs b/osu.Game/Screens/Loader.cs
index d26dc0d660..a5b55a24e5 100644
--- a/osu.Game/Screens/Loader.cs
+++ b/osu.Game/Screens/Loader.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shaders;
 using osu.Framework.Utils;
 using osu.Game.Screens.Menu;
@@ -87,8 +88,14 @@ namespace osu.Game.Screens
             }
 
             spinnerShow?.Cancel();
-            spinner.Hide();
-            this.Push(loadableScreen);
+
+            if (spinner.State.Value == Visibility.Visible)
+            {
+                spinner.Hide();
+                Scheduler.AddDelayed(() => this.Push(loadableScreen), LoadingSpinner.TRANSITION_DURATION);
+            }
+            else
+                this.Push(loadableScreen);
         }
 
         [BackgroundDependencyLoader]

From 93aec4e6920759e76c00f10ad322b3fd6ff8cf27 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Mar 2020 13:23:26 +0900
Subject: [PATCH 1019/1142] Improve english

Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>
---
 osu.Game/Screens/Menu/Disclaimer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Menu/Disclaimer.cs b/osu.Game/Screens/Menu/Disclaimer.cs
index 2c1b0c3166..ee8200321b 100644
--- a/osu.Game/Screens/Menu/Disclaimer.cs
+++ b/osu.Game/Screens/Menu/Disclaimer.cs
@@ -200,7 +200,7 @@ namespace osu.Game.Screens.Menu
                 "Try scrolling down in the mod select panel to find a bunch of new fun mods!",
                 "Most of the web content (profiles, rankings, etc.) are available natively in-game from the icons on the toolbar!",
                 "Get more details, hide or delete a beatmap by right-clicking on its panel at song select!",
-                "All delete operations are temoprary until quit. Restore accidentally deleted content from the maintenance settings!",
+                "All delete operations are temporary until exiting. Restore accidentally deleted content from the maintenance settings!",
                 "Check out the \"timeshift\" multiplayer system, which has local permanent leaderboards and playlist support!",
                 "Toggle advanced frame / thread statistics with Ctrl-F11!",
                 "Take a look under the hood at performance counters and enable verbose performance logging with Ctrl-F2!",

From 1bad2ff879ca53ecf35bbd5c42faa19c13450454 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Mar 2020 13:45:55 +0900
Subject: [PATCH 1020/1142] Load all catcher states ahead-of-time to avoid
 blocking loads

---
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs | 47 ++++++++++++++++++++---
 1 file changed, 41 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 2beda02398..dca3fea0d1 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Input.Bindings;
@@ -148,28 +149,62 @@ namespace osu.Game.Rulesets.Catch.UI
             [BackgroundDependencyLoader]
             private void load()
             {
-                Children = new[]
+                Children = new Drawable[]
                 {
                     caughtFruit = new Container<DrawableHitObject>
                     {
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.BottomCentre,
                     },
+                    catcherIdle = new CatcherSprite(CatcherAnimationState.Idle)
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Alpha = 0,
+                    },
+                    catcherKiai = new CatcherSprite(CatcherAnimationState.Kiai)
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Alpha = 0,
+                    },
+                    catcherFail = new CatcherSprite(CatcherAnimationState.Fail)
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Alpha = 0,
+                    }
                 };
 
                 updateCatcher();
             }
 
-            private Drawable catcherSprite;
+            private CatcherSprite catcherIdle;
+            private CatcherSprite catcherKiai;
+            private CatcherSprite catcherFail;
 
             private void updateCatcher()
             {
-                catcherSprite?.Expire();
+                catcherIdle.Hide();
+                catcherKiai.Hide();
+                catcherFail.Hide();
 
-                Add(catcherSprite = createCatcherSprite().With(c =>
+                CatcherSprite current;
+
+                switch (currentState)
                 {
-                    c.Anchor = Anchor.TopCentre;
-                }));
+                    default:
+                        current = catcherIdle;
+                        break;
+
+                    case CatcherAnimationState.Fail:
+                        current = catcherFail;
+                        break;
+
+                    case CatcherAnimationState.Kiai:
+                        current = catcherKiai;
+                        break;
+                }
+
+                current.Show();
+                (current.Drawable as IAnimation)?.GotoFrame(0);
             }
 
             private int currentDirection;

From 73b225ad62148567cf8d6148b39706ab7abe0475 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Mar 2020 14:28:13 +0900
Subject: [PATCH 1021/1142] Make catcher's trail reflect the current animation
 frame rather than play the full animation

---
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs     | 52 ++++++++++---------
 .../UI/CatcherTrailSprite.cs                  | 22 ++++++++
 2 files changed, 50 insertions(+), 24 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch/UI/CatcherTrailSprite.cs

diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index dca3fea0d1..43d98dc617 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -9,6 +9,8 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
@@ -180,31 +182,29 @@ namespace osu.Game.Rulesets.Catch.UI
             private CatcherSprite catcherKiai;
             private CatcherSprite catcherFail;
 
+            private CatcherSprite currentCatcher;
+
             private void updateCatcher()
             {
-                catcherIdle.Hide();
-                catcherKiai.Hide();
-                catcherFail.Hide();
-
-                CatcherSprite current;
+                currentCatcher?.Hide();
 
                 switch (currentState)
                 {
                     default:
-                        current = catcherIdle;
+                        currentCatcher = catcherIdle;
                         break;
 
                     case CatcherAnimationState.Fail:
-                        current = catcherFail;
+                        currentCatcher = catcherFail;
                         break;
 
                     case CatcherAnimationState.Kiai:
-                        current = catcherKiai;
+                        currentCatcher = catcherKiai;
                         break;
                 }
 
-                current.Show();
-                (current.Drawable as IAnimation)?.GotoFrame(0);
+                currentCatcher.Show();
+                (currentCatcher.Drawable as IAnimation)?.GotoFrame(0);
             }
 
             private int currentDirection;
@@ -227,14 +227,14 @@ namespace osu.Game.Rulesets.Catch.UI
             private bool trail;
 
             /// <summary>
-            /// Activate or deactive the trail. Will be automatically deactivated when conditions to keep the trail displayed are no longer met.
+            /// Activate or deactivate the trail. Will be automatically deactivated when conditions to keep the trail displayed are no longer met.
             /// </summary>
             protected bool Trail
             {
                 get => trail;
                 set
                 {
-                    if (value == trail) return;
+                    if (value == trail || AdditiveTarget == null) return;
 
                     trail = value;
 
@@ -245,21 +245,25 @@ namespace osu.Game.Rulesets.Catch.UI
 
             private void beginTrail()
             {
-                Trail &= dashing || HyperDashing;
-                Trail &= AdditiveTarget != null;
+                if (!dashing && !HyperDashing)
+                {
+                    Trail = false;
+                    return;
+                }
 
-                if (!Trail) return;
+                Texture tex = (currentCatcher.Drawable as TextureAnimation)?.CurrentFrame ?? ((Sprite)currentCatcher.Drawable).Texture;
 
-                var additive = createCatcherSprite();
+                var additive = new CatcherTrailSprite(tex)
+                {
+                    Anchor = Anchor,
+                    Scale = Scale,
+                    Colour = HyperDashing ? Color4.Red : Color4.White,
+                    Blending = BlendingParameters.Additive,
+                    RelativePositionAxes = RelativePositionAxes,
+                    Position = Position
+                };
 
-                additive.Anchor = Anchor;
-                additive.Scale = Scale;
-                additive.Colour = HyperDashing ? Color4.Red : Color4.White;
-                additive.Blending = BlendingParameters.Additive;
-                additive.RelativePositionAxes = RelativePositionAxes;
-                additive.Position = Position;
-
-                AdditiveTarget.Add(additive);
+                AdditiveTarget?.Add(additive);
 
                 additive.FadeTo(0.4f).FadeOut(800, Easing.OutQuint);
                 additive.Expire(true);
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherTrailSprite.cs b/osu.Game.Rulesets.Catch/UI/CatcherTrailSprite.cs
new file mode 100644
index 0000000000..56cb7dbfda
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/UI/CatcherTrailSprite.cs
@@ -0,0 +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 osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Textures;
+using osuTK;
+
+namespace osu.Game.Rulesets.Catch.UI
+{
+    public class CatcherTrailSprite : Sprite
+    {
+        public CatcherTrailSprite(Texture texture)
+        {
+            Texture = texture;
+
+            Size = new Vector2(CatcherArea.CATCHER_SIZE);
+
+            // Sets the origin roughly to the centre of the catcher's plate to allow for correct scaling.
+            OriginPosition = new Vector2(0.5f, 0.06f) * CatcherArea.CATCHER_SIZE;
+        }
+    }
+}

From 401429feeccbcb92818cfd31f5020ffdf3070abe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Mar 2020 15:52:18 +0900
Subject: [PATCH 1022/1142] Revert changes to ScrenTestScene

---
 osu.Game/Tests/Visual/ScreenTestScene.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Tests/Visual/ScreenTestScene.cs b/osu.Game/Tests/Visual/ScreenTestScene.cs
index 1a6ebed425..d26aacf2bc 100644
--- a/osu.Game/Tests/Visual/ScreenTestScene.cs
+++ b/osu.Game/Tests/Visual/ScreenTestScene.cs
@@ -38,11 +38,12 @@ namespace osu.Game.Tests.Visual
 
         private void addExitAllScreensStep()
         {
-            AddStep("exit all screens", () =>
+            AddUntilStep("exit all screens", () =>
             {
-                if (Stack.CurrentScreen == null) return;
+                if (Stack.CurrentScreen == null) return true;
 
                 Stack.Exit();
+                return false;
             });
         }
     }

From 966e5bbc8aa441cecde5fa54fce6f659015b6392 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Mar 2020 15:54:03 +0900
Subject: [PATCH 1023/1142] User helper function to reduce copy paste

---
 .../Objects/Drawables/DrawableBanana.cs                    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
index 2e7618b8df..01b76ceed9 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableBanana.cs
@@ -33,10 +33,11 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             ScaleContainer.ScaleTo(HitObject.Scale * (end_scale + random_scale_range * RNG.NextSingle()))
                           .Then().ScaleTo(HitObject.Scale * end_scale, HitObject.TimePreempt);
 
-            const float random_angle_range = 180;
+            ScaleContainer.RotateTo(getRandomAngle())
+                          .Then()
+                          .RotateTo(getRandomAngle(), HitObject.TimePreempt);
 
-            ScaleContainer.RotateTo(random_angle_range * (RNG.NextSingle() * 2 - 1))
-                          .Then().RotateTo(random_angle_range * (RNG.NextSingle() * 2 - 1), HitObject.TimePreempt);
+            float getRandomAngle() => 180 * (RNG.NextSingle() * 2 - 1);
         }
 
         private Color4 getBananaColour()

From 6546fd3f812d99141813914df402b6d0ee72ff46 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Mar 2020 16:07:44 +0900
Subject: [PATCH 1024/1142] Fix potential null due to async load

---
 osu.Game.Tests/Visual/Menus/TestSceneLoader.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneLoader.cs b/osu.Game.Tests/Visual/Menus/TestSceneLoader.cs
index 6003d05ecd..b3064ba9be 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneLoader.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneLoader.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Tests.Visual.Menus
                 LoadScreen(loader);
             });
 
-            AddAssert("spinner did not display", () => loader.LoadingSpinner.Alpha == 0);
+            AddAssert("spinner did not display", () => loader.LoadingSpinner?.Alpha == 0);
 
             AddUntilStep("loaded", () => loader.ScreenLoaded);
             AddUntilStep("not current", () => !loader.IsCurrentScreen());
@@ -67,7 +67,7 @@ namespace osu.Game.Tests.Visual.Menus
         {
             public readonly ManualResetEventSlim AllowLoad = new ManualResetEventSlim();
 
-            public LoadingSpinner LoadingSpinner => this.ChildrenOfType<LoadingSpinner>().Single();
+            public LoadingSpinner LoadingSpinner => this.ChildrenOfType<LoadingSpinner>().FirstOrDefault();
             private TestScreen screen;
 
             public bool ScreenLoaded => screen.IsCurrentScreen();

From 8eb8572c738b549be8915ea809a7ad20d600e307 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Mar 2020 18:00:39 +0900
Subject: [PATCH 1025/1142] Apply osu!-side video sprite changes

---
 osu.Game.Tournament/Components/TourneyVideo.cs | 2 +-
 osu.Game/Screens/Menu/IntroTriangles.cs        | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Components/TourneyVideo.cs b/osu.Game.Tournament/Components/TourneyVideo.cs
index 43088d6b92..81620b017c 100644
--- a/osu.Game.Tournament/Components/TourneyVideo.cs
+++ b/osu.Game.Tournament/Components/TourneyVideo.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Tournament.Components
 
             if (stream != null)
             {
-                InternalChild = video = new VideoSprite(stream)
+                InternalChild = video = new VideoSprite(stream, false)
                 {
                     RelativeSizeAxes = Axes.Both,
                     FillMode = FillMode.Fit,
diff --git a/osu.Game/Screens/Menu/IntroTriangles.cs b/osu.Game/Screens/Menu/IntroTriangles.cs
index 4e51ff939a..be5762e68d 100644
--- a/osu.Game/Screens/Menu/IntroTriangles.cs
+++ b/osu.Game/Screens/Menu/IntroTriangles.cs
@@ -259,11 +259,18 @@ namespace osu.Game.Screens.Menu
 
             private class LazerLogo : CompositeDrawable
             {
+                private readonly Stream videoStream;
+
                 public LazerLogo(Stream videoStream)
                 {
+                    this.videoStream = videoStream;
                     Size = new Vector2(960);
+                }
 
-                    InternalChild = new VideoSprite(videoStream)
+                [BackgroundDependencyLoader]
+                private void load()
+                {
+                    InternalChild = new VideoSprite(videoStream, false)
                     {
                         RelativeSizeAxes = Axes.Both,
                         Clock = new FramedOffsetClock(Clock) { Offset = -logo_1 }

From 758bb3711f6f7105296a1922b0108a4129743013 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Mar 2020 18:07:11 +0900
Subject: [PATCH 1026/1142] Add more sane limit for maximum slider length

---
 osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
index 1fc51d2ce8..8d3ad5984f 100644
--- a/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
+++ b/osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
 
                 if (split.Length > 7)
                 {
-                    length = Math.Max(0, Parsing.ParseDouble(split[7]));
+                    length = Math.Max(0, Parsing.ParseDouble(split[7], Parsing.MAX_COORDINATE_VALUE));
                     if (length == 0)
                         length = null;
                 }

From 9667934ed9d0a7a44f55af4c7515fdb0df3bded8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Mar 2020 18:17:32 +0900
Subject: [PATCH 1027/1142] Remove unlimited timing points in difficulty
 calculation

---
 .../LegacyDifficultyCalculatorBeatmapDecoder.cs      | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyDifficultyCalculatorBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDifficultyCalculatorBeatmapDecoder.cs
index 527f520172..bf52a87865 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDifficultyCalculatorBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDifficultyCalculatorBeatmapDecoder.cs
@@ -26,17 +26,5 @@ namespace osu.Game.Beatmaps.Formats
             AddDecoder<Beatmap>(@"osu file format v", m => new LegacyDifficultyCalculatorBeatmapDecoder(int.Parse(m.Split('v').Last())));
             SetFallbackDecoder<Beatmap>(() => new LegacyDifficultyCalculatorBeatmapDecoder());
         }
-
-        protected override TimingControlPoint CreateTimingControlPoint()
-            => new LegacyDifficultyCalculatorTimingControlPoint();
-
-        private class LegacyDifficultyCalculatorTimingControlPoint : TimingControlPoint
-        {
-            public LegacyDifficultyCalculatorTimingControlPoint()
-            {
-                BeatLengthBindable.MinValue = double.MinValue;
-                BeatLengthBindable.MaxValue = double.MaxValue;
-            }
-        }
     }
 }

From 40ab860ab56f7b89264c0c7c3475d680a09c0951 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Mar 2020 18:23:30 +0900
Subject: [PATCH 1028/1142] Remove unused using

---
 .../Beatmaps/Formats/LegacyDifficultyCalculatorBeatmapDecoder.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Beatmaps/Formats/LegacyDifficultyCalculatorBeatmapDecoder.cs b/osu.Game/Beatmaps/Formats/LegacyDifficultyCalculatorBeatmapDecoder.cs
index bf52a87865..3420fcf260 100644
--- a/osu.Game/Beatmaps/Formats/LegacyDifficultyCalculatorBeatmapDecoder.cs
+++ b/osu.Game/Beatmaps/Formats/LegacyDifficultyCalculatorBeatmapDecoder.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
-using osu.Game.Beatmaps.ControlPoints;
 
 namespace osu.Game.Beatmaps.Formats
 {

From 5b03b3e36304b1546c671aa875ce3d97bec79ced Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Mar 2020 18:36:37 +0900
Subject: [PATCH 1029/1142] Fix hyperdashes not recalculated with HR
 application

---
 .../Beatmaps/CatchBeatmapProcessor.cs          | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
index 1a5d0f983b..e0c65a8317 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
@@ -28,8 +28,6 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
 
             ApplyPositionOffsets(Beatmap);
 
-            initialiseHyperDash((List<CatchHitObject>)Beatmap.HitObjects);
-
             int index = 0;
 
             foreach (var obj in Beatmap.HitObjects.OfType<CatchHitObject>())
@@ -90,6 +88,8 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                         break;
                 }
             }
+
+            initialiseHyperDash(beatmap);
         }
 
         private static void applyHardRockOffset(CatchHitObject hitObject, ref float? lastPosition, ref double lastStartTime, FastRandom rng)
@@ -191,14 +191,14 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
             }
         }
 
-        private void initialiseHyperDash(List<CatchHitObject> objects)
+        private static void initialiseHyperDash(IBeatmap beatmap)
         {
             List<CatchHitObject> objectWithDroplets = new List<CatchHitObject>();
 
-            foreach (var currentObject in objects)
+            foreach (var currentObject in beatmap.HitObjects)
             {
-                if (currentObject is Fruit)
-                    objectWithDroplets.Add(currentObject);
+                if (currentObject is Fruit fruitObject)
+                    objectWithDroplets.Add(fruitObject);
 
                 if (currentObject is JuiceStream)
                 {
@@ -212,7 +212,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
 
             objectWithDroplets.Sort((h1, h2) => h1.StartTime.CompareTo(h2.StartTime));
 
-            double halfCatcherWidth = CatcherArea.GetCatcherSize(Beatmap.BeatmapInfo.BaseDifficulty) / 2;
+            double halfCatcherWidth = CatcherArea.GetCatcherSize(beatmap.BeatmapInfo.BaseDifficulty) / 2;
             int lastDirection = 0;
             double lastExcess = halfCatcherWidth;
 
@@ -221,6 +221,10 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                 CatchHitObject currentObject = objectWithDroplets[i];
                 CatchHitObject nextObject = objectWithDroplets[i + 1];
 
+                // Reset variables in-case values have changed (e.g. after applying HR)
+                currentObject.HyperDashTarget = null;
+                currentObject.DistanceToHyperDash = 0;
+
                 int thisDirection = nextObject.X > currentObject.X ? 1 : -1;
                 double timeToNext = nextObject.StartTime - currentObject.StartTime - 1000f / 60f / 4; // 1/4th of a frame of grace time, taken from osu-stable
                 double distanceToNext = Math.Abs(nextObject.X - currentObject.X) - (lastDirection == thisDirection ? lastExcess : halfCatcherWidth);

From f8e7579f4574aee46ae278fe853e43864d047710 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Mar 2020 18:37:58 +0900
Subject: [PATCH 1030/1142] Fix juice stream position reset not ever being
 applied

---
 .../Beatmaps/CatchBeatmapProcessor.cs               | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
index e0c65a8317..e76e95e9aa 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
@@ -74,6 +74,12 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                         break;
 
                     case JuiceStream juiceStream:
+                        // Todo: BUG!! Stable used the last control point as the final position of the path, but it should use the computed path instead.
+                        lastPosition = juiceStream.X + juiceStream.Path.ControlPoints[^1].Position.Value.X / CatchPlayfield.BASE_WIDTH;
+
+                        // Todo: BUG!! Stable attempted to use the end time of the stream, but referenced it too early in execution and used the start time instead.
+                        lastStartTime = juiceStream.StartTime;
+
                         foreach (var nested in juiceStream.NestedHitObjects)
                         {
                             var catchObject = (CatchHitObject)nested;
@@ -94,13 +100,6 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
 
         private static void applyHardRockOffset(CatchHitObject hitObject, ref float? lastPosition, ref double lastStartTime, FastRandom rng)
         {
-            if (hitObject is JuiceStream stream)
-            {
-                lastPosition = stream.EndX;
-                lastStartTime = stream.EndTime;
-                return;
-            }
-
             if (!(hitObject is Fruit))
                 return;
 

From 919410c6277644329b96a6724a5045b6a94072ed Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Mar 2020 18:39:47 +0900
Subject: [PATCH 1031/1142] Remove always-false condition

---
 osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
index e76e95e9aa..5f23bf1428 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
@@ -100,9 +100,6 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
 
         private static void applyHardRockOffset(CatchHitObject hitObject, ref float? lastPosition, ref double lastStartTime, FastRandom rng)
         {
-            if (!(hitObject is Fruit))
-                return;
-
             float offsetPosition = hitObject.X;
             double startTime = hitObject.StartTime;
 

From 5c051027e707db7fea7bf6a11b121249d44afd70 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 11 Mar 2020 18:43:08 +0900
Subject: [PATCH 1032/1142] Fix different offset being applied from stable

---
 osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
index 5f23bf1428..986dc9dbb9 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
@@ -112,7 +112,9 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
             }
 
             float positionDiff = offsetPosition - lastPosition.Value;
-            double timeDiff = startTime - lastStartTime;
+
+            // Todo: BUG!! Stable calculated time deltas as ints, which affects randomisation. This should be changed to a double.
+            int timeDiff = (int)(startTime - lastStartTime);
 
             if (timeDiff > 1000)
             {
@@ -128,7 +130,8 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                 return;
             }
 
-            if (Math.Abs(positionDiff * CatchPlayfield.BASE_WIDTH) < timeDiff / 3d)
+            // ReSharper disable once PossibleLossOfFraction
+            if (Math.Abs(positionDiff * CatchPlayfield.BASE_WIDTH) < timeDiff / 3)
                 applyOffset(ref offsetPosition, positionDiff);
 
             hitObject.XOffset = offsetPosition - hitObject.X;

From 2866d626531f678e07c81b44ab27d7fecae95d87 Mon Sep 17 00:00:00 2001
From: Olle Kelderman <omkelderman@gmail.com>
Date: Wed, 11 Mar 2020 16:17:28 +0100
Subject: [PATCH 1033/1142] Use environment variable for initializing
 osuInstallPath

---
 osu.Game.Tournament/IPC/FileBasedIPC.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index b19f2bedf0..eefa9fcfe6 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -163,12 +163,7 @@ namespace osu.Game.Tournament.IPC
                 {
                     try
                     {
-                        stableInstallPath = "G:\\My Drive\\Main\\osu!tourney";
-
-                        if (checkExists(stableInstallPath))
-                            return stableInstallPath;
-
-                        stableInstallPath = "G:\\My Drive\\Main\\osu!mappool";
+                        stableInstallPath = Environment.GetEnvironmentVariable("OSU_STABLE_PATH");
 
                         if (checkExists(stableInstallPath))
                             return stableInstallPath;

From efceeba0769999db723bb74d0f0a2b5c143270c2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Mar 2020 02:22:02 +0900
Subject: [PATCH 1034/1142] Use fixed width for tournament score displays

---
 .../Screens/Gameplay/Components/MatchScoreDisplay.cs       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs
index ed14956793..2e7484542a 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs
@@ -11,6 +11,7 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Models;
+using osuTK;
 
 namespace osu.Game.Tournament.Screens.Gameplay.Components
 {
@@ -131,13 +132,15 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                 Margin = new MarginPadding { Top = bar_height, Horizontal = 10 };
 
                 Winning = false;
+
+                DisplayedCountSpriteText.Spacing = new Vector2(-6);
             }
 
             public bool Winning
             {
                 set => DisplayedCountSpriteText.Font = value
-                    ? OsuFont.Torus.With(weight: FontWeight.Bold, size: 50)
-                    : OsuFont.Torus.With(weight: FontWeight.Regular, size: 40);
+                    ? OsuFont.Torus.With(weight: FontWeight.Bold, size: 50, fixedWidth: true)
+                    : OsuFont.Torus.With(weight: FontWeight.Regular, size: 40, fixedWidth: true);
             }
         }
     }

From 09b9983286d5a1a7f960ed968f33a2b3bc139c67 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 11 Mar 2020 21:14:07 +0300
Subject: [PATCH 1035/1142] Fix CatcherAnimationState is Fail if missing banana
 shower

---
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 9ee94636f1..d18f5e165f 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -345,7 +345,10 @@ namespace osu.Game.Rulesets.Catch.UI
                 if (validCatch)
                     updateState(fruit.Kiai ? CatcherAnimationState.Kiai : CatcherAnimationState.Idle);
                 else
-                    updateState(CatcherAnimationState.Fail);
+                {
+                    if (!(fruit is Banana))
+                        updateState(CatcherAnimationState.Fail);
+                }
 
                 return validCatch;
             }

From e46c070d951341370f16733da1d63c33c0f116c6 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Wed, 11 Mar 2020 23:09:29 +0300
Subject: [PATCH 1036/1142] Add test scene

---
 .../TestSceneDrawableHitObjects.cs            | 53 +++++++++++++++----
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs     | 10 ++--
 2 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
index 070847c0c1..304c7e3854 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using osu.Framework.Allocation;
+using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
@@ -34,8 +34,8 @@ namespace osu.Game.Rulesets.Catch.Tests
         private DrawableCatchRuleset drawableRuleset;
         private double playfieldTime => drawableRuleset.Playfield.Time.Current;
 
-        [BackgroundDependencyLoader]
-        private void load()
+        [SetUp]
+        public void Setup() => Schedule(() =>
         {
             var controlPointInfo = new ControlPointInfo();
             controlPointInfo.Add(0, new TimingControlPoint());
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Catch.Tests
                 ControlPointInfo = controlPointInfo
             });
 
-            Add(new Container
+            Child = new Container
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
@@ -66,16 +66,49 @@ namespace osu.Game.Rulesets.Catch.Tests
                 {
                     drawableRuleset = new DrawableCatchRuleset(new CatchRuleset(), beatmap.GetPlayableBeatmap(new CatchRuleset().RulesetInfo))
                 }
-            });
+            };
+        });
+
+        [Test]
+        public void TestFruits()
+        {
+            AddStep("hit fruits", () => spawnFruits(true));
+            AddUntilStep("wait for completion", () => playfieldIsEmpty);
+            AddAssert("catcher state is idle", () => catcherState == CatcherAnimationState.Idle);
 
             AddStep("miss fruits", () => spawnFruits());
-            AddStep("hit fruits", () => spawnFruits(true));
-            AddStep("miss juicestream", () => spawnJuiceStream());
-            AddStep("hit juicestream", () => spawnJuiceStream(true));
-            AddStep("miss bananas", () => spawnBananas());
-            AddStep("hit bananas", () => spawnBananas(true));
+            AddUntilStep("wait for completion", () => playfieldIsEmpty);
+            AddAssert("catcher state is failed", () => catcherState == CatcherAnimationState.Fail);
         }
 
+        [Test]
+        public void TestJuicestream()
+        {
+            AddStep("hit juicestream", () => spawnJuiceStream(true));
+            AddUntilStep("wait for completion", () => playfieldIsEmpty);
+            AddAssert("catcher state is idle", () => catcherState == CatcherAnimationState.Idle);
+
+            AddStep("miss juicestream", () => spawnJuiceStream());
+            AddUntilStep("wait for completion", () => playfieldIsEmpty);
+            AddAssert("catcher state is failed", () => catcherState == CatcherAnimationState.Fail);
+        }
+
+        [Test]
+        public void TestBananas()
+        {
+            AddStep("hit bananas", () => spawnBananas(true));
+            AddUntilStep("wait for completion", () => playfieldIsEmpty);
+            AddAssert("catcher state is idle", () => catcherState == CatcherAnimationState.Idle);
+
+            AddStep("miss bananas", () => spawnBananas());
+            AddUntilStep("wait for completion", () => playfieldIsEmpty);
+            AddAssert("catcher state is idle", () => catcherState == CatcherAnimationState.Idle);
+        }
+
+        private bool playfieldIsEmpty => !((CatchPlayfield)drawableRuleset.Playfield).AllHitObjects.Any(h => h.IsAlive);
+
+        private CatcherAnimationState catcherState => ((CatchPlayfield)drawableRuleset.Playfield).CatcherArea.MovableCatcher.CurrentState;
+
         private void spawnFruits(bool hit = false)
         {
             for (int i = 1; i <= 4; i++)
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index d18f5e165f..441f9126f6 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -188,7 +188,7 @@ namespace osu.Game.Rulesets.Catch.UI
 
                 CatcherSprite current;
 
-                switch (currentState)
+                switch (CurrentState)
                 {
                     default:
                         current = catcherIdle;
@@ -274,7 +274,7 @@ namespace osu.Game.Rulesets.Catch.UI
                 return additive;
             }
 
-            private Drawable createCatcherSprite() => new CatcherSprite(currentState);
+            private Drawable createCatcherSprite() => new CatcherSprite(CurrentState);
 
             /// <summary>
             /// Add a caught fruit to the catcher's stack.
@@ -355,14 +355,14 @@ namespace osu.Game.Rulesets.Catch.UI
 
             private void updateState(CatcherAnimationState state)
             {
-                if (currentState == state)
+                if (CurrentState == state)
                     return;
 
-                currentState = state;
+                CurrentState = state;
                 updateCatcher();
             }
 
-            private CatcherAnimationState currentState;
+            public CatcherAnimationState CurrentState;
 
             private double hyperDashModifier = 1;
             private int hyperDashDirection;

From fd21e87670ebde3018e43a550aff6ef9b30383f9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Mar 2020 11:28:45 +0900
Subject: [PATCH 1037/1142] Disable adjusting volume via "select next" and
 "select previous" as fallbacks

---
 .../Overlays/Volume/VolumeControlReceptor.cs   | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Overlays/Volume/VolumeControlReceptor.cs b/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
index 4bff8146b4..3478f18a40 100644
--- a/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
+++ b/osu.Game/Overlays/Volume/VolumeControlReceptor.cs
@@ -14,22 +14,8 @@ namespace osu.Game.Overlays.Volume
         public Func<GlobalAction, bool> ActionRequested;
         public Func<GlobalAction, float, bool, bool> ScrollActionRequested;
 
-        public bool OnPressed(GlobalAction action)
-        {
-            // if nothing else handles selection actions in the game, it's safe to let volume be adjusted.
-            switch (action)
-            {
-                case GlobalAction.SelectPrevious:
-                    action = GlobalAction.IncreaseVolume;
-                    break;
-
-                case GlobalAction.SelectNext:
-                    action = GlobalAction.DecreaseVolume;
-                    break;
-            }
-
-            return ActionRequested?.Invoke(action) ?? false;
-        }
+        public bool OnPressed(GlobalAction action) =>
+            ActionRequested?.Invoke(action) ?? false;
 
         public bool OnScroll(GlobalAction action, float amount, bool isPrecise) =>
             ScrollActionRequested?.Invoke(action, amount, isPrecise) ?? false;

From 39bb98bfb219a2c174c1193850ce500eb0b5aeba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Mar 2020 13:26:58 +0900
Subject: [PATCH 1038/1142] Allow videos to be loaded with any extension

Also moves all tournament user resources to a "tournament" subfolder.
---
 .../Components/TourneyVideo.cs                |  5 ++---
 osu.Game.Tournament/TournamentGameBase.cs     |  6 +++++-
 osu.Game.Tournament/TournamentStorage.cs      | 19 +++++++++++++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 osu.Game.Tournament/TournamentStorage.cs

diff --git a/osu.Game.Tournament/Components/TourneyVideo.cs b/osu.Game.Tournament/Components/TourneyVideo.cs
index 43088d6b92..d8488ce4f6 100644
--- a/osu.Game.Tournament/Components/TourneyVideo.cs
+++ b/osu.Game.Tournament/Components/TourneyVideo.cs
@@ -7,7 +7,6 @@ using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Video;
-using osu.Framework.Platform;
 using osu.Framework.Timing;
 using osu.Game.Graphics;
 
@@ -28,9 +27,9 @@ namespace osu.Game.Tournament.Components
         }
 
         [BackgroundDependencyLoader]
-        private void load(Storage storage)
+        private void load(TournamentStorage storage)
         {
-            var stream = storage.GetStream($@"videos/{filename}.m4v");
+            var stream = storage.GetStream($@"videos/{filename}");
 
             if (stream != null)
             {
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 41165ca141..41822ae2c3 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -37,6 +37,8 @@ namespace osu.Game.Tournament
 
         private Storage storage;
 
+        private TournamentStorage tournamentStorage;
+
         private DependencyContainer dependencies;
 
         private Bindable<Size> windowSize;
@@ -54,7 +56,9 @@ namespace osu.Game.Tournament
         {
             Resources.AddStore(new DllResourceStore(typeof(TournamentGameBase).Assembly));
 
-            Textures.AddStore(new TextureLoaderStore(new ResourceStore<byte[]>(new StorageBackedResourceStore(storage))));
+            dependencies.CacheAs(tournamentStorage = new TournamentStorage(storage));
+
+            Textures.AddStore(new TextureLoaderStore(tournamentStorage));
 
             this.storage = storage;
 
diff --git a/osu.Game.Tournament/TournamentStorage.cs b/osu.Game.Tournament/TournamentStorage.cs
new file mode 100644
index 0000000000..139ad3857b
--- /dev/null
+++ b/osu.Game.Tournament/TournamentStorage.cs
@@ -0,0 +1,19 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.IO.Stores;
+using osu.Framework.Platform;
+
+namespace osu.Game.Tournament
+{
+    internal class TournamentStorage : NamespacedResourceStore<byte[]>
+    {
+        public TournamentStorage(Storage storage)
+            : base(new StorageBackedResourceStore(storage), "tournament")
+        {
+            AddExtension("m4v");
+            AddExtension("avi");
+            AddExtension("mp4");
+        }
+    }
+}

From 190ff974862e9e379917eeccd40034c546448980 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Mar 2020 13:29:09 +0900
Subject: [PATCH 1039/1142] Rename classes to better suit purpose

---
 .../Components/DrawableTournamentHeaderLogo.cs | 18 ++++++++++++++++++
 .../Components/DrawableTournamentHeaderText.cs | 18 ++++++++++++++++++
 .../Components/DrawableTournamentTitleText.cs  | 16 ----------------
 osu.Game.Tournament/Components/RoundDisplay.cs |  2 +-
 .../Screens/Gameplay/Components/MatchHeader.cs |  4 ++--
 .../{RoundDisplay.cs => MatchRoundDisplay.cs}  |  2 +-
 .../Screens/Ladder/LadderScreen.cs             |  2 +-
 .../Screens/Schedule/ScheduleScreen.cs         |  2 +-
 8 files changed, 42 insertions(+), 22 deletions(-)
 create mode 100644 osu.Game.Tournament/Components/DrawableTournamentHeaderLogo.cs
 create mode 100644 osu.Game.Tournament/Components/DrawableTournamentHeaderText.cs
 delete mode 100644 osu.Game.Tournament/Components/DrawableTournamentTitleText.cs
 rename osu.Game.Tournament/Screens/Gameplay/Components/{RoundDisplay.cs => MatchRoundDisplay.cs} (92%)

diff --git a/osu.Game.Tournament/Components/DrawableTournamentHeaderLogo.cs b/osu.Game.Tournament/Components/DrawableTournamentHeaderLogo.cs
new file mode 100644
index 0000000000..b6f74a75e7
--- /dev/null
+++ b/osu.Game.Tournament/Components/DrawableTournamentHeaderLogo.cs
@@ -0,0 +1,18 @@
+// 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.Sprites;
+using osu.Framework.Graphics.Textures;
+
+namespace osu.Game.Tournament.Components
+{
+    public class DrawableTournamentHeaderLogo : Sprite
+    {
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            Texture = textures.Get("header-text");
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Components/DrawableTournamentHeaderText.cs b/osu.Game.Tournament/Components/DrawableTournamentHeaderText.cs
new file mode 100644
index 0000000000..38500fa857
--- /dev/null
+++ b/osu.Game.Tournament/Components/DrawableTournamentHeaderText.cs
@@ -0,0 +1,18 @@
+// 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.Sprites;
+using osu.Framework.Graphics.Textures;
+
+namespace osu.Game.Tournament.Components
+{
+    public class DrawableTournamentHeaderText : Sprite
+    {
+        [BackgroundDependencyLoader]
+        private void load(TextureStore textures)
+        {
+            Texture = textures.Get("header-text");
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Components/DrawableTournamentTitleText.cs b/osu.Game.Tournament/Components/DrawableTournamentTitleText.cs
deleted file mode 100644
index 4fbc6cd060..0000000000
--- a/osu.Game.Tournament/Components/DrawableTournamentTitleText.cs
+++ /dev/null
@@ -1,16 +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.Game.Graphics;
-
-namespace osu.Game.Tournament.Components
-{
-    public class DrawableTournamentTitleText : TournamentSpriteText
-    {
-        public DrawableTournamentTitleText()
-        {
-            Text = "osu!taiko world cup 2020";
-            Font = OsuFont.Torus.With(size: 26, weight: FontWeight.SemiBold);
-        }
-    }
-}
diff --git a/osu.Game.Tournament/Components/RoundDisplay.cs b/osu.Game.Tournament/Components/RoundDisplay.cs
index dd56c83c57..bebede6782 100644
--- a/osu.Game.Tournament/Components/RoundDisplay.cs
+++ b/osu.Game.Tournament/Components/RoundDisplay.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Tournament.Components
                     Direction = FillDirection.Vertical,
                     Children = new Drawable[]
                     {
-                        new DrawableTournamentTitleText(),
+                        new DrawableTournamentHeaderText(),
                         new TournamentSpriteText
                         {
                             Text = match.Round.Value?.Name.Value ?? "Unknown Round",
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
index 69a68c946b..aa4bd4a701 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
@@ -41,13 +41,13 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                     Spacing = new Vector2(5),
                     Children = new Drawable[]
                     {
-                        new DrawableTournamentTitleText
+                        new DrawableTournamentHeaderText
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                             Scale = new Vector2(1.2f)
                         },
-                        new RoundDisplay
+                        new MatchRoundDisplay
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/RoundDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchRoundDisplay.cs
similarity index 92%
rename from osu.Game.Tournament/Screens/Gameplay/Components/RoundDisplay.cs
rename to osu.Game.Tournament/Screens/Gameplay/Components/MatchRoundDisplay.cs
index c8b0d3bdda..87793f7e1b 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/RoundDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchRoundDisplay.cs
@@ -8,7 +8,7 @@ using osu.Game.Tournament.Models;
 
 namespace osu.Game.Tournament.Screens.Gameplay.Components
 {
-    public class RoundDisplay : TournamentSpriteTextWithBackground
+    public class MatchRoundDisplay : TournamentSpriteTextWithBackground
     {
         private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
 
diff --git a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
index 6f62b3ddba..534c402f6c 100644
--- a/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
+++ b/osu.Game.Tournament/Screens/Ladder/LadderScreen.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Tournament.Screens.Ladder
                         RelativeSizeAxes = Axes.Both,
                         Loop = true,
                     },
-                    new DrawableTournamentTitleText
+                    new DrawableTournamentHeaderText
                     {
                         Y = 100,
                         Anchor = Anchor.TopCentre,
diff --git a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
index 0fcec645e3..88289ad6bd 100644
--- a/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
+++ b/osu.Game.Tournament/Screens/Schedule/ScheduleScreen.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Tournament.Screens.Schedule
                                         Direction = FillDirection.Vertical,
                                         Children = new Drawable[]
                                         {
-                                            new DrawableTournamentTitleText(),
+                                            new DrawableTournamentHeaderText(),
                                             new Container
                                             {
                                                 Margin = new MarginPadding { Top = 40 },

From b6b802e8212f44a669675f6705fd16db667fd758 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Mar 2020 14:06:40 +0900
Subject: [PATCH 1040/1142] Add back customisable header logo/text

Also adds test scene for MatchHeader component.
---
 .../Components/TestSceneMatchHeader.cs        |  33 +++++
 .../DrawableTournamentHeaderLogo.cs           |  27 +++-
 .../DrawableTournamentHeaderText.cs           |  27 +++-
 .../Gameplay/Components/MatchHeader.cs        | 119 +++++++-----------
 .../Gameplay/Components/TeamScoreDisplay.cs   |  83 ++++++++++++
 5 files changed, 206 insertions(+), 83 deletions(-)
 create mode 100644 osu.Game.Tournament.Tests/Components/TestSceneMatchHeader.cs
 create mode 100644 osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneMatchHeader.cs b/osu.Game.Tournament.Tests/Components/TestSceneMatchHeader.cs
new file mode 100644
index 0000000000..b29e4964b6
--- /dev/null
+++ b/osu.Game.Tournament.Tests/Components/TestSceneMatchHeader.cs
@@ -0,0 +1,33 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Tournament.Screens.Gameplay.Components;
+using osuTK;
+
+namespace osu.Game.Tournament.Tests.Components
+{
+    public class TestSceneMatchHeader : TournamentTestScene
+    {
+        public TestSceneMatchHeader()
+        {
+            Child = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(50),
+                Children = new Drawable[]
+                {
+                    new TournamentSpriteText { Text = "with logo", Font = OsuFont.Torus.With(size: 30) },
+                    new MatchHeader(),
+                    new TournamentSpriteText { Text = "without logo", Font = OsuFont.Torus.With(size: 30) },
+                    new MatchHeader { ShowLogo = false },
+                    new TournamentSpriteText { Text = "without scores", Font = OsuFont.Torus.With(size: 30) },
+                    new MatchHeader { ShowScores = false },
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Components/DrawableTournamentHeaderLogo.cs b/osu.Game.Tournament/Components/DrawableTournamentHeaderLogo.cs
index b6f74a75e7..a61cb59fed 100644
--- a/osu.Game.Tournament/Components/DrawableTournamentHeaderLogo.cs
+++ b/osu.Game.Tournament/Components/DrawableTournamentHeaderLogo.cs
@@ -2,17 +2,36 @@
 // 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.Sprites;
 using osu.Framework.Graphics.Textures;
 
 namespace osu.Game.Tournament.Components
 {
-    public class DrawableTournamentHeaderLogo : Sprite
+    public class DrawableTournamentHeaderLogo : CompositeDrawable
     {
-        [BackgroundDependencyLoader]
-        private void load(TextureStore textures)
+        public DrawableTournamentHeaderLogo()
         {
-            Texture = textures.Get("header-text");
+            InternalChild = new LogoSprite();
+
+            Height = 50;
+            RelativeSizeAxes = Axes.X;
+        }
+
+        private class LogoSprite : Sprite
+        {
+            [BackgroundDependencyLoader]
+            private void load(TextureStore textures)
+            {
+                RelativeSizeAxes = Axes.Both;
+                FillMode = FillMode.Fit;
+
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+
+                Texture = textures.Get("header-logo");
+            }
         }
     }
 }
diff --git a/osu.Game.Tournament/Components/DrawableTournamentHeaderText.cs b/osu.Game.Tournament/Components/DrawableTournamentHeaderText.cs
index 38500fa857..2539075c0f 100644
--- a/osu.Game.Tournament/Components/DrawableTournamentHeaderText.cs
+++ b/osu.Game.Tournament/Components/DrawableTournamentHeaderText.cs
@@ -2,17 +2,36 @@
 // 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.Sprites;
 using osu.Framework.Graphics.Textures;
 
 namespace osu.Game.Tournament.Components
 {
-    public class DrawableTournamentHeaderText : Sprite
+    public class DrawableTournamentHeaderText : CompositeDrawable
     {
-        [BackgroundDependencyLoader]
-        private void load(TextureStore textures)
+        public DrawableTournamentHeaderText()
         {
-            Texture = textures.Get("header-text");
+            InternalChild = new TextSprite();
+
+            Height = 25;
+            RelativeSizeAxes = Axes.X;
+        }
+
+        private class TextSprite : Sprite
+        {
+            [BackgroundDependencyLoader]
+            private void load(TextureStore textures)
+            {
+                RelativeSizeAxes = Axes.Both;
+                FillMode = FillMode.Fit;
+
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+
+                Texture = textures.Get("header-text");
+            }
         }
     }
 }
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
index aa4bd4a701..751a763333 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
@@ -2,14 +2,11 @@
 // 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.Input.Events;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
 using osuTK;
-using osuTK.Input;
 
 namespace osu.Game.Tournament.Screens.Gameplay.Components
 {
@@ -17,13 +14,39 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
     {
         private TeamScoreDisplay teamDisplay1;
         private TeamScoreDisplay teamDisplay2;
+        private DrawableTournamentHeaderLogo logo;
+
+        private bool showScores = true;
 
         public bool ShowScores
         {
+            get => showScores;
             set
             {
-                teamDisplay1.ShowScore = value;
-                teamDisplay2.ShowScore = value;
+                if (value == showScores)
+                    return;
+
+                showScores = value;
+
+                if (IsLoaded)
+                    updateDisplay();
+            }
+        }
+
+        private bool showLogo = true;
+
+        public bool ShowLogo
+        {
+            get => showLogo;
+            set
+            {
+                if (value == showLogo)
+                    return;
+
+                showLogo = value;
+
+                if (IsLoaded)
+                    updateDisplay();
             }
         }
 
@@ -38,19 +61,25 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                 {
                     RelativeSizeAxes = Axes.Both,
                     Direction = FillDirection.Vertical,
+                    Padding = new MarginPadding(5),
                     Spacing = new Vector2(5),
                     Children = new Drawable[]
                     {
+                        logo = new DrawableTournamentHeaderLogo
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            Alpha = showLogo ? 1 : 0
+                        },
                         new DrawableTournamentHeaderText
                         {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Scale = new Vector2(1.2f)
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
                         },
                         new MatchRoundDisplay
                         {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
                             Scale = new Vector2(0.4f)
                         },
                     }
@@ -66,76 +95,16 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                     Origin = Anchor.TopRight,
                 },
             };
-        }
-    }
 
-    public class TeamScoreDisplay : CompositeDrawable
-    {
-        private readonly TeamColour teamColour;
-
-        private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
-        private readonly Bindable<TournamentTeam> currentTeam = new Bindable<TournamentTeam>();
-        private readonly Bindable<int?> currentTeamScore = new Bindable<int?>();
-
-        private TeamDisplay teamDisplay;
-
-        public bool ShowScore { set => teamDisplay.ShowScore = value; }
-
-        public TeamScoreDisplay(TeamColour teamColour)
-        {
-            this.teamColour = teamColour;
-
-            RelativeSizeAxes = Axes.Y;
-            AutoSizeAxes = Axes.X;
+            updateDisplay();
         }
 
-        [BackgroundDependencyLoader]
-        private void load(LadderInfo ladder)
+        private void updateDisplay()
         {
-            currentMatch.BindTo(ladder.CurrentMatch);
-            currentMatch.BindValueChanged(matchChanged, true);
-        }
+            teamDisplay1.ShowScore = showScores;
+            teamDisplay2.ShowScore = showScores;
 
-        private void matchChanged(ValueChangedEvent<TournamentMatch> match)
-        {
-            currentTeamScore.UnbindBindings();
-            currentTeam.UnbindBindings();
-
-            if (match.NewValue != null)
-            {
-                currentTeamScore.BindTo(teamColour == TeamColour.Red ? match.NewValue.Team1Score : match.NewValue.Team2Score);
-                currentTeam.BindTo(teamColour == TeamColour.Red ? match.NewValue.Team1 : match.NewValue.Team2);
-            }
-
-            // team may change to same team, which means score is not in a good state.
-            // thus we handle this manually.
-            teamChanged(currentTeam.Value);
-        }
-
-        protected override bool OnMouseDown(MouseDownEvent e)
-        {
-            switch (e.Button)
-            {
-                case MouseButton.Left:
-                    if (currentTeamScore.Value < currentMatch.Value.PointsToWin)
-                        currentTeamScore.Value++;
-                    return true;
-
-                case MouseButton.Right:
-                    if (currentTeamScore.Value > 0)
-                        currentTeamScore.Value--;
-                    return true;
-            }
-
-            return base.OnMouseDown(e);
-        }
-
-        private void teamChanged(TournamentTeam team)
-        {
-            InternalChildren = new Drawable[]
-            {
-                teamDisplay = new TeamDisplay(team, teamColour, currentTeamScore, currentMatch.Value?.PointsToWin ?? 0),
-            };
+            logo.Alpha = showLogo ? 1 : 0;
         }
     }
 }
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs
new file mode 100644
index 0000000000..462015f004
--- /dev/null
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs
@@ -0,0 +1,83 @@
+// 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.Input.Events;
+using osu.Game.Tournament.Models;
+using osuTK.Input;
+
+namespace osu.Game.Tournament.Screens.Gameplay.Components
+{
+    public class TeamScoreDisplay : CompositeDrawable
+    {
+        private readonly TeamColour teamColour;
+
+        private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();
+        private readonly Bindable<TournamentTeam> currentTeam = new Bindable<TournamentTeam>();
+        private readonly Bindable<int?> currentTeamScore = new Bindable<int?>();
+
+        private TeamDisplay teamDisplay;
+
+        public bool ShowScore { set => teamDisplay.ShowScore = value; }
+
+        public TeamScoreDisplay(TeamColour teamColour)
+        {
+            this.teamColour = teamColour;
+
+            RelativeSizeAxes = Axes.Y;
+            AutoSizeAxes = Axes.X;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(LadderInfo ladder)
+        {
+            currentMatch.BindTo(ladder.CurrentMatch);
+            currentMatch.BindValueChanged(matchChanged, true);
+        }
+
+        private void matchChanged(ValueChangedEvent<TournamentMatch> match)
+        {
+            currentTeamScore.UnbindBindings();
+            currentTeam.UnbindBindings();
+
+            if (match.NewValue != null)
+            {
+                currentTeamScore.BindTo(teamColour == TeamColour.Red ? match.NewValue.Team1Score : match.NewValue.Team2Score);
+                currentTeam.BindTo(teamColour == TeamColour.Red ? match.NewValue.Team1 : match.NewValue.Team2);
+            }
+
+            // team may change to same team, which means score is not in a good state.
+            // thus we handle this manually.
+            teamChanged(currentTeam.Value);
+        }
+
+        protected override bool OnMouseDown(MouseDownEvent e)
+        {
+            switch (e.Button)
+            {
+                case MouseButton.Left:
+                    if (currentTeamScore.Value < currentMatch.Value.PointsToWin)
+                        currentTeamScore.Value++;
+                    return true;
+
+                case MouseButton.Right:
+                    if (currentTeamScore.Value > 0)
+                        currentTeamScore.Value--;
+                    return true;
+            }
+
+            return base.OnMouseDown(e);
+        }
+
+        private void teamChanged(TournamentTeam team)
+        {
+            InternalChildren = new Drawable[]
+            {
+                teamDisplay = new TeamDisplay(team, teamColour, currentTeamScore, currentMatch.Value?.PointsToWin ?? 0),
+            };
+        }
+    }
+}

From 7b1ac03b18dae6767ee4c13be887b33913570f31 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Mar 2020 14:26:22 +0900
Subject: [PATCH 1041/1142] Hide logo on gameplay screen

---
 osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
index 4d770855cd..8920990d1b 100644
--- a/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
@@ -47,7 +47,10 @@ namespace osu.Game.Tournament.Screens.Gameplay
                     Loop = true,
                     RelativeSizeAxes = Axes.Both,
                 },
-                header = new MatchHeader(),
+                header = new MatchHeader
+                {
+                    ShowLogo = false
+                },
                 new Container
                 {
                     RelativeSizeAxes = Axes.X,

From ec1c6f88ee3889cbe9657e5745a4753255b7cbf2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Mar 2020 14:26:39 +0900
Subject: [PATCH 1042/1142] Adjust metrics to align logo pieces correctly on
 gameplay / map pool

---
 .../Components/TestSceneMatchHeader.cs                   | 9 +++++++++
 .../Components/DrawableTournamentHeaderLogo.cs           | 2 +-
 .../Components/DrawableTournamentHeaderText.cs           | 2 +-
 .../Screens/Gameplay/Components/MatchHeader.cs           | 2 +-
 osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs     | 3 ++-
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneMatchHeader.cs b/osu.Game.Tournament.Tests/Components/TestSceneMatchHeader.cs
index b29e4964b6..9f885ed827 100644
--- a/osu.Game.Tournament.Tests/Components/TestSceneMatchHeader.cs
+++ b/osu.Game.Tournament.Tests/Components/TestSceneMatchHeader.cs
@@ -1,9 +1,12 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
+using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
+using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Screens.Gameplay.Components;
 using osuTK;
 
@@ -11,6 +14,12 @@ namespace osu.Game.Tournament.Tests.Components
 {
     public class TestSceneMatchHeader : TournamentTestScene
     {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(DrawableTournamentHeaderText),
+            typeof(DrawableTournamentHeaderLogo),
+        };
+
         public TestSceneMatchHeader()
         {
             Child = new FillFlowContainer
diff --git a/osu.Game.Tournament/Components/DrawableTournamentHeaderLogo.cs b/osu.Game.Tournament/Components/DrawableTournamentHeaderLogo.cs
index a61cb59fed..3f5ab42fd7 100644
--- a/osu.Game.Tournament/Components/DrawableTournamentHeaderLogo.cs
+++ b/osu.Game.Tournament/Components/DrawableTournamentHeaderLogo.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Tournament.Components
         {
             InternalChild = new LogoSprite();
 
-            Height = 50;
+            Height = 82;
             RelativeSizeAxes = Axes.X;
         }
 
diff --git a/osu.Game.Tournament/Components/DrawableTournamentHeaderText.cs b/osu.Game.Tournament/Components/DrawableTournamentHeaderText.cs
index 2539075c0f..bda696ba00 100644
--- a/osu.Game.Tournament/Components/DrawableTournamentHeaderText.cs
+++ b/osu.Game.Tournament/Components/DrawableTournamentHeaderText.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Tournament.Components
         {
             InternalChild = new TextSprite();
 
-            Height = 25;
+            Height = 22;
             RelativeSizeAxes = Axes.X;
         }
 
diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
index 751a763333..d790f4b754 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
                 {
                     RelativeSizeAxes = Axes.Both,
                     Direction = FillDirection.Vertical,
-                    Padding = new MarginPadding(5),
+                    Padding = new MarginPadding(20),
                     Spacing = new Vector2(5),
                     Children = new Drawable[]
                     {
diff --git a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
index 4f3f7cfdbf..2b0bfe0b74 100644
--- a/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
+++ b/osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Tournament.Screens.MapPool
                 new MatchHeader(),
                 mapFlows = new FillFlowContainer<FillFlowContainer<TournamentBeatmapPanel>>
                 {
-                    Y = 100,
+                    Y = 140,
                     Spacing = new Vector2(10, 10),
                     Padding = new MarginPadding(25),
                     Direction = FillDirection.Vertical,
@@ -235,6 +235,7 @@ namespace osu.Game.Tournament.Screens.MapPool
                     {
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
+                        Height = 42,
                     });
                 }
             }

From 63edcddaf13453d66e86d4368e63ed90d2636962 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Mar 2020 15:01:43 +0900
Subject: [PATCH 1043/1142] Apply ruleset filter in all cases (even when
 bypassing filter for selection purposes)

---
 .../Screens/Select/Carousel/CarouselBeatmap.cs     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index 8c264ce974..e0d59e3b18 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -25,18 +25,18 @@ namespace osu.Game.Screens.Select.Carousel
         {
             base.Filter(criteria);
 
-            if (Beatmap.BeatmapSet?.Equals(criteria.SelectedBeatmapSet) == true)
-            {
-                // bypass filtering for selected beatmap
-                Filtered.Value = false;
-                return;
-            }
-
             bool match =
                 criteria.Ruleset == null ||
                 Beatmap.RulesetID == criteria.Ruleset.ID ||
                 (Beatmap.RulesetID == 0 && criteria.Ruleset.ID > 0 && criteria.AllowConvertedBeatmaps);
 
+            if (Beatmap.BeatmapSet?.Equals(criteria.SelectedBeatmapSet) == true)
+            {
+                // bypass filtering for selected beatmap
+                Filtered.Value = !match;
+                return;
+            }
+
             match &= !criteria.StarDifficulty.HasFilter || criteria.StarDifficulty.IsInRange(Beatmap.StarDifficulty);
             match &= !criteria.ApproachRate.HasFilter || criteria.ApproachRate.IsInRange(Beatmap.BaseDifficulty.ApproachRate);
             match &= !criteria.DrainRate.HasFilter || criteria.DrainRate.IsInRange(Beatmap.BaseDifficulty.DrainRate);

From 28ac5af91c9bc751f66eb634c0fb3b98e76ba5ba Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Mar 2020 15:26:22 +0900
Subject: [PATCH 1044/1142] Fix beatmap carousel tests loading beatmap manager
 beatmaps in test browser

---
 osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs | 4 +++-
 osu.Game/Screens/Select/BeatmapCarousel.cs                   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 71ae47dc66..80e03d82e2 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -497,7 +497,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             }
 
             bool changed = false;
-            AddStep($"Load {beatmapSets.Count} Beatmaps", () =>
+            AddStep($"Load {(beatmapSets.Count > 0 ? beatmapSets.Count.ToString() : "some")} beatmaps", () =>
             {
                 carousel.Filter(new FilterCriteria());
                 carousel.BeatmapSetsChanged = () => changed = true;
@@ -697,6 +697,8 @@ namespace osu.Game.Tests.Visual.SongSelect
             public new List<DrawableCarouselItem> Items => base.Items;
 
             public bool PendingFilterTask => PendingFilter != null;
+
+            protected override IEnumerable<BeatmapSetInfo> GetLoadableBeatmaps() => Enumerable.Empty<BeatmapSetInfo>();
         }
     }
 }
diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 71744d8b80..04c08cdbd2 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -153,9 +153,11 @@ namespace osu.Game.Screens.Select
             beatmaps.BeatmapHidden += beatmapHidden;
             beatmaps.BeatmapRestored += beatmapRestored;
 
-            loadBeatmapSets(beatmaps.GetAllUsableBeatmapSetsEnumerable());
+            loadBeatmapSets(GetLoadableBeatmaps());
         }
 
+        protected virtual IEnumerable<BeatmapSetInfo> GetLoadableBeatmaps() => beatmaps.GetAllUsableBeatmapSetsEnumerable();
+
         public void RemoveBeatmapSet(BeatmapSetInfo beatmapSet) => Schedule(() =>
         {
             var existingSet = beatmapSets.FirstOrDefault(b => b.BeatmapSet.ID == beatmapSet.ID);

From 933a8ffc8a8152e6e5680d39557bd3e2958f407b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Mar 2020 17:10:51 +0900
Subject: [PATCH 1045/1142] Add test coverage

---
 .../Visual/SongSelect/TestScenePlaySongSelect.cs | 16 +++++++++++++++-
 .../Carousel/DrawableCarouselBeatmapSet.cs       |  8 +++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 105d96cdfe..fb287a4f70 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -436,6 +436,9 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             changeRuleset(0);
 
+            // used for filter check below
+            AddStep("allow convert display", () => config.Set(OsuSetting.ShowConvertedBeatmaps, true));
+
             AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmap != null);
 
             AddStep("set filter text", () => songSelect.FilterControl.ChildrenOfType<SearchTextBox>().First().Text = "nonono");
@@ -446,9 +449,11 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             BeatmapInfo target = null;
 
+            int targetRuleset = differentRuleset ? 1 : 0;
+
             AddStep("select beatmap externally", () =>
             {
-                target = manager.GetAllUsableBeatmapSets().Where(b => b.Beatmaps.Any(bi => bi.RulesetID == (differentRuleset ? 1 : 0)))
+                target = manager.GetAllUsableBeatmapSets().Where(b => b.Beatmaps.Any(bi => bi.RulesetID == targetRuleset))
                                 .ElementAt(5).Beatmaps.First();
 
                 Beatmap.Value = manager.GetWorkingBeatmap(target);
@@ -456,6 +461,15 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmap != null);
 
+            AddAssert("selected only shows expected ruleset (plus converts)", () =>
+            {
+                var selectedPanel = songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet>().First(s => s.Item.State.Value == CarouselItemState.Selected);
+
+                // special case for converts checked here.
+                return selectedPanel.ChildrenOfType<DrawableCarouselBeatmapSet.FilterableDifficultyIcon>().All(i =>
+                    i.IsFiltered || i.Item.Beatmap.Ruleset.ID == targetRuleset || i.Item.Beatmap.Ruleset.ID == 0);
+            });
+
             AddUntilStep("carousel has correct", () => songSelect.Carousel.SelectedBeatmap?.OnlineBeatmapID == target.OnlineBeatmapID);
             AddUntilStep("game has correct", () => Beatmap.Value.BeatmapInfo.OnlineBeatmapID == target.OnlineBeatmapID);
 
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 6cd145cfef..1454784f03 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -205,7 +205,9 @@ namespace osu.Game.Screens.Select.Carousel
         {
             private readonly BindableBool filtered = new BindableBool();
 
-            private readonly CarouselBeatmap item;
+            public bool IsFiltered => filtered.Value;
+
+            public readonly CarouselBeatmap Item;
 
             public FilterableDifficultyIcon(CarouselBeatmap item)
                 : base(item.Beatmap)
@@ -214,13 +216,13 @@ namespace osu.Game.Screens.Select.Carousel
                 filtered.ValueChanged += isFiltered => Schedule(() => this.FadeTo(isFiltered.NewValue ? 0.1f : 1, 100));
                 filtered.TriggerChange();
 
-                this.item = item;
+                this.Item = item;
             }
 
             protected override bool OnClick(ClickEvent e)
             {
                 if (!filtered.Value)
-                    item.State.Value = CarouselItemState.Selected;
+                    Item.State.Value = CarouselItemState.Selected;
 
                 return true;
             }

From fc058f8896eb8f023b6e7702d21355167f1a78b4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Mar 2020 18:03:18 +0900
Subject: [PATCH 1046/1142] Remove unnecessary this. prefix

---
 osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 1454784f03..547aeaddc6 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -216,7 +216,7 @@ namespace osu.Game.Screens.Select.Carousel
                 filtered.ValueChanged += isFiltered => Schedule(() => this.FadeTo(isFiltered.NewValue ? 0.1f : 1, 100));
                 filtered.TriggerChange();
 
-                this.Item = item;
+                Item = item;
             }
 
             protected override bool OnClick(ClickEvent e)

From bc2a1cdb623547e9a05740685eba26f75bd00c76 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 12 Mar 2020 12:04:36 +0300
Subject: [PATCH 1047/1142] Apply suggestions

---
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 441f9126f6..2394110165 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -344,11 +344,8 @@ namespace osu.Game.Rulesets.Catch.UI
 
                 if (validCatch)
                     updateState(fruit.Kiai ? CatcherAnimationState.Kiai : CatcherAnimationState.Idle);
-                else
-                {
-                    if (!(fruit is Banana))
-                        updateState(CatcherAnimationState.Fail);
-                }
+                else if (!(fruit is Banana))
+                    updateState(CatcherAnimationState.Fail);
 
                 return validCatch;
             }
@@ -362,7 +359,7 @@ namespace osu.Game.Rulesets.Catch.UI
                 updateCatcher();
             }
 
-            public CatcherAnimationState CurrentState;
+            public CatcherAnimationState CurrentState { get; private set; }
 
             private double hyperDashModifier = 1;
             private int hyperDashDirection;

From 5537b279de1b3707496f4bf8aac49aa359f13cbc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Mar 2020 18:39:43 +0900
Subject: [PATCH 1048/1142] Fix failing test occasionally getting wrong ruleset
 beatmap

---
 osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index fb287a4f70..55c1d8451f 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -453,8 +453,9 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("select beatmap externally", () =>
             {
-                target = manager.GetAllUsableBeatmapSets().Where(b => b.Beatmaps.Any(bi => bi.RulesetID == targetRuleset))
-                                .ElementAt(5).Beatmaps.First();
+                target = manager.GetAllUsableBeatmapSets()
+                                .Where(b => b.Beatmaps.Any(bi => bi.RulesetID == targetRuleset))
+                                .ElementAt(5).Beatmaps.First(bi => bi.RulesetID == targetRuleset);
 
                 Beatmap.Value = manager.GetWorkingBeatmap(target);
             });

From ce5d01ed191ea896b5b643352b791d27615045b8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Mar 2020 17:55:31 +0900
Subject: [PATCH 1049/1142] Allow filtered difficulty icons to be clicked

---
 .../Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 547aeaddc6..d3a7b4d3d9 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -221,9 +221,7 @@ namespace osu.Game.Screens.Select.Carousel
 
             protected override bool OnClick(ClickEvent e)
             {
-                if (!filtered.Value)
-                    Item.State.Value = CarouselItemState.Selected;
-
+                Item.State.Value = CarouselItemState.Selected;
                 return true;
             }
         }

From 2bcf07938676b39a0db435939547500c9a562aca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Mar 2020 15:34:58 +0900
Subject: [PATCH 1050/1142] Update carousel test logic to match new carousel
 selection behaviour

---
 .../Visual/SongSelect/TestSceneBeatmapCarousel.cs        | 2 +-
 .../Visual/SongSelect/TestScenePlaySongSelect.cs         | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 71ae47dc66..d80add3015 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -399,7 +399,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("filter to ruleset 0", () =>
                 carousel.Filter(new FilterCriteria { Ruleset = rulesets.AvailableRulesets.ElementAt(0) }, false));
             AddStep("select filtered map skipping filtered", () => carousel.SelectBeatmap(testMixed.Beatmaps[1], false));
-            AddAssert("unfiltered beatmap selected", () => carousel.SelectedBeatmap.Equals(testMixed.Beatmaps[0]));
+            AddAssert("unfiltered beatmap not selected", () => carousel.SelectedBeatmap == null);
 
             AddStep("remove mixed set", () =>
             {
diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 55c1d8451f..d16fd0bceb 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -591,16 +591,16 @@ namespace osu.Game.Tests.Visual.SongSelect
                 }
             }));
 
+            BeatmapInfo filteredBeatmap = null;
             DrawableCarouselBeatmapSet.FilterableDifficultyIcon filteredIcon = null;
+
             AddStep("Get filtered icon", () =>
             {
-                var filteredBeatmap = songSelect.Carousel.SelectedBeatmapSet.Beatmaps.Find(b => b.BPM < maxBPM);
+                filteredBeatmap = songSelect.Carousel.SelectedBeatmapSet.Beatmaps.Find(b => b.BPM < maxBPM);
                 int filteredBeatmapIndex = getBeatmapIndex(filteredBeatmap.BeatmapSet, filteredBeatmap);
                 filteredIcon = set.ChildrenOfType<DrawableCarouselBeatmapSet.FilterableDifficultyIcon>().ElementAt(filteredBeatmapIndex);
             });
 
-            int? previousID = null;
-            AddStep("Store current ID", () => previousID = songSelect.Carousel.SelectedBeatmap.ID);
             AddStep("Click on a filtered difficulty", () =>
             {
                 InputManager.MoveMouseTo(filteredIcon);
@@ -608,7 +608,8 @@ namespace osu.Game.Tests.Visual.SongSelect
                 InputManager.PressButton(MouseButton.Left);
                 InputManager.ReleaseButton(MouseButton.Left);
             });
-            AddAssert("Selected beatmap has not changed", () => songSelect.Carousel.SelectedBeatmap.ID == previousID);
+
+            AddAssert("Selected beatmap correct", () => songSelect.Carousel.SelectedBeatmap == filteredBeatmap);
         }
 
         private int getBeatmapIndex(BeatmapSetInfo set, BeatmapInfo info) => set.Beatmaps.FindIndex(b => b == info);

From 6e11c3014ce0830390957797a024d1978d45122e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Mar 2020 16:30:21 +0900
Subject: [PATCH 1051/1142] Allow grouped difficulty icons to be clicked

---
 .../SongSelect/TestScenePlaySongSelect.cs     | 48 +++++++++++++++++--
 .../Carousel/DrawableCarouselBeatmapSet.cs    | 12 +++--
 2 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 8295f0aa66..34f442e6ee 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -654,6 +654,48 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddUntilStep("Check ruleset changed to mania", () => Ruleset.Value.ID == 3);
         }
 
+        [Test]
+        public void TestGroupedDifficultyIconSelecting()
+        {
+            changeRuleset(0);
+
+            createSongSelect();
+
+            AddStep("import huge difficulty count map", () =>
+            {
+                var usableRulesets = rulesets.AvailableRulesets.Where(r => r.ID != 2).ToArray();
+                manager.Import(createTestBeatmapSet(0, usableRulesets, 50)).Wait();
+            });
+
+            DrawableCarouselBeatmapSet set = null;
+            AddUntilStep("Find the DrawableCarouselBeatmapSet", () =>
+            {
+                set = songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet>().FirstOrDefault();
+                return set != null;
+            });
+
+            DrawableCarouselBeatmapSet.FilterableGroupedDifficultyIcon groupIcon = null;
+            AddStep("Find group icon for different ruleset", () =>
+            {
+                groupIcon = set.ChildrenOfType<DrawableCarouselBeatmapSet.FilterableGroupedDifficultyIcon>()
+                               .First(icon => icon.Items.First().Beatmap.Ruleset.ID == 3);
+            });
+
+            AddAssert("Check ruleset is osu!", () => Ruleset.Value.ID == 0);
+
+            AddStep("Click on group", () =>
+            {
+                InputManager.MoveMouseTo(groupIcon);
+
+                InputManager.PressButton(MouseButton.Left);
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
+
+            AddUntilStep("Check ruleset changed to mania", () => Ruleset.Value.ID == 3);
+
+            AddAssert("Check first item in group selected", () => Beatmap.Value.BeatmapInfo == groupIcon.Items.First().Beatmap);
+        }
+
         private int getBeatmapIndex(BeatmapSetInfo set, BeatmapInfo info) => set.Beatmaps.FindIndex(b => b == info);
 
         private int getCurrentBeatmapIndex() => getBeatmapIndex(songSelect.Carousel.SelectedBeatmapSet, songSelect.Carousel.SelectedBeatmap);
@@ -695,16 +737,16 @@ namespace osu.Game.Tests.Visual.SongSelect
             });
         }
 
-        private BeatmapSetInfo createTestBeatmapSet(int setId, RulesetInfo[] rulesets)
+        private BeatmapSetInfo createTestBeatmapSet(int setId, RulesetInfo[] rulesets, int countPerRuleset = 6)
         {
             int j = 0;
             RulesetInfo getRuleset() => rulesets[j++ % rulesets.Length];
 
             var beatmaps = new List<BeatmapInfo>();
 
-            for (int i = 0; i < 6; i++)
+            for (int i = 0; i < countPerRuleset; i++)
             {
-                int beatmapId = setId * 10 + i;
+                int beatmapId = setId * 100 + i;
 
                 int length = RNG.Next(30000, 200000);
                 double bpm = RNG.NextSingle(80, 200);
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index d3a7b4d3d9..a53b74c1b8 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -228,12 +228,12 @@ namespace osu.Game.Screens.Select.Carousel
 
         public class FilterableGroupedDifficultyIcon : GroupedDifficultyIcon
         {
-            private readonly List<CarouselBeatmap> items;
+            public readonly List<CarouselBeatmap> Items;
 
             public FilterableGroupedDifficultyIcon(List<CarouselBeatmap> items, RulesetInfo ruleset)
                 : base(items.Select(i => i.Beatmap).ToList(), ruleset, Color4.White)
             {
-                this.items = items;
+                Items = items;
 
                 foreach (var item in items)
                     item.Filtered.BindValueChanged(_ => Scheduler.AddOnce(updateFilteredDisplay));
@@ -241,10 +241,16 @@ namespace osu.Game.Screens.Select.Carousel
                 updateFilteredDisplay();
             }
 
+            protected override bool OnClick(ClickEvent e)
+            {
+                Items.First().State.Value = CarouselItemState.Selected;
+                return true;
+            }
+
             private void updateFilteredDisplay()
             {
                 // for now, fade the whole group based on the ratio of hidden items.
-                this.FadeTo(1 - 0.9f * ((float)items.Count(i => i.Filtered.Value) / items.Count), 100);
+                this.FadeTo(1 - 0.9f * ((float)Items.Count(i => i.Filtered.Value) / Items.Count), 100);
             }
         }
     }

From ca9cfbe51d50a7d9b95096efee9b519d8a607ae3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Mar 2020 15:52:03 +0900
Subject: [PATCH 1052/1142] Move selection fallback logic out of
 BeatmapCarousel to SongSelect

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 26 +++++++++-----------
 osu.Game/Screens/Select/SongSelect.cs      | 28 +++++++++++++++-------
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 71744d8b80..ca20b02bce 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -225,25 +225,21 @@ namespace osu.Game.Screens.Select
                     continue;
 
                 if (!bypassFilters && item.Filtered.Value)
-                    // The beatmap exists in this set but is filtered, so look for the first unfiltered map in the set
-                    item = set.Beatmaps.FirstOrDefault(b => !b.Filtered.Value);
+                    return false;
 
-                if (item != null)
+                select(item);
+
+                // if we got here and the set is filtered, it means we were bypassing filters.
+                // in this case, reapplying the filter is necessary to ensure the panel is in the correct place
+                // (since it is forcefully being included in the carousel).
+                if (set.Filtered.Value)
                 {
-                    select(item);
+                    Debug.Assert(bypassFilters);
 
-                    // if we got here and the set is filtered, it means we were bypassing filters.
-                    // in this case, reapplying the filter is necessary to ensure the panel is in the correct place
-                    // (since it is forcefully being included in the carousel).
-                    if (set.Filtered.Value)
-                    {
-                        Debug.Assert(bypassFilters);
-
-                        applyActiveCriteria(false);
-                    }
-
-                    return true;
+                    applyActiveCriteria(false);
                 }
+
+                return true;
             }
 
             return false;
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 528222a89c..11c680bdb0 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -380,6 +380,8 @@ namespace osu.Game.Screens.Select
         {
             if (e.NewValue is DummyWorkingBeatmap || !this.IsCurrentScreen()) return;
 
+            Logger.Log($"working beatmap updated to {e.NewValue}");
+
             if (!Carousel.SelectBeatmap(e.NewValue.BeatmapInfo, false))
             {
                 // A selection may not have been possible with filters applied.
@@ -446,8 +448,10 @@ namespace osu.Game.Screens.Select
 
                 if (transferRulesetValue())
                 {
-                    // if the ruleset changed, the rest of the selection update will happen via updateSelectedRuleset.
                     Mods.Value = Array.Empty<Mod>();
+
+                    // required to return once in order to have the carousel in a good state.
+                    // if the ruleset changed, the rest of the selection update will happen via updateSelectedRuleset.
                     return;
                 }
 
@@ -472,7 +476,7 @@ namespace osu.Game.Screens.Select
                 if (this.IsCurrentScreen())
                     ensurePlayingSelected();
 
-                UpdateBeatmap(Beatmap.Value);
+                updateComponentFromBeatmap(Beatmap.Value);
             }
         }
 
@@ -547,7 +551,7 @@ namespace osu.Game.Screens.Select
 
             if (Beatmap != null && !Beatmap.Value.BeatmapSetInfo.DeletePending)
             {
-                UpdateBeatmap(Beatmap.Value);
+                updateComponentFromBeatmap(Beatmap.Value);
 
                 // restart playback on returning to song select, regardless.
                 music?.Play();
@@ -610,10 +614,8 @@ namespace osu.Game.Screens.Select
         /// This is a debounced call (unlike directly binding to WorkingBeatmap.ValueChanged).
         /// </summary>
         /// <param name="beatmap">The working beatmap.</param>
-        protected virtual void UpdateBeatmap(WorkingBeatmap beatmap)
+        private void updateComponentFromBeatmap(WorkingBeatmap beatmap)
         {
-            Logger.Log($"working beatmap updated to {beatmap}");
-
             if (Background is BackgroundScreenBeatmap backgroundModeBeatmap)
             {
                 backgroundModeBeatmap.Beatmap = beatmap;
@@ -658,9 +660,17 @@ namespace osu.Game.Screens.Select
                 return;
 
             // Attempt to select the current beatmap on the carousel, if it is valid to be selected.
-            if (!Beatmap.IsDefault && Beatmap.Value.BeatmapSetInfo?.DeletePending == false && Beatmap.Value.BeatmapSetInfo?.Protected == false
-                && Carousel.SelectBeatmap(Beatmap.Value.BeatmapInfo, false))
-                return;
+            if (!Beatmap.IsDefault && Beatmap.Value.BeatmapSetInfo?.DeletePending == false && Beatmap.Value.BeatmapSetInfo?.Protected == false)
+            {
+                if (Carousel.SelectBeatmap(Beatmap.Value.BeatmapInfo, false))
+                    return;
+
+                // prefer not changing ruleset at this point, so look for another difficulty in the currently playing beatmap
+                var found = Beatmap.Value.BeatmapSetInfo.Beatmaps.FirstOrDefault(b => b.Ruleset.Equals(decoupledRuleset.Value));
+
+                if (found != null && Carousel.SelectBeatmap(found, false))
+                    return;
+            }
 
             // If the current active beatmap could not be selected, select a new random beatmap.
             if (!Carousel.SelectNextRandom())

From db5c8043db509c2b94d46160a14616c359f52f35 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Mar 2020 16:42:26 +0900
Subject: [PATCH 1053/1142] Add test covering ruleset change on difficulty icon
 selection

---
 .../SongSelect/TestScenePlaySongSelect.cs     | 44 ++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index d16fd0bceb..8295f0aa66 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -572,6 +572,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 difficultyIcon = set.ChildrenOfType<DrawableCarouselBeatmapSet.FilterableDifficultyIcon>()
                                     .First(icon => getDifficultyIconIndex(set, icon) != getCurrentBeatmapIndex());
             });
+
             AddStep("Click on a difficulty", () =>
             {
                 InputManager.MoveMouseTo(difficultyIcon);
@@ -579,6 +580,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 InputManager.PressButton(MouseButton.Left);
                 InputManager.ReleaseButton(MouseButton.Left);
             });
+
             AddAssert("Selected beatmap correct", () => getCurrentBeatmapIndex() == getDifficultyIconIndex(set, difficultyIcon));
 
             double? maxBPM = null;
@@ -596,7 +598,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             AddStep("Get filtered icon", () =>
             {
-                filteredBeatmap = songSelect.Carousel.SelectedBeatmapSet.Beatmaps.Find(b => b.BPM < maxBPM);
+                filteredBeatmap = songSelect.Carousel.SelectedBeatmapSet.Beatmaps.First(b => b.BPM < maxBPM);
                 int filteredBeatmapIndex = getBeatmapIndex(filteredBeatmap.BeatmapSet, filteredBeatmap);
                 filteredIcon = set.ChildrenOfType<DrawableCarouselBeatmapSet.FilterableDifficultyIcon>().ElementAt(filteredBeatmapIndex);
             });
@@ -612,6 +614,46 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddAssert("Selected beatmap correct", () => songSelect.Carousel.SelectedBeatmap == filteredBeatmap);
         }
 
+        [Test]
+        public void TestDifficultyIconSelectingForDifferentRuleset()
+        {
+            changeRuleset(0);
+
+            createSongSelect();
+
+            AddStep("import multi-ruleset map", () =>
+            {
+                var usableRulesets = rulesets.AvailableRulesets.Where(r => r.ID != 2).ToArray();
+                manager.Import(createTestBeatmapSet(0, usableRulesets)).Wait();
+            });
+
+            DrawableCarouselBeatmapSet set = null;
+            AddUntilStep("Find the DrawableCarouselBeatmapSet", () =>
+            {
+                set = songSelect.Carousel.ChildrenOfType<DrawableCarouselBeatmapSet>().FirstOrDefault();
+                return set != null;
+            });
+
+            DrawableCarouselBeatmapSet.FilterableDifficultyIcon difficultyIcon = null;
+            AddStep("Find an icon for different ruleset", () =>
+            {
+                difficultyIcon = set.ChildrenOfType<DrawableCarouselBeatmapSet.FilterableDifficultyIcon>()
+                                    .First(icon => icon.Item.Beatmap.ID == 3);
+            });
+
+            AddAssert("Check ruleset is osu!", () => Ruleset.Value.ID == 0);
+
+            AddStep("Click on a difficulty", () =>
+            {
+                InputManager.MoveMouseTo(difficultyIcon);
+
+                InputManager.PressButton(MouseButton.Left);
+                InputManager.ReleaseButton(MouseButton.Left);
+            });
+
+            AddUntilStep("Check ruleset changed to mania", () => Ruleset.Value.ID == 3);
+        }
+
         private int getBeatmapIndex(BeatmapSetInfo set, BeatmapInfo info) => set.Beatmaps.FindIndex(b => b == info);
 
         private int getCurrentBeatmapIndex() => getBeatmapIndex(songSelect.Carousel.SelectedBeatmapSet, songSelect.Carousel.SelectedBeatmap);

From a69fabbd1ff4255c7cad25881b31daa5a48f365e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Mar 2020 18:56:48 +0900
Subject: [PATCH 1054/1142] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 6a8e66ee6a..f623a92ade 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.304.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.310.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.312.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index cc1ab654ab..ba6f0e2251 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.304.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.310.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.312.0" />
     <PackageReference Include="Sentry" Version="2.1.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 04b688cfa3..54cd400d51 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.304.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.310.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.312.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
@@ -79,7 +79,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.310.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.312.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 1819a15509c8854a1307e9d86a8beb79fdefe59d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Mar 2020 18:56:31 +0900
Subject: [PATCH 1055/1142] Make test ID assigning simpler

---
 .../SongSelect/TestScenePlaySongSelect.cs      | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 34f442e6ee..62eb1340fc 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -283,7 +283,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 AddStep("import multi-ruleset map", () =>
                 {
                     var usableRulesets = rulesets.AvailableRulesets.Where(r => r.ID != 2).ToArray();
-                    manager.Import(createTestBeatmapSet(0, usableRulesets)).Wait();
+                    manager.Import(createTestBeatmapSet(usableRulesets)).Wait();
                 });
             }
             else
@@ -624,7 +624,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("import multi-ruleset map", () =>
             {
                 var usableRulesets = rulesets.AvailableRulesets.Where(r => r.ID != 2).ToArray();
-                manager.Import(createTestBeatmapSet(0, usableRulesets)).Wait();
+                manager.Import(createTestBeatmapSet(usableRulesets)).Wait();
             });
 
             DrawableCarouselBeatmapSet set = null;
@@ -638,7 +638,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("Find an icon for different ruleset", () =>
             {
                 difficultyIcon = set.ChildrenOfType<DrawableCarouselBeatmapSet.FilterableDifficultyIcon>()
-                                    .First(icon => icon.Item.Beatmap.ID == 3);
+                                    .First(icon => icon.Item.Beatmap.Ruleset.ID == 3);
             });
 
             AddAssert("Check ruleset is osu!", () => Ruleset.Value.ID == 0);
@@ -664,7 +664,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("import huge difficulty count map", () =>
             {
                 var usableRulesets = rulesets.AvailableRulesets.Where(r => r.ID != 2).ToArray();
-                manager.Import(createTestBeatmapSet(0, usableRulesets, 50)).Wait();
+                manager.Import(createTestBeatmapSet(usableRulesets, 50)).Wait();
             });
 
             DrawableCarouselBeatmapSet set = null;
@@ -707,7 +707,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private void addRulesetImportStep(int id) => AddStep($"import test map for ruleset {id}", () => importForRuleset(id));
 
-        private void importForRuleset(int id) => manager.Import(createTestBeatmapSet(getImportId(), rulesets.AvailableRulesets.Where(r => r.ID == id).ToArray())).Wait();
+        private void importForRuleset(int id) => manager.Import(createTestBeatmapSet(rulesets.AvailableRulesets.Where(r => r.ID == id).ToArray())).Wait();
 
         private static int importId;
 
@@ -733,20 +733,22 @@ namespace osu.Game.Tests.Visual.SongSelect
                 var usableRulesets = rulesets.AvailableRulesets.Where(r => r.ID != 2).ToArray();
 
                 for (int i = 0; i < 100; i += 10)
-                    manager.Import(createTestBeatmapSet(i, usableRulesets)).Wait();
+                    manager.Import(createTestBeatmapSet(usableRulesets)).Wait();
             });
         }
 
-        private BeatmapSetInfo createTestBeatmapSet(int setId, RulesetInfo[] rulesets, int countPerRuleset = 6)
+        private BeatmapSetInfo createTestBeatmapSet(RulesetInfo[] rulesets, int countPerRuleset = 6)
         {
             int j = 0;
             RulesetInfo getRuleset() => rulesets[j++ % rulesets.Length];
 
+            int setId = getImportId();
+
             var beatmaps = new List<BeatmapInfo>();
 
             for (int i = 0; i < countPerRuleset; i++)
             {
-                int beatmapId = setId * 100 + i;
+                int beatmapId = setId * 1000 + i;
 
                 int length = RNG.Next(30000, 200000);
                 double bpm = RNG.NextSingle(80, 200);

From 250061ddf50d1a06541bbcaaf78fc6989b70ebec Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Mar 2020 19:46:21 +0900
Subject: [PATCH 1056/1142] Fix test failure due to off-screen panel

---
 osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 62eb1340fc..9f33d03ac4 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -661,12 +661,16 @@ namespace osu.Game.Tests.Visual.SongSelect
 
             createSongSelect();
 
+            BeatmapSetInfo imported = null;
+
             AddStep("import huge difficulty count map", () =>
             {
                 var usableRulesets = rulesets.AvailableRulesets.Where(r => r.ID != 2).ToArray();
-                manager.Import(createTestBeatmapSet(usableRulesets, 50)).Wait();
+                imported = manager.Import(createTestBeatmapSet(usableRulesets, 50)).Result;
             });
 
+            AddStep("select the first beatmap of import", () => Beatmap.Value = manager.GetWorkingBeatmap(imported.Beatmaps.First()));
+
             DrawableCarouselBeatmapSet set = null;
             AddUntilStep("Find the DrawableCarouselBeatmapSet", () =>
             {

From bab197553e3968263cf0ee93776707d8da7c53c9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 12 Mar 2020 15:34:58 +0900
Subject: [PATCH 1057/1142] Update carousel test logic to match new carousel
 selection behaviour

---
 .../Visual/SongSelect/TestSceneBeatmapCarousel.cs        | 2 +-
 .../Visual/SongSelect/TestScenePlaySongSelect.cs         | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
index 71ae47dc66..d80add3015 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
@@ -399,7 +399,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("filter to ruleset 0", () =>
                 carousel.Filter(new FilterCriteria { Ruleset = rulesets.AvailableRulesets.ElementAt(0) }, false));
             AddStep("select filtered map skipping filtered", () => carousel.SelectBeatmap(testMixed.Beatmaps[1], false));
-            AddAssert("unfiltered beatmap selected", () => carousel.SelectedBeatmap.Equals(testMixed.Beatmaps[0]));
+            AddAssert("unfiltered beatmap not selected", () => carousel.SelectedBeatmap == null);
 
             AddStep("remove mixed set", () =>
             {
diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 55c1d8451f..d16fd0bceb 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -591,16 +591,16 @@ namespace osu.Game.Tests.Visual.SongSelect
                 }
             }));
 
+            BeatmapInfo filteredBeatmap = null;
             DrawableCarouselBeatmapSet.FilterableDifficultyIcon filteredIcon = null;
+
             AddStep("Get filtered icon", () =>
             {
-                var filteredBeatmap = songSelect.Carousel.SelectedBeatmapSet.Beatmaps.Find(b => b.BPM < maxBPM);
+                filteredBeatmap = songSelect.Carousel.SelectedBeatmapSet.Beatmaps.Find(b => b.BPM < maxBPM);
                 int filteredBeatmapIndex = getBeatmapIndex(filteredBeatmap.BeatmapSet, filteredBeatmap);
                 filteredIcon = set.ChildrenOfType<DrawableCarouselBeatmapSet.FilterableDifficultyIcon>().ElementAt(filteredBeatmapIndex);
             });
 
-            int? previousID = null;
-            AddStep("Store current ID", () => previousID = songSelect.Carousel.SelectedBeatmap.ID);
             AddStep("Click on a filtered difficulty", () =>
             {
                 InputManager.MoveMouseTo(filteredIcon);
@@ -608,7 +608,8 @@ namespace osu.Game.Tests.Visual.SongSelect
                 InputManager.PressButton(MouseButton.Left);
                 InputManager.ReleaseButton(MouseButton.Left);
             });
-            AddAssert("Selected beatmap has not changed", () => songSelect.Carousel.SelectedBeatmap.ID == previousID);
+
+            AddAssert("Selected beatmap correct", () => songSelect.Carousel.SelectedBeatmap == filteredBeatmap);
         }
 
         private int getBeatmapIndex(BeatmapSetInfo set, BeatmapInfo info) => set.Beatmaps.FindIndex(b => b == info);

From 317bb5d0a436e3f6af94c141beeeec314b8f10cc Mon Sep 17 00:00:00 2001
From: Kelvin <2yangk23@gmail.com>
Date: Thu, 12 Mar 2020 03:55:45 -0700
Subject: [PATCH 1058/1142] Fallback on invalid AnimationFramerate for legacy
 skins

---
 osu.Game/Skinning/LegacySkinExtensions.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index fa4de21eec..9cc58f4490 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Skinning
             {
                 var iniRate = source.GetConfig<GlobalSkinConfiguration, int>(GlobalSkinConfiguration.AnimationFramerate);
 
-                if (iniRate != null)
+                if (iniRate != null && iniRate.Value > 0)
                     return 1000f / iniRate.Value;
 
                 return 1000f / textures.Length;

From c8ea92257765d05bba2ae3d7a0f0966625d2aacf Mon Sep 17 00:00:00 2001
From: Kelvin <2yangk23@users.noreply.github.com>
Date: Thu, 12 Mar 2020 04:18:57 -0700
Subject: [PATCH 1059/1142] Update osu.Game/Skinning/LegacySkinExtensions.cs

Co-Authored-By: Dean Herbert <pe@ppy.sh>
---
 osu.Game/Skinning/LegacySkinExtensions.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Skinning/LegacySkinExtensions.cs b/osu.Game/Skinning/LegacySkinExtensions.cs
index 9cc58f4490..52328d43b2 100644
--- a/osu.Game/Skinning/LegacySkinExtensions.cs
+++ b/osu.Game/Skinning/LegacySkinExtensions.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Skinning
             {
                 var iniRate = source.GetConfig<GlobalSkinConfiguration, int>(GlobalSkinConfiguration.AnimationFramerate);
 
-                if (iniRate != null && iniRate.Value > 0)
+                if (iniRate?.Value > 0)
                     return 1000f / iniRate.Value;
 
                 return 1000f / textures.Length;

From 3f8b454ff4783b896516506b4ef192cda78134f2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Mar 2020 10:01:28 +0900
Subject: [PATCH 1060/1142] Reword comment to match new filtering behaviour
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index e0d59e3b18..6d760df065 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Select.Carousel
 
             if (Beatmap.BeatmapSet?.Equals(criteria.SelectedBeatmapSet) == true)
             {
-                // bypass filtering for selected beatmap
+                // only check ruleset equality or convertability for selected beatmap
                 Filtered.Value = !match;
                 return;
             }

From 04f1da04db8c685305b8688dd29d7d4af0985c6b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Mar 2020 10:52:08 +0900
Subject: [PATCH 1061/1142] Remove incorrect xmldoc from SelectBeatmap function

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index ca20b02bce..34d659cc90 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -201,9 +201,6 @@ namespace osu.Game.Screens.Select
 
         /// <summary>
         /// Selects a given beatmap on the carousel.
-        ///
-        /// If bypassFilters is false, we will try to select another unfiltered beatmap in the same set. If the
-        /// entire set is filtered, no selection is made.
         /// </summary>
         /// <param name="beatmap">The beatmap to select.</param>
         /// <param name="bypassFilters">Whether to select the beatmap even if it is filtered (i.e., not visible on carousel).</param>

From ba0dec891d4a576f6158bff9235bc37cbb224f14 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Mar 2020 10:58:36 +0900
Subject: [PATCH 1062/1142] Update test temporarily

---
 osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index d16fd0bceb..f1ff08b92c 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -609,7 +609,8 @@ namespace osu.Game.Tests.Visual.SongSelect
                 InputManager.ReleaseButton(MouseButton.Left);
             });
 
-            AddAssert("Selected beatmap correct", () => songSelect.Carousel.SelectedBeatmap == filteredBeatmap);
+            // todo: this logic is changed in follow up PR.
+            AddAssert("Selected beatmap not changed", () => songSelect.Carousel.SelectedBeatmap != filteredBeatmap);
         }
 
         private int getBeatmapIndex(BeatmapSetInfo set, BeatmapInfo info) => set.Beatmaps.FindIndex(b => b == info);

From de9857ccdc1e5808c23ee0dc99c2c357c2f0984d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Mar 2020 11:00:09 +0900
Subject: [PATCH 1063/1142] Fix incorrect id reference in test

---
 osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
index 8295f0aa66..31c6e35492 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
@@ -638,7 +638,7 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep("Find an icon for different ruleset", () =>
             {
                 difficultyIcon = set.ChildrenOfType<DrawableCarouselBeatmapSet.FilterableDifficultyIcon>()
-                                    .First(icon => icon.Item.Beatmap.ID == 3);
+                                    .First(icon => icon.Item.Beatmap.Ruleset.ID == 3);
             });
 
             AddAssert("Check ruleset is osu!", () => Ruleset.Value.ID == 0);

From 5f8d180b5ec5acdff86933d7deeb5e0c3bcff6ff Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Mar 2020 11:51:26 +0900
Subject: [PATCH 1064/1142] Fix carousel scrolling being inoperable during
 beatmap import

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 04c08cdbd2..2dc063012f 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -191,7 +191,9 @@ namespace osu.Game.Screens.Select
 
             root.AddChild(newSet);
 
-            applyActiveCriteria(false);
+            // only reset scroll position if already near the scroll target.
+            // without this, during a large beatmap import it is impossible to navigate the carousel.
+            applyActiveCriteria(false, alwaysResetScrollPosition: false);
 
             //check if we can/need to maintain our current selection.
             if (previouslySelectedID != null)
@@ -411,7 +413,7 @@ namespace osu.Game.Screens.Select
             applyActiveCriteria(debounce);
         }
 
-        private void applyActiveCriteria(bool debounce)
+        private void applyActiveCriteria(bool debounce, bool alwaysResetScrollPosition = true)
         {
             if (root.Children.Any() != true) return;
 
@@ -421,7 +423,9 @@ namespace osu.Game.Screens.Select
 
                 root.Filter(activeCriteria);
                 itemsCache.Invalidate();
-                scrollPositionCache.Invalidate();
+
+                if (alwaysResetScrollPosition || isAtScrollTarget)
+                    ScrollToSelected();
             }
 
             PendingFilter?.Cancel();
@@ -435,6 +439,9 @@ namespace osu.Game.Screens.Select
 
         private float? scrollTarget;
 
+        /// <summary>
+        /// Scroll to the current <see cref="SelectedBeatmap"/>.
+        /// </summary>
         public void ScrollToSelected() => scrollPositionCache.Invalidate();
 
         protected override bool OnKeyDown(KeyDownEvent e)
@@ -601,7 +608,7 @@ namespace osu.Game.Screens.Select
                         SelectionChanged?.Invoke(c.Beatmap);
 
                         itemsCache.Invalidate();
-                        scrollPositionCache.Invalidate();
+                        ScrollToSelected();
                     }
                 };
             }
@@ -688,6 +695,11 @@ namespace osu.Game.Screens.Select
             itemsCache.Validate();
         }
 
+        /// <summary>
+        /// Denotes whether the current scroll position is roughly at the scroll target (the current selection).
+        /// </summary>
+        private bool isAtScrollTarget => scrollTarget != null && Precision.AlmostEquals(scrollTarget.Value, scroll.Current, 150);
+
         private bool firstScroll = true;
 
         private void updateScrollPosition()

From ac70fcc54469fe5edd2d6574f609169ac5dbdb0b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Mar 2020 12:30:27 +0900
Subject: [PATCH 1065/1142] Change logic to be more resilient by identifying
 user scroll events

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 26 ++++++++++++++++------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 2dc063012f..20f9bb1be8 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Screens.Select
         /// </summary>
         public bool BeatmapSetsLoaded { get; private set; }
 
-        private readonly OsuScrollContainer scroll;
+        private readonly CarouselScrollContainer scroll;
 
         private IEnumerable<CarouselBeatmapSet> beatmapSets => root.Children.OfType<CarouselBeatmapSet>();
 
@@ -424,7 +424,7 @@ namespace osu.Game.Screens.Select
                 root.Filter(activeCriteria);
                 itemsCache.Invalidate();
 
-                if (alwaysResetScrollPosition || isAtScrollTarget)
+                if (alwaysResetScrollPosition || !scroll.UserScrolling)
                     ScrollToSelected();
             }
 
@@ -695,11 +695,6 @@ namespace osu.Game.Screens.Select
             itemsCache.Validate();
         }
 
-        /// <summary>
-        /// Denotes whether the current scroll position is roughly at the scroll target (the current selection).
-        /// </summary>
-        private bool isAtScrollTarget => scrollTarget != null && Precision.AlmostEquals(scrollTarget.Value, scroll.Current, 150);
-
         private bool firstScroll = true;
 
         private void updateScrollPosition()
@@ -779,6 +774,23 @@ namespace osu.Game.Screens.Select
         {
             private bool rightMouseScrollBlocked;
 
+            /// <summary>
+            /// Whether the last scroll event was user triggered, directly on the scroll container.
+            /// </summary>
+            public bool UserScrolling { get; private set; }
+
+            protected override void OnUserScroll(float value, bool animated = true, double? distanceDecay = null)
+            {
+                UserScrolling = true;
+                base.OnUserScroll(value, animated, distanceDecay);
+            }
+
+            public new void ScrollTo(float value, bool animated = true, double? distanceDecay = null)
+            {
+                UserScrolling = false;
+                base.ScrollTo(value, animated, distanceDecay);
+            }
+
             protected override bool OnMouseDown(MouseDownEvent e)
             {
                 if (e.Button == MouseButton.Right)

From c8cdc5fda5fe6050d0512a56d686e8ec9f28f0d5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 13 Mar 2020 12:43:01 +0900
Subject: [PATCH 1066/1142] Expose half catcher width to movement skill

---
 .../Difficulty/CatchDifficultyCalculator.cs   | 27 ++++++++++---------
 .../Difficulty/Skills/Movement.cs             |  7 +++++
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
index 44e1a8e5cc..a3315d36e8 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -23,6 +23,8 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
         protected override int SectionLength => 750;
 
+        private float halfCatcherWidth;
+
         public CatchDifficultyCalculator(Ruleset ruleset, WorkingBeatmap beatmap)
             : base(ruleset, beatmap)
         {
@@ -48,14 +50,6 @@ namespace osu.Game.Rulesets.Catch.Difficulty
 
         protected override IEnumerable<DifficultyHitObject> CreateDifficultyHitObjects(IBeatmap beatmap, double clockRate)
         {
-            float halfCatchWidth;
-
-            using (var catcher = new CatcherArea.Catcher(beatmap.BeatmapInfo.BaseDifficulty))
-            {
-                halfCatchWidth = catcher.CatchWidth * 0.5f;
-                halfCatchWidth *= 0.8f; // We're only using 80% of the catcher's width to simulate imperfect gameplay.
-            }
-
             CatchHitObject lastObject = null;
 
             // In 2B beatmaps, it is possible that a normal Fruit is placed in the middle of a JuiceStream.
@@ -69,16 +63,25 @@ namespace osu.Game.Rulesets.Catch.Difficulty
                     continue;
 
                 if (lastObject != null)
-                    yield return new CatchDifficultyHitObject(hitObject, lastObject, clockRate, halfCatchWidth);
+                    yield return new CatchDifficultyHitObject(hitObject, lastObject, clockRate, halfCatcherWidth);
 
                 lastObject = hitObject;
             }
         }
 
-        protected override Skill[] CreateSkills(IBeatmap beatmap) => new Skill[]
+        protected override Skill[] CreateSkills(IBeatmap beatmap)
         {
-            new Movement(),
-        };
+            using (var catcher = new CatcherArea.Catcher(beatmap.BeatmapInfo.BaseDifficulty))
+            {
+                halfCatcherWidth = catcher.CatchWidth * 0.5f;
+                halfCatcherWidth *= 0.8f; // We're only using 80% of the catcher's width to simulate imperfect gameplay.
+            }
+
+            return new Skill[]
+            {
+                new Movement(halfCatcherWidth),
+            };
+        }
 
         protected override Mod[] DifficultyAdjustmentMods => new Mod[]
         {
diff --git a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
index 7cd569035b..fd164907e0 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/Skills/Movement.cs
@@ -20,9 +20,16 @@ namespace osu.Game.Rulesets.Catch.Difficulty.Skills
 
         protected override double DecayWeight => 0.94;
 
+        protected readonly float HalfCatcherWidth;
+
         private float? lastPlayerPosition;
         private float lastDistanceMoved;
 
+        public Movement(float halfCatcherWidth)
+        {
+            HalfCatcherWidth = halfCatcherWidth;
+        }
+
         protected override double StrainValueOf(DifficultyHitObject current)
         {
             var catchCurrent = (CatchDifficultyHitObject)current;

From 1733519c3a3f7e88cb6c96ecbe2041f4bf0dbb0e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Mar 2020 12:59:30 +0900
Subject: [PATCH 1067/1142] Split out CatcherArea nested classes and reorder
 methods

---
 .../TestSceneCatcher.cs                       |   2 +-
 .../TestSceneDrawableHitObjects.cs            |   2 +-
 .../TestSceneHyperDash.cs                     |   2 +-
 .../Beatmaps/CatchBeatmapProcessor.cs         |   2 +-
 .../Difficulty/CatchDifficultyCalculator.cs   |   2 +-
 osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs |   2 +-
 .../Replays/CatchAutoGenerator.cs             |   2 +-
 osu.Game.Rulesets.Catch/UI/Catcher.cs         | 460 ++++++++++++++
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs     | 581 +-----------------
 osu.Game.Rulesets.Catch/UI/HitExplosion.cs    | 122 ++++
 10 files changed, 605 insertions(+), 572 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch/UI/Catcher.cs
 create mode 100644 osu.Game.Rulesets.Catch/UI/HitExplosion.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
index fbbe00bb6c..fe0d512166 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         [BackgroundDependencyLoader]
         private void load()
         {
-            SetContents(() => new CatcherArea.Catcher
+            SetContents(() => new Catcher
             {
                 RelativePositionAxes = Axes.None,
                 Anchor = Anchor.Centre,
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
index 304c7e3854..df5494aab0 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Catch.Tests
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
-            typeof(CatcherArea.Catcher),
+            typeof(Catcher),
             typeof(DrawableCatchRuleset),
             typeof(DrawableFruit),
             typeof(DrawableJuiceStream),
diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
index 6f0d8f0a3a..49ff9df4d7 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             }
         }
 
-        private CatcherArea.Catcher getCatcher() => Player.ChildrenOfType<CatcherArea>().First().MovableCatcher;
+        private Catcher getCatcher() => Player.ChildrenOfType<CatcherArea>().First().MovableCatcher;
 
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {
diff --git a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
index 986dc9dbb9..7c81bcdf0c 100644
--- a/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
+++ b/osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapProcessor.cs
@@ -227,7 +227,7 @@ namespace osu.Game.Rulesets.Catch.Beatmaps
                 int thisDirection = nextObject.X > currentObject.X ? 1 : -1;
                 double timeToNext = nextObject.StartTime - currentObject.StartTime - 1000f / 60f / 4; // 1/4th of a frame of grace time, taken from osu-stable
                 double distanceToNext = Math.Abs(nextObject.X - currentObject.X) - (lastDirection == thisDirection ? lastExcess : halfCatcherWidth);
-                float distanceToHyper = (float)(timeToNext * CatcherArea.Catcher.BASE_SPEED - distanceToNext);
+                float distanceToHyper = (float)(timeToNext * Catcher.BASE_SPEED - distanceToNext);
 
                 if (distanceToHyper < 0)
                 {
diff --git a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
index 44e1a8e5cc..8b7080b5bf 100644
--- a/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
@@ -50,7 +50,7 @@ namespace osu.Game.Rulesets.Catch.Difficulty
         {
             float halfCatchWidth;
 
-            using (var catcher = new CatcherArea.Catcher(beatmap.BeatmapInfo.BaseDifficulty))
+            using (var catcher = new Catcher(beatmap.BeatmapInfo.BaseDifficulty))
             {
                 halfCatchWidth = catcher.CatchWidth * 0.5f;
                 halfCatchWidth *= 0.8f; // We're only using 80% of the catcher's width to simulate imperfect gameplay.
diff --git a/osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs b/osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs
index 4c72b9fd3e..1ef235f764 100644
--- a/osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs
+++ b/osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Catch.Mods
 
         private class MouseInputHelper : Drawable, IKeyBindingHandler<CatchAction>, IRequireHighFrequencyMousePosition
         {
-            private readonly CatcherArea.Catcher catcher;
+            private readonly Catcher catcher;
 
             public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 
diff --git a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
index 4649dcae90..b90b5812a6 100644
--- a/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
+++ b/osu.Game.Rulesets.Catch/Replays/CatchAutoGenerator.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Catch.Replays
         public override Replay Generate()
         {
             // todo: add support for HT DT
-            const double dash_speed = CatcherArea.Catcher.BASE_SPEED;
+            const double dash_speed = Catcher.BASE_SPEED;
             const double movement_speed = dash_speed / 2;
             float lastPosition = 0.5f;
             double lastTime = 0;
diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
new file mode 100644
index 0000000000..2c8b080ee3
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -0,0 +1,460 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Animations;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Input.Bindings;
+using osu.Framework.Utils;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Catch.Objects;
+using osu.Game.Rulesets.Catch.Objects.Drawables;
+using osu.Game.Rulesets.Objects.Drawables;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Catch.UI
+{
+    public class Catcher : Container, IKeyBindingHandler<CatchAction>
+    {
+        /// <summary>
+        /// Whether we are hyper-dashing or not.
+        /// </summary>
+        public bool HyperDashing => hyperDashModifier != 1;
+
+        /// <summary>
+        /// The relative space to cover in 1 millisecond. based on 1 game pixel per millisecond as in osu-stable.
+        /// </summary>
+        public const double BASE_SPEED = 1.0 / 512;
+
+        public Container ExplodingFruitTarget;
+
+        public Container AdditiveTarget;
+
+        public CatcherAnimationState CurrentState { get; private set; }
+
+        /// <summary>
+        /// Width of the area that can be used to attempt catches during gameplay.
+        /// </summary>
+        internal float CatchWidth => CatcherArea.CATCHER_SIZE * Math.Abs(Scale.X);
+
+        protected bool Dashing
+        {
+            get => dashing;
+            set
+            {
+                if (value == dashing) return;
+
+                dashing = value;
+
+                Trail |= dashing;
+            }
+        }
+
+        /// <summary>
+        /// Activate or deactive the trail. Will be automatically deactivated when conditions to keep the trail displayed are no longer met.
+        /// </summary>
+        protected bool Trail
+        {
+            get => trail;
+            set
+            {
+                if (value == trail) return;
+
+                trail = value;
+
+                if (Trail)
+                    beginTrail();
+            }
+        }
+
+        private Container<DrawableHitObject> caughtFruit;
+
+        private CatcherSprite catcherIdle;
+        private CatcherSprite catcherKiai;
+        private CatcherSprite catcherFail;
+
+        private int currentDirection;
+
+        private bool dashing;
+
+        private bool trail;
+
+        private double hyperDashModifier = 1;
+        private int hyperDashDirection;
+        private float hyperDashTargetPosition;
+
+        public Catcher(BeatmapDifficulty difficulty = null)
+        {
+            RelativePositionAxes = Axes.X;
+            X = 0.5f;
+
+            Origin = Anchor.TopCentre;
+
+            Size = new Vector2(CatcherArea.CATCHER_SIZE);
+            if (difficulty != null)
+                Scale = new Vector2(1.0f - 0.7f * (difficulty.CircleSize - 5) / 5);
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Children = new Drawable[]
+            {
+                caughtFruit = new Container<DrawableHitObject>
+                {
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.BottomCentre,
+                },
+                catcherIdle = new CatcherSprite(CatcherAnimationState.Idle)
+                {
+                    Anchor = Anchor.TopCentre,
+                    Alpha = 0,
+                },
+                catcherKiai = new CatcherSprite(CatcherAnimationState.Kiai)
+                {
+                    Anchor = Anchor.TopCentre,
+                    Alpha = 0,
+                },
+                catcherFail = new CatcherSprite(CatcherAnimationState.Fail)
+                {
+                    Anchor = Anchor.TopCentre,
+                    Alpha = 0,
+                }
+            };
+
+            updateCatcher();
+        }
+
+        /// <summary>
+        /// Add a caught fruit to the catcher's stack.
+        /// </summary>
+        /// <param name="fruit">The fruit that was caught.</param>
+        public void PlaceOnPlate(DrawableCatchHitObject fruit)
+        {
+            var ourRadius = fruit.DisplayRadius;
+            float theirRadius = 0;
+
+            const float allowance = 6;
+
+            while (caughtFruit.Any(f =>
+                f.LifetimeEnd == double.MaxValue &&
+                Vector2Extensions.Distance(f.Position, fruit.Position) < (ourRadius + (theirRadius = f.DrawSize.X / 2 * f.Scale.X)) / (allowance / 2)))
+            {
+                var diff = (ourRadius + theirRadius) / allowance;
+                fruit.X += (RNG.NextSingle() - 0.5f) * 2 * diff;
+                fruit.Y -= RNG.NextSingle() * diff;
+            }
+
+            fruit.X = Math.Clamp(fruit.X, -CatcherArea.CATCHER_SIZE / 2, CatcherArea.CATCHER_SIZE / 2);
+
+            caughtFruit.Add(fruit);
+
+            Add(new HitExplosion(fruit)
+            {
+                X = fruit.X,
+                Scale = new Vector2(fruit.HitObject.Scale)
+            });
+        }
+
+        /// <summary>
+        /// Let the catcher attempt to catch a fruit.
+        /// </summary>
+        /// <param name="fruit">The fruit to catch.</param>
+        /// <returns>Whether the catch is possible.</returns>
+        public bool AttemptCatch(CatchHitObject fruit)
+        {
+            var halfCatchWidth = CatchWidth * 0.5f;
+
+            // this stuff wil disappear once we move fruit to non-relative coordinate space in the future.
+            var catchObjectPosition = fruit.X * CatchPlayfield.BASE_WIDTH;
+            var catcherPosition = Position.X * CatchPlayfield.BASE_WIDTH;
+
+            var validCatch =
+                catchObjectPosition >= catcherPosition - halfCatchWidth &&
+                catchObjectPosition <= catcherPosition + halfCatchWidth;
+
+            // only update hyperdash state if we are catching a fruit.
+            // exceptions are Droplets and JuiceStreams.
+            if (!(fruit is Fruit)) return validCatch;
+
+            if (validCatch && fruit.HyperDash)
+            {
+                var target = fruit.HyperDashTarget;
+                var timeDifference = target.StartTime - fruit.StartTime;
+                double positionDifference = target.X * CatchPlayfield.BASE_WIDTH - catcherPosition;
+                var velocity = positionDifference / Math.Max(1.0, timeDifference - 1000.0 / 60.0);
+
+                SetHyperDashState(Math.Abs(velocity), target.X);
+            }
+            else
+                SetHyperDashState();
+
+            if (validCatch)
+                updateState(fruit.Kiai ? CatcherAnimationState.Kiai : CatcherAnimationState.Idle);
+            else if (!(fruit is Banana))
+                updateState(CatcherAnimationState.Fail);
+
+            return validCatch;
+        }
+
+        /// <summary>
+        /// Set hyper-dash state.
+        /// </summary>
+        /// <param name="modifier">The speed multiplier. If this is less or equals to 1, this catcher will be non-hyper-dashing state.</param>
+        /// <param name="targetPosition">When this catcher crosses this position, this catcher ends hyper-dashing.</param>
+        public void SetHyperDashState(double modifier = 1, float targetPosition = -1)
+        {
+            const float hyper_dash_transition_length = 180;
+
+            var wasHyperDashing = HyperDashing;
+
+            if (modifier <= 1 || X == targetPosition)
+            {
+                hyperDashModifier = 1;
+                hyperDashDirection = 0;
+
+                if (wasHyperDashing)
+                {
+                    this.FadeColour(Color4.White, hyper_dash_transition_length, Easing.OutQuint);
+                    this.FadeTo(1, hyper_dash_transition_length, Easing.OutQuint);
+                    Trail &= Dashing;
+                }
+            }
+            else
+            {
+                hyperDashModifier = modifier;
+                hyperDashDirection = Math.Sign(targetPosition - X);
+                hyperDashTargetPosition = targetPosition;
+
+                if (!wasHyperDashing)
+                {
+                    this.FadeColour(Color4.OrangeRed, hyper_dash_transition_length, Easing.OutQuint);
+                    this.FadeTo(0.2f, hyper_dash_transition_length, Easing.OutQuint);
+                    Trail = true;
+
+                    var hyperDashEndGlow = createAdditiveSprite(true);
+
+                    hyperDashEndGlow.MoveToOffset(new Vector2(0, -20), 1200, Easing.In);
+                    hyperDashEndGlow.ScaleTo(hyperDashEndGlow.Scale * 0.9f).ScaleTo(hyperDashEndGlow.Scale * 1.2f, 1200, Easing.In);
+                    hyperDashEndGlow.FadeOut(1200);
+                    hyperDashEndGlow.Expire(true);
+                }
+            }
+        }
+
+        public bool OnPressed(CatchAction action)
+        {
+            switch (action)
+            {
+                case CatchAction.MoveLeft:
+                    currentDirection--;
+                    return true;
+
+                case CatchAction.MoveRight:
+                    currentDirection++;
+                    return true;
+
+                case CatchAction.Dash:
+                    Dashing = true;
+                    return true;
+            }
+
+            return false;
+        }
+
+        public void OnReleased(CatchAction action)
+        {
+            switch (action)
+            {
+                case CatchAction.MoveLeft:
+                    currentDirection++;
+                    break;
+
+                case CatchAction.MoveRight:
+                    currentDirection--;
+                    break;
+
+                case CatchAction.Dash:
+                    Dashing = false;
+                    break;
+            }
+        }
+
+        public void UpdatePosition(float position)
+        {
+            position = Math.Clamp(position, 0, 1);
+
+            if (position == X)
+                return;
+
+            Scale = new Vector2(Math.Abs(Scale.X) * (position > X ? 1 : -1), Scale.Y);
+            X = position;
+        }
+
+        /// <summary>
+        /// Drop any fruit off the plate.
+        /// </summary>
+        public void Drop()
+        {
+            foreach (var f in caughtFruit.ToArray())
+                Drop(f);
+        }
+
+        /// <summary>
+        /// Explode any fruit off the plate.
+        /// </summary>
+        public void Explode()
+        {
+            foreach (var f in caughtFruit.ToArray())
+                Explode(f);
+        }
+
+        public void Drop(DrawableHitObject fruit)
+        {
+            removeFromPlateWithTransform(fruit, f =>
+            {
+                f.MoveToY(f.Y + 75, 750, Easing.InSine);
+                f.FadeOut(750);
+            });
+        }
+
+        public void Explode(DrawableHitObject fruit)
+        {
+            var originalX = fruit.X * Scale.X;
+
+            removeFromPlateWithTransform(fruit, f =>
+            {
+                f.MoveToY(f.Y - 50, 250, Easing.OutSine).Then().MoveToY(f.Y + 50, 500, Easing.InSine);
+                f.MoveToX(f.X + originalX * 6, 1000);
+                f.FadeOut(750);
+            });
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (currentDirection == 0) return;
+
+            var direction = Math.Sign(currentDirection);
+
+            var dashModifier = Dashing ? 1 : 0.5;
+            var speed = BASE_SPEED * dashModifier * hyperDashModifier;
+
+            UpdatePosition((float)(X + direction * Clock.ElapsedFrameTime * speed));
+
+            // Correct overshooting.
+            if (hyperDashDirection > 0 && hyperDashTargetPosition < X ||
+                hyperDashDirection < 0 && hyperDashTargetPosition > X)
+            {
+                X = hyperDashTargetPosition;
+                SetHyperDashState();
+            }
+        }
+
+        private void updateCatcher()
+        {
+            catcherIdle.Hide();
+            catcherKiai.Hide();
+            catcherFail.Hide();
+
+            CatcherSprite current;
+
+            switch (CurrentState)
+            {
+                default:
+                    current = catcherIdle;
+                    break;
+
+                case CatcherAnimationState.Fail:
+                    current = catcherFail;
+                    break;
+
+                case CatcherAnimationState.Kiai:
+                    current = catcherKiai;
+                    break;
+            }
+
+            current.Show();
+            (current.Drawable as IAnimation)?.GotoFrame(0);
+        }
+
+        private void beginTrail()
+        {
+            Trail &= dashing || HyperDashing;
+            Trail &= AdditiveTarget != null;
+
+            if (!Trail) return;
+
+            var additive = createAdditiveSprite(HyperDashing);
+
+            additive.FadeTo(0.4f).FadeOut(800, Easing.OutQuint);
+            additive.Expire(true);
+
+            Scheduler.AddDelayed(beginTrail, HyperDashing ? 25 : 50);
+        }
+
+        private Drawable createAdditiveSprite(bool hyperDash)
+        {
+            var additive = createCatcherSprite();
+
+            additive.Anchor = Anchor;
+            additive.Scale = Scale;
+            additive.Colour = hyperDash ? Color4.Red : Color4.White;
+            additive.Blending = BlendingParameters.Additive;
+            additive.RelativePositionAxes = RelativePositionAxes;
+            additive.Position = Position;
+
+            AdditiveTarget.Add(additive);
+
+            return additive;
+        }
+
+        private Drawable createCatcherSprite()
+        {
+            return new CatcherSprite(CurrentState);
+        }
+
+        private void updateState(CatcherAnimationState state)
+        {
+            if (CurrentState == state)
+                return;
+
+            CurrentState = state;
+            updateCatcher();
+        }
+
+        private void removeFromPlateWithTransform(DrawableHitObject fruit, Action<DrawableHitObject> action)
+        {
+            if (ExplodingFruitTarget != null)
+            {
+                fruit.Anchor = Anchor.TopLeft;
+                fruit.Position = caughtFruit.ToSpaceOfOtherDrawable(fruit.DrawPosition, ExplodingFruitTarget);
+
+                if (!caughtFruit.Remove(fruit))
+                    // we may have already been removed by a previous operation (due to the weird OnLoadComplete scheduling).
+                    // this avoids a crash on potentially attempting to Add a fruit to ExplodingFruitTarget twice.
+                    return;
+
+                ExplodingFruitTarget.Add(fruit);
+            }
+
+            var actionTime = Clock.CurrentTime;
+
+            fruit.ApplyCustomUpdateState += onFruitOnApplyCustomUpdateState;
+            onFruitOnApplyCustomUpdateState(fruit, fruit.State.Value);
+
+            void onFruitOnApplyCustomUpdateState(DrawableHitObject o, ArmedState state)
+            {
+                using (fruit.BeginAbsoluteSequence(actionTime))
+                    action(fruit);
+
+                fruit.Expire();
+            }
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 2394110165..e0d9ff759d 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -2,15 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Linq;
-using osu.Framework.Allocation;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
-using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Effects;
-using osu.Framework.Input.Bindings;
-using osu.Framework.Utils;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Catch.Judgements;
 using osu.Game.Rulesets.Catch.Objects;
@@ -20,7 +13,6 @@ using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.UI;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.UI
 {
@@ -28,8 +20,6 @@ namespace osu.Game.Rulesets.Catch.UI
     {
         public const float CATCHER_SIZE = 106.75f;
 
-        protected internal readonly Catcher MovableCatcher;
-
         public Func<CatchHitObject, DrawableHitObject<CatchHitObject>> CreateDrawableRepresentation;
 
         public Container ExplodingFruitTarget
@@ -37,6 +27,8 @@ namespace osu.Game.Rulesets.Catch.UI
             set => MovableCatcher.ExplodingFruitTarget = value;
         }
 
+        private DrawableCatchHitObject lastPlateableFruit;
+
         public CatcherArea(BeatmapDifficulty difficulty = null)
         {
             RelativeSizeAxes = Axes.X;
@@ -47,7 +39,10 @@ namespace osu.Game.Rulesets.Catch.UI
             };
         }
 
-        private DrawableCatchHitObject lastPlateableFruit;
+        public static float GetCatcherSize(BeatmapDifficulty difficulty)
+        {
+            return CATCHER_SIZE / CatchPlayfield.BASE_WIDTH * (1.0f - 0.7f * (difficulty.CircleSize - 5) / 5);
+        }
 
         public void OnResult(DrawableCatchHitObject fruit, JudgementResult result)
         {
@@ -100,6 +95,15 @@ namespace osu.Game.Rulesets.Catch.UI
             }
         }
 
+        public void OnReleased(CatchAction action)
+        {
+        }
+
+        public bool AttemptCatch(CatchHitObject obj)
+        {
+            return MovableCatcher.AttemptCatch(obj);
+        }
+
         protected override void UpdateAfterChildren()
         {
             base.UpdateAfterChildren();
@@ -110,559 +114,6 @@ namespace osu.Game.Rulesets.Catch.UI
                 MovableCatcher.X = state.CatcherX.Value;
         }
 
-        public void OnReleased(CatchAction action)
-        {
-        }
-
-        public bool AttemptCatch(CatchHitObject obj) => MovableCatcher.AttemptCatch(obj);
-
-        public static float GetCatcherSize(BeatmapDifficulty difficulty)
-        {
-            return CATCHER_SIZE / CatchPlayfield.BASE_WIDTH * (1.0f - 0.7f * (difficulty.CircleSize - 5) / 5);
-        }
-
-        public class Catcher : Container, IKeyBindingHandler<CatchAction>
-        {
-            /// <summary>
-            /// Width of the area that can be used to attempt catches during gameplay.
-            /// </summary>
-            internal float CatchWidth => CATCHER_SIZE * Math.Abs(Scale.X);
-
-            private Container<DrawableHitObject> caughtFruit;
-
-            public Container ExplodingFruitTarget;
-
-            public Container AdditiveTarget;
-
-            public Catcher(BeatmapDifficulty difficulty = null)
-            {
-                RelativePositionAxes = Axes.X;
-                X = 0.5f;
-
-                Origin = Anchor.TopCentre;
-
-                Size = new Vector2(CATCHER_SIZE);
-                if (difficulty != null)
-                    Scale = new Vector2(1.0f - 0.7f * (difficulty.CircleSize - 5) / 5);
-            }
-
-            [BackgroundDependencyLoader]
-            private void load()
-            {
-                Children = new Drawable[]
-                {
-                    caughtFruit = new Container<DrawableHitObject>
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.BottomCentre,
-                    },
-                    catcherIdle = new CatcherSprite(CatcherAnimationState.Idle)
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Alpha = 0,
-                    },
-                    catcherKiai = new CatcherSprite(CatcherAnimationState.Kiai)
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Alpha = 0,
-                    },
-                    catcherFail = new CatcherSprite(CatcherAnimationState.Fail)
-                    {
-                        Anchor = Anchor.TopCentre,
-                        Alpha = 0,
-                    }
-                };
-
-                updateCatcher();
-            }
-
-            private CatcherSprite catcherIdle;
-            private CatcherSprite catcherKiai;
-            private CatcherSprite catcherFail;
-
-            private void updateCatcher()
-            {
-                catcherIdle.Hide();
-                catcherKiai.Hide();
-                catcherFail.Hide();
-
-                CatcherSprite current;
-
-                switch (CurrentState)
-                {
-                    default:
-                        current = catcherIdle;
-                        break;
-
-                    case CatcherAnimationState.Fail:
-                        current = catcherFail;
-                        break;
-
-                    case CatcherAnimationState.Kiai:
-                        current = catcherKiai;
-                        break;
-                }
-
-                current.Show();
-                (current.Drawable as IAnimation)?.GotoFrame(0);
-            }
-
-            private int currentDirection;
-
-            private bool dashing;
-
-            protected bool Dashing
-            {
-                get => dashing;
-                set
-                {
-                    if (value == dashing) return;
-
-                    dashing = value;
-
-                    Trail |= dashing;
-                }
-            }
-
-            private bool trail;
-
-            /// <summary>
-            /// Activate or deactive the trail. Will be automatically deactivated when conditions to keep the trail displayed are no longer met.
-            /// </summary>
-            protected bool Trail
-            {
-                get => trail;
-                set
-                {
-                    if (value == trail) return;
-
-                    trail = value;
-
-                    if (Trail)
-                        beginTrail();
-                }
-            }
-
-            private void beginTrail()
-            {
-                Trail &= dashing || HyperDashing;
-                Trail &= AdditiveTarget != null;
-
-                if (!Trail) return;
-
-                var additive = createAdditiveSprite(HyperDashing);
-
-                additive.FadeTo(0.4f).FadeOut(800, Easing.OutQuint);
-                additive.Expire(true);
-
-                Scheduler.AddDelayed(beginTrail, HyperDashing ? 25 : 50);
-            }
-
-            private Drawable createAdditiveSprite(bool hyperDash)
-            {
-                var additive = createCatcherSprite();
-
-                additive.Anchor = Anchor;
-                additive.Scale = Scale;
-                additive.Colour = hyperDash ? Color4.Red : Color4.White;
-                additive.Blending = BlendingParameters.Additive;
-                additive.RelativePositionAxes = RelativePositionAxes;
-                additive.Position = Position;
-
-                AdditiveTarget.Add(additive);
-
-                return additive;
-            }
-
-            private Drawable createCatcherSprite() => new CatcherSprite(CurrentState);
-
-            /// <summary>
-            /// Add a caught fruit to the catcher's stack.
-            /// </summary>
-            /// <param name="fruit">The fruit that was caught.</param>
-            public void PlaceOnPlate(DrawableCatchHitObject fruit)
-            {
-                float ourRadius = fruit.DisplayRadius;
-                float theirRadius = 0;
-
-                const float allowance = 6;
-
-                while (caughtFruit.Any(f =>
-                    f.LifetimeEnd == double.MaxValue &&
-                    Vector2Extensions.Distance(f.Position, fruit.Position) < (ourRadius + (theirRadius = f.DrawSize.X / 2 * f.Scale.X)) / (allowance / 2)))
-                {
-                    float diff = (ourRadius + theirRadius) / allowance;
-                    fruit.X += (RNG.NextSingle() - 0.5f) * 2 * diff;
-                    fruit.Y -= RNG.NextSingle() * diff;
-                }
-
-                fruit.X = Math.Clamp(fruit.X, -CATCHER_SIZE / 2, CATCHER_SIZE / 2);
-
-                caughtFruit.Add(fruit);
-
-                Add(new HitExplosion(fruit)
-                {
-                    X = fruit.X,
-                    Scale = new Vector2(fruit.HitObject.Scale)
-                });
-            }
-
-            /// <summary>
-            /// Let the catcher attempt to catch a fruit.
-            /// </summary>
-            /// <param name="fruit">The fruit to catch.</param>
-            /// <returns>Whether the catch is possible.</returns>
-            public bool AttemptCatch(CatchHitObject fruit)
-            {
-                float halfCatchWidth = CatchWidth * 0.5f;
-
-                // this stuff wil disappear once we move fruit to non-relative coordinate space in the future.
-                var catchObjectPosition = fruit.X * CatchPlayfield.BASE_WIDTH;
-                var catcherPosition = Position.X * CatchPlayfield.BASE_WIDTH;
-
-                var validCatch =
-                    catchObjectPosition >= catcherPosition - halfCatchWidth &&
-                    catchObjectPosition <= catcherPosition + halfCatchWidth;
-
-                // only update hyperdash state if we are catching a fruit.
-                // exceptions are Droplets and JuiceStreams.
-                if (!(fruit is Fruit)) return validCatch;
-
-                if (validCatch && fruit.HyperDash)
-                {
-                    var target = fruit.HyperDashTarget;
-                    double timeDifference = target.StartTime - fruit.StartTime;
-                    double positionDifference = target.X * CatchPlayfield.BASE_WIDTH - catcherPosition;
-                    double velocity = positionDifference / Math.Max(1.0, timeDifference - 1000.0 / 60.0);
-
-                    SetHyperDashState(Math.Abs(velocity), target.X);
-                }
-                else
-                {
-                    SetHyperDashState();
-                }
-
-                if (validCatch)
-                    updateState(fruit.Kiai ? CatcherAnimationState.Kiai : CatcherAnimationState.Idle);
-                else if (!(fruit is Banana))
-                    updateState(CatcherAnimationState.Fail);
-
-                return validCatch;
-            }
-
-            private void updateState(CatcherAnimationState state)
-            {
-                if (CurrentState == state)
-                    return;
-
-                CurrentState = state;
-                updateCatcher();
-            }
-
-            public CatcherAnimationState CurrentState { get; private set; }
-
-            private double hyperDashModifier = 1;
-            private int hyperDashDirection;
-            private float hyperDashTargetPosition;
-
-            /// <summary>
-            /// Whether we are hyper-dashing or not.
-            /// </summary>
-            public bool HyperDashing => hyperDashModifier != 1;
-
-            /// <summary>
-            /// Set hyper-dash state.
-            /// </summary>
-            /// <param name="modifier">The speed multiplier. If this is less or equals to 1, this catcher will be non-hyper-dashing state.</param>
-            /// <param name="targetPosition">When this catcher crosses this position, this catcher ends hyper-dashing.</param>
-            public void SetHyperDashState(double modifier = 1, float targetPosition = -1)
-            {
-                const float hyper_dash_transition_length = 180;
-
-                bool wasHyperDashing = HyperDashing;
-
-                if (modifier <= 1 || X == targetPosition)
-                {
-                    hyperDashModifier = 1;
-                    hyperDashDirection = 0;
-
-                    if (wasHyperDashing)
-                    {
-                        this.FadeColour(Color4.White, hyper_dash_transition_length, Easing.OutQuint);
-                        this.FadeTo(1, hyper_dash_transition_length, Easing.OutQuint);
-                        Trail &= Dashing;
-                    }
-                }
-                else
-                {
-                    hyperDashModifier = modifier;
-                    hyperDashDirection = Math.Sign(targetPosition - X);
-                    hyperDashTargetPosition = targetPosition;
-
-                    if (!wasHyperDashing)
-                    {
-                        this.FadeColour(Color4.OrangeRed, hyper_dash_transition_length, Easing.OutQuint);
-                        this.FadeTo(0.2f, hyper_dash_transition_length, Easing.OutQuint);
-                        Trail = true;
-
-                        var hyperDashEndGlow = createAdditiveSprite(true);
-
-                        hyperDashEndGlow.MoveToOffset(new Vector2(0, -20), 1200, Easing.In);
-                        hyperDashEndGlow.ScaleTo(hyperDashEndGlow.Scale * 0.9f).ScaleTo(hyperDashEndGlow.Scale * 1.2f, 1200, Easing.In);
-                        hyperDashEndGlow.FadeOut(1200);
-                        hyperDashEndGlow.Expire(true);
-                    }
-                }
-            }
-
-            public bool OnPressed(CatchAction action)
-            {
-                switch (action)
-                {
-                    case CatchAction.MoveLeft:
-                        currentDirection--;
-                        return true;
-
-                    case CatchAction.MoveRight:
-                        currentDirection++;
-                        return true;
-
-                    case CatchAction.Dash:
-                        Dashing = true;
-                        return true;
-                }
-
-                return false;
-            }
-
-            public void OnReleased(CatchAction action)
-            {
-                switch (action)
-                {
-                    case CatchAction.MoveLeft:
-                        currentDirection++;
-                        break;
-
-                    case CatchAction.MoveRight:
-                        currentDirection--;
-                        break;
-
-                    case CatchAction.Dash:
-                        Dashing = false;
-                        break;
-                }
-            }
-
-            /// <summary>
-            /// The relative space to cover in 1 millisecond. based on 1 game pixel per millisecond as in osu-stable.
-            /// </summary>
-            public const double BASE_SPEED = 1.0 / 512;
-
-            protected override void Update()
-            {
-                base.Update();
-
-                if (currentDirection == 0) return;
-
-                var direction = Math.Sign(currentDirection);
-
-                double dashModifier = Dashing ? 1 : 0.5;
-                double speed = BASE_SPEED * dashModifier * hyperDashModifier;
-
-                UpdatePosition((float)(X + direction * Clock.ElapsedFrameTime * speed));
-
-                // Correct overshooting.
-                if ((hyperDashDirection > 0 && hyperDashTargetPosition < X) ||
-                    (hyperDashDirection < 0 && hyperDashTargetPosition > X))
-                {
-                    X = hyperDashTargetPosition;
-                    SetHyperDashState();
-                }
-            }
-
-            public void UpdatePosition(float position)
-            {
-                position = Math.Clamp(position, 0, 1);
-
-                if (position == X)
-                    return;
-
-                Scale = new Vector2(Math.Abs(Scale.X) * (position > X ? 1 : -1), Scale.Y);
-                X = position;
-            }
-
-            /// <summary>
-            /// Drop any fruit off the plate.
-            /// </summary>
-            public void Drop()
-            {
-                foreach (var f in caughtFruit.ToArray())
-                    Drop(f);
-            }
-
-            /// <summary>
-            /// Explode any fruit off the plate.
-            /// </summary>
-            public void Explode()
-            {
-                foreach (var f in caughtFruit.ToArray())
-                    Explode(f);
-            }
-
-            public void Drop(DrawableHitObject fruit) => removeFromPlateWithTransform(fruit, f =>
-            {
-                f.MoveToY(f.Y + 75, 750, Easing.InSine);
-                f.FadeOut(750);
-            });
-
-            public void Explode(DrawableHitObject fruit)
-            {
-                var originalX = fruit.X * Scale.X;
-
-                removeFromPlateWithTransform(fruit, f =>
-                {
-                    f.MoveToY(f.Y - 50, 250, Easing.OutSine).Then().MoveToY(f.Y + 50, 500, Easing.InSine);
-                    f.MoveToX(f.X + originalX * 6, 1000);
-                    f.FadeOut(750);
-                });
-            }
-
-            private void removeFromPlateWithTransform(DrawableHitObject fruit, Action<DrawableHitObject> action)
-            {
-                if (ExplodingFruitTarget != null)
-                {
-                    fruit.Anchor = Anchor.TopLeft;
-                    fruit.Position = caughtFruit.ToSpaceOfOtherDrawable(fruit.DrawPosition, ExplodingFruitTarget);
-
-                    if (!caughtFruit.Remove(fruit))
-                        // we may have already been removed by a previous operation (due to the weird OnLoadComplete scheduling).
-                        // this avoids a crash on potentially attempting to Add a fruit to ExplodingFruitTarget twice.
-                        return;
-
-                    ExplodingFruitTarget.Add(fruit);
-                }
-
-                double actionTime = Clock.CurrentTime;
-
-                fruit.ApplyCustomUpdateState += onFruitOnApplyCustomUpdateState;
-                onFruitOnApplyCustomUpdateState(fruit, fruit.State.Value);
-
-                void onFruitOnApplyCustomUpdateState(DrawableHitObject o, ArmedState state)
-                {
-                    using (fruit.BeginAbsoluteSequence(actionTime))
-                        action(fruit);
-
-                    fruit.Expire();
-                }
-            }
-        }
-    }
-
-    public class HitExplosion : CompositeDrawable
-    {
-        private readonly CircularContainer largeFaint;
-
-        public HitExplosion(DrawableCatchHitObject fruit)
-        {
-            Size = new Vector2(20);
-            Anchor = Anchor.TopCentre;
-            Origin = Anchor.BottomCentre;
-
-            Color4 objectColour = fruit.AccentColour.Value;
-
-            // scale roughly in-line with visual appearance of notes
-
-            const float angle_variangle = 15; // should be less than 45
-
-            const float roundness = 100;
-
-            const float initial_height = 10;
-
-            var colour = Interpolation.ValueAt(0.4f, objectColour, Color4.White, 0, 1);
-
-            InternalChildren = new Drawable[]
-            {
-                largeFaint = new CircularContainer
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    // we want our size to be very small so the glow dominates it.
-                    Size = new Vector2(0.8f),
-                    Blending = BlendingParameters.Additive,
-                    EdgeEffect = new EdgeEffectParameters
-                    {
-                        Type = EdgeEffectType.Glow,
-                        Colour = Interpolation.ValueAt(0.1f, objectColour, Color4.White, 0, 1).Opacity(0.3f),
-                        Roundness = 160,
-                        Radius = 200,
-                    },
-                },
-                new CircularContainer
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    Blending = BlendingParameters.Additive,
-                    EdgeEffect = new EdgeEffectParameters
-                    {
-                        Type = EdgeEffectType.Glow,
-                        Colour = Interpolation.ValueAt(0.6f, objectColour, Color4.White, 0, 1),
-                        Roundness = 20,
-                        Radius = 50,
-                    },
-                },
-                new CircularContainer
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    Size = new Vector2(0.01f, initial_height),
-                    Blending = BlendingParameters.Additive,
-                    Rotation = RNG.NextSingle(-angle_variangle, angle_variangle),
-                    EdgeEffect = new EdgeEffectParameters
-                    {
-                        Type = EdgeEffectType.Glow,
-                        Colour = colour,
-                        Roundness = roundness,
-                        Radius = 40,
-                    },
-                },
-                new CircularContainer
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    Size = new Vector2(0.01f, initial_height),
-                    Blending = BlendingParameters.Additive,
-                    Rotation = RNG.NextSingle(-angle_variangle, angle_variangle),
-                    EdgeEffect = new EdgeEffectParameters
-                    {
-                        Type = EdgeEffectType.Glow,
-                        Colour = colour,
-                        Roundness = roundness,
-                        Radius = 40,
-                    },
-                }
-            };
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            const double duration = 400;
-
-            largeFaint
-                .ResizeTo(largeFaint.Size * new Vector2(5, 1), duration, Easing.OutQuint)
-                .FadeOut(duration * 2);
-
-            this.FadeInFromZero(50).Then().FadeOut(duration, Easing.Out);
-            Expire(true);
-        }
+        protected internal readonly Catcher MovableCatcher;
     }
 }
diff --git a/osu.Game.Rulesets.Catch/UI/HitExplosion.cs b/osu.Game.Rulesets.Catch/UI/HitExplosion.cs
new file mode 100644
index 0000000000..04a86f83be
--- /dev/null
+++ b/osu.Game.Rulesets.Catch/UI/HitExplosion.cs
@@ -0,0 +1,122 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Effects;
+using osu.Framework.Utils;
+using osu.Game.Rulesets.Catch.Objects.Drawables;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Catch.UI
+{
+    public class HitExplosion : CompositeDrawable
+    {
+        private readonly CircularContainer largeFaint;
+
+        public HitExplosion(DrawableCatchHitObject fruit)
+        {
+            Size = new Vector2(20);
+            Anchor = Anchor.TopCentre;
+            Origin = Anchor.BottomCentre;
+
+            Color4 objectColour = fruit.AccentColour.Value;
+
+            // scale roughly in-line with visual appearance of notes
+
+            const float angle_variangle = 15; // should be less than 45
+
+            const float roundness = 100;
+
+            const float initial_height = 10;
+
+            var colour = Interpolation.ValueAt(0.4f, objectColour, Color4.White, 0, 1);
+
+            InternalChildren = new Drawable[]
+            {
+                largeFaint = new CircularContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    // we want our size to be very small so the glow dominates it.
+                    Size = new Vector2(0.8f),
+                    Blending = BlendingParameters.Additive,
+                    EdgeEffect = new EdgeEffectParameters
+                    {
+                        Type = EdgeEffectType.Glow,
+                        Colour = Interpolation.ValueAt(0.1f, objectColour, Color4.White, 0, 1).Opacity(0.3f),
+                        Roundness = 160,
+                        Radius = 200,
+                    },
+                },
+                new CircularContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    Blending = BlendingParameters.Additive,
+                    EdgeEffect = new EdgeEffectParameters
+                    {
+                        Type = EdgeEffectType.Glow,
+                        Colour = Interpolation.ValueAt(0.6f, objectColour, Color4.White, 0, 1),
+                        Roundness = 20,
+                        Radius = 50,
+                    },
+                },
+                new CircularContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    Size = new Vector2(0.01f, initial_height),
+                    Blending = BlendingParameters.Additive,
+                    Rotation = RNG.NextSingle(-angle_variangle, angle_variangle),
+                    EdgeEffect = new EdgeEffectParameters
+                    {
+                        Type = EdgeEffectType.Glow,
+                        Colour = colour,
+                        Roundness = roundness,
+                        Radius = 40,
+                    },
+                },
+                new CircularContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    Size = new Vector2(0.01f, initial_height),
+                    Blending = BlendingParameters.Additive,
+                    Rotation = RNG.NextSingle(-angle_variangle, angle_variangle),
+                    EdgeEffect = new EdgeEffectParameters
+                    {
+                        Type = EdgeEffectType.Glow,
+                        Colour = colour,
+                        Roundness = roundness,
+                        Radius = 40,
+                    },
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            const double duration = 400;
+
+            largeFaint
+                .ResizeTo(largeFaint.Size * new Vector2(5, 1), duration, Easing.OutQuint)
+                .FadeOut(duration * 2);
+
+            this.FadeInFromZero(50).Then().FadeOut(duration, Easing.Out);
+            Expire(true);
+        }
+    }
+}

From 4a774d02e0cf639c8a20b98eaea80f3cd26be71e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 8 Mar 2020 14:43:27 +0900
Subject: [PATCH 1068/1142] Remove exo font loading

---
 osu.Game/OsuGameBase.cs | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index b2277e2abf..93a845a6ae 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -138,30 +138,17 @@ namespace osu.Game
             dependencies.Cache(LocalConfig);
 
             AddFont(Resources, @"Fonts/osuFont");
-            AddFont(Resources, @"Fonts/Exo2.0-Medium");
-            AddFont(Resources, @"Fonts/Exo2.0-MediumItalic");
-
-            AddFont(Resources, @"Fonts/Noto-Basic");
-            AddFont(Resources, @"Fonts/Noto-Hangul");
-            AddFont(Resources, @"Fonts/Noto-CJK-Basic");
-            AddFont(Resources, @"Fonts/Noto-CJK-Compatibility");
-
-            AddFont(Resources, @"Fonts/Exo2.0-Regular");
-            AddFont(Resources, @"Fonts/Exo2.0-RegularItalic");
-            AddFont(Resources, @"Fonts/Exo2.0-SemiBold");
-            AddFont(Resources, @"Fonts/Exo2.0-SemiBoldItalic");
-            AddFont(Resources, @"Fonts/Exo2.0-Bold");
-            AddFont(Resources, @"Fonts/Exo2.0-BoldItalic");
-            AddFont(Resources, @"Fonts/Exo2.0-Light");
-            AddFont(Resources, @"Fonts/Exo2.0-LightItalic");
-            AddFont(Resources, @"Fonts/Exo2.0-Black");
-            AddFont(Resources, @"Fonts/Exo2.0-BlackItalic");
 
             AddFont(Resources, @"Fonts/Torus-SemiBold");
             AddFont(Resources, @"Fonts/Torus-Bold");
             AddFont(Resources, @"Fonts/Torus-Regular");
             AddFont(Resources, @"Fonts/Torus-Light");
 
+            AddFont(Resources, @"Fonts/Noto-Basic");
+            AddFont(Resources, @"Fonts/Noto-Hangul");
+            AddFont(Resources, @"Fonts/Noto-CJK-Basic");
+            AddFont(Resources, @"Fonts/Noto-CJK-Compatibility");
+
             AddFont(Resources, @"Fonts/Venera-Light");
             AddFont(Resources, @"Fonts/Venera-Bold");
             AddFont(Resources, @"Fonts/Venera-Black");

From ae112cf14f2f419e73ae9c4e75d9d542e72b1312 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Mar 2020 13:31:59 +0900
Subject: [PATCH 1069/1142] Reorder torus loading to provide regular as default

---
 osu.Game/OsuGameBase.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 93a845a6ae..3c7ab27651 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -139,10 +139,10 @@ namespace osu.Game
 
             AddFont(Resources, @"Fonts/osuFont");
 
-            AddFont(Resources, @"Fonts/Torus-SemiBold");
-            AddFont(Resources, @"Fonts/Torus-Bold");
             AddFont(Resources, @"Fonts/Torus-Regular");
             AddFont(Resources, @"Fonts/Torus-Light");
+            AddFont(Resources, @"Fonts/Torus-SemiBold");
+            AddFont(Resources, @"Fonts/Torus-Bold");
 
             AddFont(Resources, @"Fonts/Noto-Basic");
             AddFont(Resources, @"Fonts/Noto-Hangul");

From 288470c3138713756b4f24fa1ef1e8f4ab63c20c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Mar 2020 13:32:16 +0900
Subject: [PATCH 1070/1142] Remove exo specification completely

---
 osu.Game/Graphics/OsuFont.cs                                | 6 +-----
 osu.Game/Graphics/UserInterface/OsuTabControl.cs            | 2 +-
 osu.Game/Graphics/UserInterface/PageTabControl.cs           | 2 +-
 osu.Game/Overlays/AccountCreation/ScreenEntry.cs            | 2 +-
 osu.Game/Overlays/News/NewsArticleCover.cs                  | 6 +++---
 osu.Game/Screens/Menu/Disclaimer.cs                         | 6 +++---
 osu.Game/Screens/Multi/Lounge/Components/ParticipantInfo.cs | 2 +-
 osu.Game/Screens/Multi/Ranking/Pages/RoomLeaderboardPage.cs | 2 +-
 8 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Graphics/OsuFont.cs b/osu.Game/Graphics/OsuFont.cs
index 841936d2c5..1b5a3199a2 100644
--- a/osu.Game/Graphics/OsuFont.cs
+++ b/osu.Game/Graphics/OsuFont.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Graphics
         /// <param name="italics">Whether the font is italic.</param>
         /// <param name="fixedWidth">Whether all characters should be spaced the same distance apart.</param>
         /// <returns>The <see cref="FontUsage"/>.</returns>
-        public static FontUsage GetFont(Typeface typeface = Typeface.Exo, float size = DEFAULT_FONT_SIZE, FontWeight weight = FontWeight.Medium, bool italics = false, bool fixedWidth = false)
+        public static FontUsage GetFont(Typeface typeface = Typeface.Torus, float size = DEFAULT_FONT_SIZE, FontWeight weight = FontWeight.Medium, bool italics = false, bool fixedWidth = false)
             => new FontUsage(GetFamilyString(typeface), size, GetWeightString(typeface, weight), italics, fixedWidth);
 
         /// <summary>
@@ -42,9 +42,6 @@ namespace osu.Game.Graphics
         {
             switch (typeface)
             {
-                case Typeface.Exo:
-                    return "Exo2.0";
-
                 case Typeface.Venera:
                     return "Venera";
 
@@ -96,7 +93,6 @@ namespace osu.Game.Graphics
 
     public enum Typeface
     {
-        Exo,
         Venera,
         Torus
     }
diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index 6c883d9893..ca9f1330f9 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -173,7 +173,7 @@ namespace osu.Game.Graphics.UserInterface
                     new HoverClickSounds()
                 };
 
-                Active.BindValueChanged(active => Text.Font = Text.Font.With(Typeface.Exo, weight: active.NewValue ? FontWeight.Bold : FontWeight.Medium), true);
+                Active.BindValueChanged(active => Text.Font = Text.Font.With(Typeface.Torus, weight: active.NewValue ? FontWeight.Bold : FontWeight.Medium), true);
             }
 
             protected override void OnActivated() => fadeActive();
diff --git a/osu.Game/Graphics/UserInterface/PageTabControl.cs b/osu.Game/Graphics/UserInterface/PageTabControl.cs
index ddcb626701..d05a08108a 100644
--- a/osu.Game/Graphics/UserInterface/PageTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/PageTabControl.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Graphics.UserInterface
                     new HoverClickSounds()
                 };
 
-                Active.BindValueChanged(active => Text.Font = Text.Font.With(Typeface.Exo, weight: active.NewValue ? FontWeight.Bold : FontWeight.Medium), true);
+                Active.BindValueChanged(active => Text.Font = Text.Font.With(Typeface.Torus, weight: active.NewValue ? FontWeight.Bold : FontWeight.Medium), true);
             }
 
             protected virtual string CreateText() => (Value as Enum)?.GetDescription() ?? Value.ToString();
diff --git a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
index 2576900db8..a0b1b27ebf 100644
--- a/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
+++ b/osu.Game/Overlays/AccountCreation/ScreenEntry.cs
@@ -132,7 +132,7 @@ namespace osu.Game.Overlays.AccountCreation
             usernameDescription.AddText("This will be your public presence. No profanity, no impersonation. Avoid exposing your own personal details, too!");
 
             emailAddressDescription.AddText("Will be used for notifications, account verification and in the case you forget your password. No spam, ever.");
-            emailAddressDescription.AddText(" Make sure to get it right!", cp => cp.Font = cp.Font.With(Typeface.Exo, weight: FontWeight.Bold));
+            emailAddressDescription.AddText(" Make sure to get it right!", cp => cp.Font = cp.Font.With(Typeface.Torus, weight: FontWeight.Bold));
 
             passwordDescription.AddText("At least ");
             characterCheckText = passwordDescription.AddText("8 characters long");
diff --git a/osu.Game/Overlays/News/NewsArticleCover.cs b/osu.Game/Overlays/News/NewsArticleCover.cs
index f61b30b381..e381b629e4 100644
--- a/osu.Game/Overlays/News/NewsArticleCover.cs
+++ b/osu.Game/Overlays/News/NewsArticleCover.cs
@@ -75,7 +75,7 @@ namespace osu.Game.Overlays.News
                         Left = 25,
                         Bottom = 50,
                     },
-                    Font = OsuFont.GetFont(Typeface.Exo, 24, FontWeight.Bold),
+                    Font = OsuFont.GetFont(Typeface.Torus, 24, FontWeight.Bold),
                     Text = info.Title,
                 },
                 new OsuSpriteText
@@ -87,7 +87,7 @@ namespace osu.Game.Overlays.News
                         Left = 25,
                         Bottom = 30,
                     },
-                    Font = OsuFont.GetFont(Typeface.Exo, 16, FontWeight.Bold),
+                    Font = OsuFont.GetFont(Typeface.Torus, 16, FontWeight.Bold),
                     Text = "by " + info.Author
                 }
             };
@@ -148,7 +148,7 @@ namespace osu.Game.Overlays.News
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
-                        Font = OsuFont.GetFont(Typeface.Exo, 12, FontWeight.Black, false, false),
+                        Font = OsuFont.GetFont(Typeface.Torus, 12, FontWeight.Black, false, false),
                         Text = date.ToString("d MMM yyy").ToUpper(),
                         Margin = new MarginPadding
                         {
diff --git a/osu.Game/Screens/Menu/Disclaimer.cs b/osu.Game/Screens/Menu/Disclaimer.cs
index ee8200321b..35091028ae 100644
--- a/osu.Game/Screens/Menu/Disclaimer.cs
+++ b/osu.Game/Screens/Menu/Disclaimer.cs
@@ -90,14 +90,14 @@ namespace osu.Game.Screens.Menu
                 }
             };
 
-            textFlow.AddText("This project is an ongoing ", t => t.Font = t.Font.With(Typeface.Exo, 30, FontWeight.Light));
-            textFlow.AddText("work in progress", t => t.Font = t.Font.With(Typeface.Exo, 30, FontWeight.SemiBold));
+            textFlow.AddText("This project is an ongoing ", t => t.Font = t.Font.With(Typeface.Torus, 30, FontWeight.Light));
+            textFlow.AddText("work in progress", t => t.Font = t.Font.With(Typeface.Torus, 30, FontWeight.SemiBold));
 
             textFlow.NewParagraph();
 
             static void format(SpriteText t) => t.Font = OsuFont.GetFont(size: 15, weight: FontWeight.SemiBold);
 
-            textFlow.AddParagraph(getRandomTip(), t => t.Font = t.Font.With(Typeface.Exo, 20, FontWeight.SemiBold));
+            textFlow.AddParagraph(getRandomTip(), t => t.Font = t.Font.With(Typeface.Torus, 20, FontWeight.SemiBold));
             textFlow.NewParagraph();
 
             textFlow.NewParagraph();
diff --git a/osu.Game/Screens/Multi/Lounge/Components/ParticipantInfo.cs b/osu.Game/Screens/Multi/Lounge/Components/ParticipantInfo.cs
index a55db096af..4152a9a3b2 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/ParticipantInfo.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/ParticipantInfo.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                 if (host.NewValue != null)
                 {
                     hostText.AddText("hosted by ");
-                    hostText.AddUserLink(host.NewValue, s => s.Font = s.Font.With(Typeface.Exo, weight: FontWeight.Bold, italics: true));
+                    hostText.AddUserLink(host.NewValue, s => s.Font = s.Font.With(Typeface.Torus, weight: FontWeight.Bold, italics: true));
 
                     flagContainer.Child = new UpdateableFlag(host.NewValue.Country) { RelativeSizeAxes = Axes.Both };
                 }
diff --git a/osu.Game/Screens/Multi/Ranking/Pages/RoomLeaderboardPage.cs b/osu.Game/Screens/Multi/Ranking/Pages/RoomLeaderboardPage.cs
index f8fb192b5c..0d31805774 100644
--- a/osu.Game/Screens/Multi/Ranking/Pages/RoomLeaderboardPage.cs
+++ b/osu.Game/Screens/Multi/Ranking/Pages/RoomLeaderboardPage.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Screens.Multi.Ranking.Pages
 
             rankText.AddText($"#{index + 1} ", s =>
             {
-                s.Font = s.Font.With(Typeface.Exo, weight: FontWeight.Bold);
+                s.Font = s.Font.With(Typeface.Torus, weight: FontWeight.Bold);
                 s.Colour = colours.YellowDark;
             });
 

From c45f9cafd4384b3903952dfe74f6ca8b59dda587 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Mar 2020 13:33:55 +0900
Subject: [PATCH 1071/1142] Add medium -> regular fallback for torus

---
 osu.Game/Graphics/OsuFont.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/OsuFont.cs b/osu.Game/Graphics/OsuFont.cs
index 1b5a3199a2..076cc241ed 100644
--- a/osu.Game/Graphics/OsuFont.cs
+++ b/osu.Game/Graphics/OsuFont.cs
@@ -59,7 +59,13 @@ namespace osu.Game.Graphics
         /// <param name="weight">The <see cref="FontWeight"/>.</param>
         /// <returns>The string representation of <paramref name="weight"/> in the specified <paramref name="typeface"/>.</returns>
         public static string GetWeightString(Typeface typeface, FontWeight weight)
-            => GetWeightString(GetFamilyString(typeface), weight);
+        {
+            if (typeface == Typeface.Torus && weight == FontWeight.Medium)
+                // torus doesn't have a medium; fallback to regular.
+                weight = FontWeight.Regular;
+
+            return GetWeightString(GetFamilyString(typeface), weight);
+        }
 
         /// <summary>
         /// Retrieves the string representation of a <see cref="FontWeight"/>.

From f7c036726a72271a8418acd0919dbbe932d2a086 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 13 Mar 2020 13:52:40 +0900
Subject: [PATCH 1072/1142] Add beatmap loading timeout

---
 osu.Game/Beatmaps/IWorkingBeatmap.cs |  4 +-
 osu.Game/Beatmaps/WorkingBeatmap.cs  | 98 ++++++++++++++++------------
 2 files changed, 61 insertions(+), 41 deletions(-)

diff --git a/osu.Game/Beatmaps/IWorkingBeatmap.cs b/osu.Game/Beatmaps/IWorkingBeatmap.cs
index 5f1f0d1e40..61bd962648 100644
--- a/osu.Game/Beatmaps/IWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/IWorkingBeatmap.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
@@ -60,8 +61,9 @@ namespace osu.Game.Beatmaps
         /// </summary>
         /// <param name="ruleset">The <see cref="RulesetInfo"/> to create a playable <see cref="IBeatmap"/> for.</param>
         /// <param name="mods">The <see cref="Mod"/>s to apply to the <see cref="IBeatmap"/>.</param>
+        /// <param name="timeout">The loading timeout.</param>
         /// <returns>The converted <see cref="IBeatmap"/>.</returns>
         /// <exception cref="BeatmapInvalidForRulesetException">If <see cref="Beatmap"/> could not be converted to <paramref name="ruleset"/>.</exception>
-        IBeatmap GetPlayableBeatmap(RulesetInfo ruleset, IReadOnlyList<Mod> mods = null);
+        IBeatmap GetPlayableBeatmap(RulesetInfo ruleset, IReadOnlyList<Mod> mods = null, TimeSpan? timeout = null);
     }
 }
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 1e1ffad81e..bdcfc058b4 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -83,55 +83,73 @@ namespace osu.Game.Beatmaps
         /// <returns>The applicable <see cref="IBeatmapConverter"/>.</returns>
         protected virtual IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap, Ruleset ruleset) => ruleset.CreateBeatmapConverter(beatmap);
 
-        public IBeatmap GetPlayableBeatmap(RulesetInfo ruleset, IReadOnlyList<Mod> mods = null)
+        public IBeatmap GetPlayableBeatmap(RulesetInfo ruleset, IReadOnlyList<Mod> mods = null, TimeSpan? timeout = null)
         {
-            mods ??= Array.Empty<Mod>();
-
-            var rulesetInstance = ruleset.CreateInstance();
-
-            IBeatmapConverter converter = CreateBeatmapConverter(Beatmap, rulesetInstance);
-
-            // Check if the beatmap can be converted
-            if (Beatmap.HitObjects.Count > 0 && !converter.CanConvert())
-                throw new BeatmapInvalidForRulesetException($"{nameof(Beatmaps.Beatmap)} can not be converted for the ruleset (ruleset: {ruleset.InstantiationInfo}, converter: {converter}).");
-
-            // Apply conversion mods
-            foreach (var mod in mods.OfType<IApplicableToBeatmapConverter>())
-                mod.ApplyToBeatmapConverter(converter);
-
-            // Convert
-            IBeatmap converted = converter.Convert();
-
-            // Apply difficulty mods
-            if (mods.Any(m => m is IApplicableToDifficulty))
+            using (var cancellationSource = new CancellationTokenSource(timeout ?? TimeSpan.FromSeconds(10)))
             {
-                converted.BeatmapInfo = converted.BeatmapInfo.Clone();
-                converted.BeatmapInfo.BaseDifficulty = converted.BeatmapInfo.BaseDifficulty.Clone();
+                mods ??= Array.Empty<Mod>();
 
-                foreach (var mod in mods.OfType<IApplicableToDifficulty>())
-                    mod.ApplyToDifficulty(converted.BeatmapInfo.BaseDifficulty);
-            }
+                var rulesetInstance = ruleset.CreateInstance();
 
-            IBeatmapProcessor processor = rulesetInstance.CreateBeatmapProcessor(converted);
+                IBeatmapConverter converter = CreateBeatmapConverter(Beatmap, rulesetInstance);
 
-            processor?.PreProcess();
+                // Check if the beatmap can be converted
+                if (Beatmap.HitObjects.Count > 0 && !converter.CanConvert())
+                    throw new BeatmapInvalidForRulesetException($"{nameof(Beatmaps.Beatmap)} can not be converted for the ruleset (ruleset: {ruleset.InstantiationInfo}, converter: {converter}).");
 
-            // Compute default values for hitobjects, including creating nested hitobjects in-case they're needed
-            foreach (var obj in converted.HitObjects)
-                obj.ApplyDefaults(converted.ControlPointInfo, converted.BeatmapInfo.BaseDifficulty);
+                // Apply conversion mods
+                foreach (var mod in mods.OfType<IApplicableToBeatmapConverter>())
+                {
+                    cancellationSource.Token.ThrowIfCancellationRequested();
+                    mod.ApplyToBeatmapConverter(converter);
+                }
 
-            foreach (var mod in mods.OfType<IApplicableToHitObject>())
-            {
+                // Convert
+                IBeatmap converted = converter.Convert();
+
+                // Apply difficulty mods
+                if (mods.Any(m => m is IApplicableToDifficulty))
+                {
+                    converted.BeatmapInfo = converted.BeatmapInfo.Clone();
+                    converted.BeatmapInfo.BaseDifficulty = converted.BeatmapInfo.BaseDifficulty.Clone();
+
+                    foreach (var mod in mods.OfType<IApplicableToDifficulty>())
+                    {
+                        cancellationSource.Token.ThrowIfCancellationRequested();
+                        mod.ApplyToDifficulty(converted.BeatmapInfo.BaseDifficulty);
+                    }
+                }
+
+                IBeatmapProcessor processor = rulesetInstance.CreateBeatmapProcessor(converted);
+
+                processor?.PreProcess();
+
+                // Compute default values for hitobjects, including creating nested hitobjects in-case they're needed
                 foreach (var obj in converted.HitObjects)
-                    mod.ApplyToHitObject(obj);
+                {
+                    cancellationSource.Token.ThrowIfCancellationRequested();
+                    obj.ApplyDefaults(converted.ControlPointInfo, converted.BeatmapInfo.BaseDifficulty);
+                }
+
+                foreach (var mod in mods.OfType<IApplicableToHitObject>())
+                {
+                    foreach (var obj in converted.HitObjects)
+                    {
+                        cancellationSource.Token.ThrowIfCancellationRequested();
+                        mod.ApplyToHitObject(obj);
+                    }
+                }
+
+                processor?.PostProcess();
+
+                foreach (var mod in mods.OfType<IApplicableToBeatmap>())
+                {
+                    cancellationSource.Token.ThrowIfCancellationRequested();
+                    mod.ApplyToBeatmap(converted);
+                }
+
+                return converted;
             }
-
-            processor?.PostProcess();
-
-            foreach (var mod in mods.OfType<IApplicableToBeatmap>())
-                mod.ApplyToBeatmap(converted);
-
-            return converted;
         }
 
         private CancellationTokenSource loadCancellation = new CancellationTokenSource();

From c33ca6e99c60e1fd4bbc1d321a229a55f3e99de5 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 13 Mar 2020 14:28:11 +0900
Subject: [PATCH 1073/1142] Decorate usages with exception management

---
 osu.Game/Screens/Edit/Editor.cs             | 14 +++++++++-
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 30 +++++++++++++--------
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 3a6f02f811..cf13f8a3a1 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -23,6 +23,7 @@ using osuTK.Input;
 using System.Collections.Generic;
 using osu.Framework;
 using osu.Framework.Input.Bindings;
+using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Input.Bindings;
@@ -86,7 +87,18 @@ namespace osu.Game.Screens.Edit
             // todo: remove caching of this and consume via editorBeatmap?
             dependencies.Cache(beatDivisor);
 
-            playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Beatmap.Value.BeatmapInfo.Ruleset);
+            try
+            {
+                playableBeatmap = Beatmap.Value.GetPlayableBeatmap(Beatmap.Value.BeatmapInfo.Ruleset);
+            }
+            catch (Exception e)
+            {
+                Logger.Error(e, "Could not load beatmap sucessfully!");
+                //couldn't load, hard abort!
+                this.Exit();
+                return;
+            }
+
             AddInternal(editorBeatmap = new EditorBeatmap(playableBeatmap));
 
             dependencies.CacheAs(editorBeatmap);
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index f84aac3081..59d2aca17d 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -23,6 +23,7 @@ using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
+using osu.Framework.Logging;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
@@ -311,20 +312,27 @@ namespace osu.Game.Screens.Select
                         Content = getBPMRange(b),
                     }));
 
-                    IBeatmap playableBeatmap;
-
                     try
                     {
-                        // Try to get the beatmap with the user's ruleset
-                        playableBeatmap = beatmap.GetPlayableBeatmap(ruleset, Array.Empty<Mod>());
-                    }
-                    catch (BeatmapInvalidForRulesetException)
-                    {
-                        // Can't be converted to the user's ruleset, so use the beatmap's own ruleset
-                        playableBeatmap = beatmap.GetPlayableBeatmap(beatmap.BeatmapInfo.Ruleset, Array.Empty<Mod>());
-                    }
+                        IBeatmap playableBeatmap;
 
-                    labels.AddRange(playableBeatmap.GetStatistics().Select(s => new InfoLabel(s)));
+                        try
+                        {
+                            // Try to get the beatmap with the user's ruleset
+                            playableBeatmap = beatmap.GetPlayableBeatmap(ruleset, Array.Empty<Mod>());
+                        }
+                        catch (BeatmapInvalidForRulesetException)
+                        {
+                            // Can't be converted to the user's ruleset, so use the beatmap's own ruleset
+                            playableBeatmap = beatmap.GetPlayableBeatmap(beatmap.BeatmapInfo.Ruleset, Array.Empty<Mod>());
+                        }
+
+                        labels.AddRange(playableBeatmap.GetStatistics().Select(s => new InfoLabel(s)));
+                    }
+                    catch (Exception e)
+                    {
+                        Logger.Error(e, "Could not load beatmap sucessfully!");
+                    }
                 }
 
                 return labels.ToArray();

From edd444ea73fdc0df668b2e2c11f8fa15da1ac438 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Mar 2020 14:36:46 +0900
Subject: [PATCH 1074/1142] Fix mod sprite bleeding border colour

---
 .../Components/TournamentBeatmapPanel.cs           | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index 4116ffbec6..dc4c4b9ec6 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -125,13 +125,21 @@ namespace osu.Game.Tournament.Components
 
             if (!string.IsNullOrEmpty(mods))
             {
-                AddInternal(new Sprite
+                AddInternal(new Container
                 {
-                    Texture = textures.Get($"mods/{mods}"),
+                    RelativeSizeAxes = Axes.Y,
+                    Width = 60,
                     Anchor = Anchor.CentreRight,
                     Origin = Anchor.CentreRight,
                     Margin = new MarginPadding(10),
-                    Scale = new Vector2(0.8f)
+                    Child = new Sprite
+                    {
+                        FillMode = FillMode.Fit,
+                        RelativeSizeAxes = Axes.Both,
+                        Anchor = Anchor.CentreRight,
+                        Origin = Anchor.CentreRight,
+                        Texture = textures.Get($"mods/{mods}"),
+                    }
                 });
             }
         }

From b902e5039636ec42a975e3b355f8b1f5dddad871 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Mar 2020 15:44:13 +0900
Subject: [PATCH 1075/1142] Add resolution selector in tournament setup screen

---
 .../Components/ControlPanel.cs                |  6 ++--
 osu.Game.Tournament/Screens/SetupScreen.cs    | 29 ++++++++++++++++++-
 osu.Game.Tournament/TournamentGameBase.cs     |  2 +-
 osu.Game.Tournament/TournamentSceneManager.cs | 18 ++++++++----
 4 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tournament/Components/ControlPanel.cs b/osu.Game.Tournament/Components/ControlPanel.cs
index fa5c941f1a..ef8c8767e0 100644
--- a/osu.Game.Tournament/Components/ControlPanel.cs
+++ b/osu.Game.Tournament/Components/ControlPanel.cs
@@ -22,9 +22,9 @@ namespace osu.Game.Tournament.Components
 
         public ControlPanel()
         {
-            RelativeSizeAxes = Axes.Both;
+            RelativeSizeAxes = Axes.Y;
             AlwaysPresent = true;
-            Width = 0.15f;
+            Width = TournamentSceneManager.CONTROL_AREA_WIDTH;
             Anchor = Anchor.TopRight;
 
             InternalChildren = new Drawable[]
@@ -47,8 +47,8 @@ namespace osu.Game.Tournament.Components
                     Origin = Anchor.TopCentre,
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
-                    Width = 0.75f,
                     Position = new Vector2(0, 35f),
+                    Padding = new MarginPadding(5),
                     Direction = FillDirection.Vertical,
                     Spacing = new Vector2(0, 5f),
                 },
diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index 023582166c..b7f8b2bfd6 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -3,7 +3,10 @@
 
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
@@ -22,6 +25,7 @@ namespace osu.Game.Tournament.Screens
         private FillFlowContainer fillFlow;
 
         private LoginOverlay loginOverlay;
+        private ActionableInfo resolution;
 
         [Resolved]
         private MatchIPCInfo ipc { get; set; }
@@ -32,9 +36,13 @@ namespace osu.Game.Tournament.Screens
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
+        private Bindable<Size> windowSize;
+
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(FrameworkConfigManager frameworkConfig)
         {
+            windowSize = frameworkConfig.GetBindable<Size>(FrameworkSetting.WindowedSize);
+
             InternalChild = fillFlow = new FillFlowContainer
             {
                 RelativeSizeAxes = Axes.X,
@@ -48,6 +56,9 @@ namespace osu.Game.Tournament.Screens
             reload();
         }
 
+        [Resolved]
+        private Framework.Game game { get; set; }
+
         private void reload()
         {
             var fileBasedIpc = ipc as FileBasedIPC;
@@ -97,9 +108,25 @@ namespace osu.Game.Tournament.Screens
                     Items = rulesets.AvailableRulesets,
                     Current = LadderInfo.Ruleset,
                 },
+                resolution = new ActionableInfo
+                {
+                    Label = "Stream area resolution",
+                    ButtonText = "Set to 1080p",
+                    Action = () =>
+                    {
+                        windowSize.Value = new Size((int)(1920 / TournamentSceneManager.STREAM_AREA_WIDTH * TournamentSceneManager.REQUIRED_WIDTH), 1080);
+                    }
+                }
             };
         }
 
+        protected override void Update()
+        {
+            base.Update();
+
+            resolution.Value = $"{ScreenSpaceDrawQuad.Width:N0}x{ScreenSpaceDrawQuad.Height:N0}";
+        }
+
         public class LabelledDropdown<T> : LabelledComponent<OsuDropdown<T>, T>
         {
             public LabelledDropdown()
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 41822ae2c3..85db9e61fb 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Tournament
             windowSize = frameworkConfig.GetBindable<Size>(FrameworkSetting.WindowedSize);
             windowSize.BindValueChanged(size => ScheduleAfterChildren(() =>
             {
-                var minWidth = (int)(size.NewValue.Height / 9f * 16 + 400);
+                var minWidth = (int)(size.NewValue.Height / 768f * TournamentSceneManager.REQUIRED_WIDTH) - 1;
 
                 heightWarning.Alpha = size.NewValue.Width < minWidth ? 1 : 0;
             }), true);
diff --git a/osu.Game.Tournament/TournamentSceneManager.cs b/osu.Game.Tournament/TournamentSceneManager.cs
index ef8d16011d..23fcb01db7 100644
--- a/osu.Game.Tournament/TournamentSceneManager.cs
+++ b/osu.Game.Tournament/TournamentSceneManager.cs
@@ -33,6 +33,12 @@ namespace osu.Game.Tournament
         private Container screens;
         private TourneyVideo video;
 
+        public const float CONTROL_AREA_WIDTH = 160;
+
+        public const float STREAM_AREA_WIDTH = 1366;
+
+        public const double REQUIRED_WIDTH = TournamentSceneManager.CONTROL_AREA_WIDTH * 2 + TournamentSceneManager.STREAM_AREA_WIDTH;
+
         [Cached]
         private TournamentMatchChatDisplay chat = new TournamentMatchChatDisplay();
 
@@ -51,13 +57,13 @@ namespace osu.Game.Tournament
             {
                 new Container
                 {
-                    RelativeSizeAxes = Axes.Both,
-                    X = 200,
+                    RelativeSizeAxes = Axes.Y,
+                    X = CONTROL_AREA_WIDTH,
                     FillMode = FillMode.Fit,
                     FillAspectRatio = 16 / 9f,
                     Anchor = Anchor.TopLeft,
                     Origin = Anchor.TopLeft,
-                    Size = new Vector2(0.8f, 1),
+                    Width = STREAM_AREA_WIDTH,
                     //Masking = true,
                     Children = new Drawable[]
                     {
@@ -96,7 +102,7 @@ namespace osu.Game.Tournament
                 new Container
                 {
                     RelativeSizeAxes = Axes.Y,
-                    Width = 200,
+                    Width = CONTROL_AREA_WIDTH,
                     Children = new Drawable[]
                     {
                         new Box
@@ -108,8 +114,8 @@ namespace osu.Game.Tournament
                         {
                             RelativeSizeAxes = Axes.Both,
                             Direction = FillDirection.Vertical,
-                            Spacing = new Vector2(2),
-                            Padding = new MarginPadding(2),
+                            Spacing = new Vector2(5),
+                            Padding = new MarginPadding(5),
                             Children = new Drawable[]
                             {
                                 new ScreenButton(typeof(SetupScreen)) { Text = "Setup", RequestSelection = SetScreen },

From bee855bd1d914fd17cd108fb9fb55f8b6f1519fa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 13 Mar 2020 15:54:46 +0900
Subject: [PATCH 1076/1142] Remove using

---
 osu.Game.Tournament/Components/TournamentBeatmapPanel.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
index dc4c4b9ec6..477bf4bd63 100644
--- a/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
+++ b/osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
@@ -16,7 +16,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics;
 using osu.Game.Tournament.Models;
-using osuTK;
 using osuTK.Graphics;
 
 namespace osu.Game.Tournament.Components

From 7e9d28b1b13120372a7afd6599d7d905817043b8 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Fri, 13 Mar 2020 13:42:33 +0300
Subject: [PATCH 1077/1142] Fix slider ball colour affects follow circle

---
 .../Objects/Drawables/Pieces/SliderBall.cs               | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
index c871089acd..287a2d7e92 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
@@ -23,9 +23,16 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
     {
         public Func<OsuAction?> GetInitialHitAction;
 
+        public new Color4 Colour
+        {
+            get => ball.Colour;
+            set => ball.Colour = value;
+        }
+
         private readonly Slider slider;
         private readonly Drawable followCircle;
         private readonly DrawableSlider drawableSlider;
+        private readonly CircularContainer ball;
 
         public SliderBall(Slider slider, DrawableSlider drawableSlider = null)
         {
@@ -47,7 +54,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
                     Alpha = 0,
                     Child = new SkinnableDrawable(new OsuSkinComponent(OsuSkinComponents.SliderFollowCircle), _ => new DefaultFollowCircle()),
                 },
-                new CircularContainer
+                ball = new CircularContainer
                 {
                     Masking = true,
                     RelativeSizeAxes = Axes.Both,

From 097bd37e37c38095113bd706717a9601afc1f3c0 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Fri, 13 Mar 2020 18:27:33 +0100
Subject: [PATCH 1078/1142] Fix SelectorTab crashing tests after a reload

For some reason, the default channel type (Public) caused the channel manager to attempt to connect to an API, which was null at that time, after hot reloading the test environment (via dynamic compilation). Changing the channel type seems to fix that.
---
 osu.Game/Overlays/Chat/Tabs/ChannelSelectorTabItem.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game/Overlays/Chat/Tabs/ChannelSelectorTabItem.cs b/osu.Game/Overlays/Chat/Tabs/ChannelSelectorTabItem.cs
index d5d9a6c2ce..5fb56a3f75 100644
--- a/osu.Game/Overlays/Chat/Tabs/ChannelSelectorTabItem.cs
+++ b/osu.Game/Overlays/Chat/Tabs/ChannelSelectorTabItem.cs
@@ -39,6 +39,7 @@ namespace osu.Game.Overlays.Chat.Tabs
             public ChannelSelectorTabChannel()
             {
                 Name = "+";
+                Type = ChannelType.Temporary;
             }
         }
     }

From 8991e88039b0af4e39dd7122588542f7a916ccf8 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Fri, 13 Mar 2020 18:33:06 +0100
Subject: [PATCH 1079/1142] Fix active tab closing behaviour

---
 .../Overlays/Chat/Tabs/ChannelTabControl.cs   | 33 +++++++------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs b/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
index 104495ae01..a72f182450 100644
--- a/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
+++ b/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Overlays.Chat.Tabs
                 // performTabSort might've made selectorTab's position wonky, fix it
                 TabContainer.SetLayoutPosition(selectorTab, float.MaxValue);
 
-            ((ChannelTabItem)item).OnRequestClose += tabCloseRequested;
+            ((ChannelTabItem)item).OnRequestClose += channelItem => OnRequestLeave?.Invoke(channelItem.Value);
 
             base.AddTabItem(item, addToDropdown);
         }
@@ -74,18 +74,24 @@ namespace osu.Game.Overlays.Chat.Tabs
 
         /// <summary>
         /// Removes a channel from the ChannelTabControl.
-        /// If the selected channel is the one that is beeing removed, the next available channel will be selected.
+        /// If the selected channel is the one that is being removed, the next available channel will be selected.
         /// </summary>
         /// <param name="channel">The channel that is going to be removed.</param>
         public void RemoveChannel(Channel channel)
         {
-            RemoveItem(channel);
-
             if (Current.Value == channel)
             {
-                // Prefer non-selector channels first
-                Current.Value = Items.FirstOrDefault(c => !(c is ChannelSelectorTabItem.ChannelSelectorTabChannel)) ?? Items.FirstOrDefault();
+                var allChannels = TabContainer.AllTabItems.Select(tab => tab.Value).ToList();
+                var isNextTabSelector = allChannels[allChannels.IndexOf(channel) + 1] == selectorTab.Value;
+
+                // selectorTab is not switchable, so we have to explicitly select it if it's the only tab left
+                if (isNextTabSelector && allChannels.Count == 2)
+                    SelectTab(selectorTab);
+                else
+                    SwitchTab(isNextTabSelector ? -1 : 1);
             }
+
+            RemoveItem(channel);
         }
 
         protected override void SelectTab(TabItem<Channel> tab)
@@ -100,21 +106,6 @@ namespace osu.Game.Overlays.Chat.Tabs
             selectorTab.Active.Value = false;
         }
 
-        private void tabCloseRequested(TabItem<Channel> tab)
-        {
-            int totalTabs = TabContainer.Count - 1; // account for selectorTab
-            int currentIndex = Math.Clamp(TabContainer.IndexOf(tab), 1, totalTabs);
-
-            if (tab == SelectedTab && totalTabs > 1)
-                // Select the tab after tab-to-be-removed's index, or the tab before if current == last
-                SelectTab(TabContainer[currentIndex == totalTabs ? currentIndex - 1 : currentIndex + 1]);
-            else if (totalTabs == 1 && !selectorTab.Active.Value)
-                // Open channel selection overlay if all channel tabs will be closed after removing this tab
-                SelectTab(selectorTab);
-
-            OnRequestLeave?.Invoke(tab.Value);
-        }
-
         protected override TabFillFlowContainer CreateTabFlow() => new ChannelTabFillFlowContainer
         {
             Direction = FillDirection.Full,

From 694e56b0d13cc90e0f82b1f14661dd06fbf03f8d Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Fri, 13 Mar 2020 18:33:58 +0100
Subject: [PATCH 1080/1142] Add non-PM chat tabs to tests

---
 .../Visual/Online/TestSceneChatOverlay.cs     | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index 19bdaff6ff..8aa30c7fa3 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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;
@@ -196,12 +196,22 @@ namespace osu.Game.Tests.Visual.Online
 
         private class TestTabControl : ChannelTabControl
         {
-            protected override TabItem<Channel> CreateTabItem(Channel value) => new TestChannelTabItem(value);
+            protected override TabItem<Channel> CreateTabItem(Channel value)
+            {
+                switch (value.Type)
+                {
+                    case ChannelType.PM:
+                        return new TestPrivateChannelTabItem(value);
+
+                    default:
+                        return new TestChannelTabItem(value);
+                }
+            }
 
             public new IReadOnlyDictionary<Channel, TabItem<Channel>> TabMap => base.TabMap;
         }
 
-        private class TestChannelTabItem : PrivateChannelTabItem
+        private class TestChannelTabItem : ChannelTabItem
         {
             public TestChannelTabItem(Channel channel)
                 : base(channel)
@@ -210,5 +220,15 @@ namespace osu.Game.Tests.Visual.Online
 
             public new ClickableContainer CloseButton => base.CloseButton;
         }
+
+        private class TestPrivateChannelTabItem : PrivateChannelTabItem
+        {
+            public TestPrivateChannelTabItem(Channel channel)
+                : base(channel)
+            {
+            }
+
+            public new ClickableContainer CloseButton => base.CloseButton;
+        }
     }
 }

From 0bbae094ddf854d6e9d6ee3c3197df0577071231 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Fri, 13 Mar 2020 18:34:22 +0100
Subject: [PATCH 1081/1142] Add active tab closing behaviour tests

---
 .../Visual/Online/TestSceneChatOverlay.cs     | 76 +++++++++++++++++--
 1 file changed, 70 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index 8aa30c7fa3..ede99c06be 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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;
@@ -38,8 +38,13 @@ namespace osu.Game.Tests.Visual.Online
         private TestChatOverlay chatOverlay;
         private ChannelManager channelManager;
 
+        private IEnumerable<Channel> visibleChannels => chatOverlay.ChannelTabControl.VisibleItems.Where(channel => channel.Name != "+");
+        private IEnumerable<Channel> joinedChannels => chatOverlay.ChannelTabControl.Items.Where(channel => channel.Name != "+");
         private readonly List<Channel> channels;
 
+        private Channel currentChannel => channelManager.CurrentChannel.Value;
+        private Channel nextChannel => joinedChannels.ElementAt(joinedChannels.ToList().IndexOf(currentChannel) + 1);
+        private Channel previousChannel => joinedChannels.ElementAt(joinedChannels.ToList().IndexOf(currentChannel) - 1);
         private Channel channel1 => channels[0];
         private Channel channel2 => channels[1];
 
@@ -91,7 +96,7 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Join channel 1", () => channelManager.JoinChannel(channel1));
             AddStep("Switch to channel 1", () => clickDrawable(chatOverlay.TabMap[channel1]));
 
-            AddAssert("Current channel is channel 1", () => channelManager.CurrentChannel.Value == channel1);
+            AddAssert("Current channel is channel 1", () => currentChannel == channel1);
             AddAssert("Channel selector was closed", () => chatOverlay.SelectionOverlayState == Visibility.Hidden);
         }
 
@@ -102,12 +107,12 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Join channel 2", () => channelManager.JoinChannel(channel2));
 
             AddStep("Switch to channel 2", () => clickDrawable(chatOverlay.TabMap[channel2]));
-            AddStep("Close channel 2", () => clickDrawable(((TestChannelTabItem)chatOverlay.TabMap[channel2]).CloseButton.Child));
+            AddStep("Close channel 2", () => clickDrawable(((TestPrivateChannelTabItem)chatOverlay.TabMap[channel2]).CloseButton.Child));
 
             AddAssert("Selector remained closed", () => chatOverlay.SelectionOverlayState == Visibility.Hidden);
-            AddAssert("Current channel is channel 1", () => channelManager.CurrentChannel.Value == channel1);
+            AddAssert("Current channel is channel 1", () => currentChannel == channel1);
 
-            AddStep("Close channel 1", () => clickDrawable(((TestChannelTabItem)chatOverlay.TabMap[channel1]).CloseButton.Child));
+            AddStep("Close channel 1", () => clickDrawable(((TestPrivateChannelTabItem)chatOverlay.TabMap[channel1]).CloseButton.Child));
 
             AddAssert("Selector is visible", () => chatOverlay.SelectionOverlayState == Visibility.Visible);
         }
@@ -140,10 +145,67 @@ namespace osu.Game.Tests.Visual.Online
                 var targetNumberKey = oneBasedIndex % 10;
                 var targetChannel = channels[zeroBasedIndex];
                 AddStep($"press Alt+{targetNumberKey}", () => pressChannelHotkey(targetNumberKey));
-                AddAssert($"channel #{oneBasedIndex} is selected", () => channelManager.CurrentChannel.Value == targetChannel);
+                AddAssert($"channel #{oneBasedIndex} is selected", () => currentChannel == targetChannel);
             }
         }
 
+        private Channel expectedChannel;
+
+        [Test]
+        public void TestCloseChannelWhileActive()
+        {
+            AddUntilStep("Join until dropdown has channels", () =>
+            {
+                if (visibleChannels.Count() < joinedChannels.Count())
+                    return true;
+
+                // Using temporary channels because they don't hide their names when not active
+                Channel toAdd = new Channel { Name = $"test channel {joinedChannels.Count()}", Type = ChannelType.Temporary };
+                channelManager.JoinChannel(toAdd);
+
+                return false;
+            });
+
+            AddStep("Switch to last tab", () => clickDrawable(chatOverlay.TabMap[visibleChannels.Last()]));
+            AddAssert("Last visible selected", () => currentChannel == visibleChannels.Last());
+
+            // Closing the last channel before dropdown
+            AddStep("Close current channel", () =>
+            {
+                expectedChannel = nextChannel;
+                chatOverlay.ChannelTabControl.RemoveChannel(currentChannel);
+            });
+            AddAssert("Next channel selected", () => currentChannel == expectedChannel);
+
+            // Depending on the window size, one more channel might need to be closed for the selectorTab to appear
+            AddUntilStep("Close channels until selector visible", () =>
+            {
+                if (chatOverlay.ChannelTabControl.VisibleItems.Last().Name == "+")
+                    return true;
+
+                chatOverlay.ChannelTabControl.RemoveChannel(visibleChannels.Last());
+                return false;
+            });
+            AddAssert("Last visible selected", () => currentChannel == visibleChannels.Last());
+
+            // Closing the last channel with dropdown no longer present
+            AddStep("Close last when selector next", () => 
+            {
+                expectedChannel = previousChannel;
+                chatOverlay.ChannelTabControl.RemoveChannel(currentChannel);
+            });
+            AddAssert("Channel changed to previous", () => currentChannel == expectedChannel);
+
+            // Standard channel closing
+            AddStep("Switch to previous channel", () => chatOverlay.ChannelTabControl.SwitchTab(-1));
+            AddStep("Close current channel", () => 
+            {
+                expectedChannel = nextChannel;
+                chatOverlay.ChannelTabControl.RemoveChannel(currentChannel);
+            });
+            AddAssert("Channel changed to next", () => currentChannel == expectedChannel);
+        }
+
         private void pressChannelHotkey(int number)
         {
             var channelKey = Key.Number0 + number;
@@ -187,6 +249,8 @@ namespace osu.Game.Tests.Visual.Online
         {
             public Visibility SelectionOverlayState => ChannelSelectionOverlay.State.Value;
 
+            public new ChannelTabControl ChannelTabControl => base.ChannelTabControl;
+
             public new ChannelSelectionOverlay ChannelSelectionOverlay => base.ChannelSelectionOverlay;
 
             protected override ChannelTabControl CreateChannelTabControl() => new TestTabControl();

From 8d3cab0e1696e62c3c018cab91a1ee797b8bcc03 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Fri, 13 Mar 2020 18:58:32 +0100
Subject: [PATCH 1082/1142] Trim whitespace

---
 osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index ede99c06be..297a51c4a5 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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;
@@ -107,12 +107,12 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Join channel 2", () => channelManager.JoinChannel(channel2));
 
             AddStep("Switch to channel 2", () => clickDrawable(chatOverlay.TabMap[channel2]));
-            AddStep("Close channel 2", () => clickDrawable(((TestPrivateChannelTabItem)chatOverlay.TabMap[channel2]).CloseButton.Child));
+            AddStep("Close channel 2", () => clickDrawable(((TestChannelTabItem)chatOverlay.TabMap[channel2]).CloseButton.Child));
 
             AddAssert("Selector remained closed", () => chatOverlay.SelectionOverlayState == Visibility.Hidden);
             AddAssert("Current channel is channel 1", () => currentChannel == channel1);
 
-            AddStep("Close channel 1", () => clickDrawable(((TestPrivateChannelTabItem)chatOverlay.TabMap[channel1]).CloseButton.Child));
+            AddStep("Close channel 1", () => clickDrawable(((TestChannelTabItem)chatOverlay.TabMap[channel1]).CloseButton.Child));
 
             AddAssert("Selector is visible", () => chatOverlay.SelectionOverlayState == Visibility.Visible);
         }

From 38d00c7f0ae6abb0283a366fadfca6cabb048948 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Fri, 13 Mar 2020 21:29:10 +0100
Subject: [PATCH 1083/1142] Revert unnecessary changes and actually trim the
 whitespace

---
 osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index 297a51c4a5..736bfd8e7d 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -1,4 +1,4 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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;
@@ -107,12 +107,12 @@ namespace osu.Game.Tests.Visual.Online
             AddStep("Join channel 2", () => channelManager.JoinChannel(channel2));
 
             AddStep("Switch to channel 2", () => clickDrawable(chatOverlay.TabMap[channel2]));
-            AddStep("Close channel 2", () => clickDrawable(((TestChannelTabItem)chatOverlay.TabMap[channel2]).CloseButton.Child));
+            AddStep("Close channel 2", () => clickDrawable(((TestPrivateChannelTabItem)chatOverlay.TabMap[channel2]).CloseButton.Child));
 
             AddAssert("Selector remained closed", () => chatOverlay.SelectionOverlayState == Visibility.Hidden);
             AddAssert("Current channel is channel 1", () => currentChannel == channel1);
 
-            AddStep("Close channel 1", () => clickDrawable(((TestChannelTabItem)chatOverlay.TabMap[channel1]).CloseButton.Child));
+            AddStep("Close channel 1", () => clickDrawable(((TestPrivateChannelTabItem)chatOverlay.TabMap[channel1]).CloseButton.Child));
 
             AddAssert("Selector is visible", () => chatOverlay.SelectionOverlayState == Visibility.Visible);
         }
@@ -189,7 +189,7 @@ namespace osu.Game.Tests.Visual.Online
             AddAssert("Last visible selected", () => currentChannel == visibleChannels.Last());
 
             // Closing the last channel with dropdown no longer present
-            AddStep("Close last when selector next", () => 
+            AddStep("Close last when selector next", () =>
             {
                 expectedChannel = previousChannel;
                 chatOverlay.ChannelTabControl.RemoveChannel(currentChannel);
@@ -198,7 +198,7 @@ namespace osu.Game.Tests.Visual.Online
 
             // Standard channel closing
             AddStep("Switch to previous channel", () => chatOverlay.ChannelTabControl.SwitchTab(-1));
-            AddStep("Close current channel", () => 
+            AddStep("Close current channel", () =>
             {
                 expectedChannel = nextChannel;
                 chatOverlay.ChannelTabControl.RemoveChannel(currentChannel);

From 202c8cdad8ef0cf223b48f6a0590622004fa2efd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 14 Mar 2020 15:35:59 +0900
Subject: [PATCH 1084/1142] Add braces to satisfy codefactor

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 2c8b080ee3..a3dc58bc19 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -348,8 +348,8 @@ namespace osu.Game.Rulesets.Catch.UI
             UpdatePosition((float)(X + direction * Clock.ElapsedFrameTime * speed));
 
             // Correct overshooting.
-            if (hyperDashDirection > 0 && hyperDashTargetPosition < X ||
-                hyperDashDirection < 0 && hyperDashTargetPosition > X)
+            if ((hyperDashDirection > 0 && hyperDashTargetPosition < X) ||
+                (hyperDashDirection < 0 && hyperDashTargetPosition > X))
             {
                 X = hyperDashTargetPosition;
                 SetHyperDashState();

From cd0f1c98ba710cfd29130859918e5b31657a7f62 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 14 Mar 2020 16:17:14 +0900
Subject: [PATCH 1085/1142] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index f623a92ade..d7a76c97af 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.304.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.312.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.314.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index ba6f0e2251..882dd82a53 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.304.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.312.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.314.0" />
     <PackageReference Include="Sentry" Version="2.1.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 54cd400d51..7872db676b 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.304.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.312.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.314.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
@@ -79,7 +79,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.312.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.314.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 45dfb22bd50ae25884e2b159d27747acd8a5819d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 14 Mar 2020 16:25:10 +0900
Subject: [PATCH 1086/1142] Centralise additive texture creation

---
 osu.Game.Rulesets.Catch/UI/CatcherArea.cs | 39 +++++++++++++----------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 13f1ddf1d7..2caae8c0c7 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -251,22 +251,10 @@ namespace osu.Game.Rulesets.Catch.UI
                     return;
                 }
 
-                Texture tex = (currentCatcher.Drawable as TextureAnimation)?.CurrentFrame ?? ((Sprite)currentCatcher.Drawable).Texture;
-
-                var additive = new CatcherTrailSprite(tex)
-                {
-                    Anchor = Anchor,
-                    Scale = Scale,
-                    Colour = HyperDashing ? Color4.Red : Color4.White,
-                    Blending = BlendingParameters.Additive,
-                    RelativePositionAxes = RelativePositionAxes,
-                    Position = Position
-                };
+                var additive = createAdditiveSprite();
 
                 additive.FadeTo(0.4f).FadeOut(800, Easing.OutQuint);
                 additive.Expire(true);
-                
-                AdditiveTarget?.Add(additive);
 
                 Scheduler.AddDelayed(beginTrail, HyperDashing ? 25 : 50);
             }
@@ -400,10 +388,10 @@ namespace osu.Game.Rulesets.Catch.UI
                         this.FadeTo(0.2f, hyper_dash_transition_length, Easing.OutQuint);
                         Trail = true;
 
-                        var hyperDashEndGlow = createAdditiveSprite(true);
+                        var hyperDashEndGlow = createAdditiveSprite();
 
-                        hyperDashEndGlow.MoveToOffset(new Vector2(0, -20), 1200, Easing.In);
-                        hyperDashEndGlow.ScaleTo(hyperDashEndGlow.Scale * 0.9f).ScaleTo(hyperDashEndGlow.Scale * 1.2f, 1200, Easing.In);
+                        hyperDashEndGlow.MoveToOffset(new Vector2(0, -10), 1200, Easing.In);
+                        hyperDashEndGlow.ScaleTo(hyperDashEndGlow.Scale * 0.95f).ScaleTo(hyperDashEndGlow.Scale * 1.2f, 1200, Easing.In);
                         hyperDashEndGlow.FadeOut(1200);
                         hyperDashEndGlow.Expire(true);
                     }
@@ -522,6 +510,25 @@ namespace osu.Game.Rulesets.Catch.UI
                 });
             }
 
+            private CatcherTrailSprite createAdditiveSprite()
+            {
+                Texture tex = (currentCatcher.Drawable as TextureAnimation)?.CurrentFrame ?? ((Sprite)currentCatcher.Drawable).Texture;
+
+                var sprite = new CatcherTrailSprite(tex)
+                {
+                    Anchor = Anchor,
+                    Scale = Scale,
+                    Colour = HyperDashing ? Color4.Red : Color4.White,
+                    Blending = BlendingParameters.Additive,
+                    RelativePositionAxes = RelativePositionAxes,
+                    Position = Position
+                };
+
+                AdditiveTarget?.Add(sprite);
+
+                return sprite;
+            }
+
             private void removeFromPlateWithTransform(DrawableHitObject fruit, Action<DrawableHitObject> action)
             {
                 if (ExplodingFruitTarget != null)

From d3f23b766e775e068199487c9859091b5c395eb0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 14 Mar 2020 17:06:23 +0900
Subject: [PATCH 1087/1142] Move across to new file in line with master

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 59 ++++++++++++++++++---------
 1 file changed, 39 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index a3dc58bc19..29bed00d61 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -7,6 +7,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Animations;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Utils;
 using osu.Game.Beatmaps;
@@ -55,14 +56,14 @@ namespace osu.Game.Rulesets.Catch.UI
         }
 
         /// <summary>
-        /// Activate or deactive the trail. Will be automatically deactivated when conditions to keep the trail displayed are no longer met.
+        /// Activate or deactivate the trail. Will be automatically deactivated when conditions to keep the trail displayed are no longer met.
         /// </summary>
         protected bool Trail
         {
             get => trail;
             set
             {
-                if (value == trail) return;
+                if (value == trail || AdditiveTarget == null) return;
 
                 trail = value;
 
@@ -77,6 +78,8 @@ namespace osu.Game.Rulesets.Catch.UI
         private CatcherSprite catcherKiai;
         private CatcherSprite catcherFail;
 
+        private CatcherSprite currentCatcher;
+
         private int currentDirection;
 
         private bool dashing;
@@ -236,10 +239,10 @@ namespace osu.Game.Rulesets.Catch.UI
                     this.FadeTo(0.2f, hyper_dash_transition_length, Easing.OutQuint);
                     Trail = true;
 
-                    var hyperDashEndGlow = createAdditiveSprite(true);
+                    var hyperDashEndGlow = createAdditiveSprite();
 
-                    hyperDashEndGlow.MoveToOffset(new Vector2(0, -20), 1200, Easing.In);
-                    hyperDashEndGlow.ScaleTo(hyperDashEndGlow.Scale * 0.9f).ScaleTo(hyperDashEndGlow.Scale * 1.2f, 1200, Easing.In);
+                    hyperDashEndGlow.MoveToOffset(new Vector2(0, -10), 1200, Easing.In);
+                    hyperDashEndGlow.ScaleTo(hyperDashEndGlow.Scale * 0.95f).ScaleTo(hyperDashEndGlow.Scale * 1.2f, 1200, Easing.In);
                     hyperDashEndGlow.FadeOut(1200);
                     hyperDashEndGlow.Expire(true);
                 }
@@ -358,39 +361,36 @@ namespace osu.Game.Rulesets.Catch.UI
 
         private void updateCatcher()
         {
-            catcherIdle.Hide();
-            catcherKiai.Hide();
-            catcherFail.Hide();
-
-            CatcherSprite current;
+            currentCatcher?.Hide();
 
             switch (CurrentState)
             {
                 default:
-                    current = catcherIdle;
+                    currentCatcher = catcherIdle;
                     break;
 
                 case CatcherAnimationState.Fail:
-                    current = catcherFail;
+                    currentCatcher = catcherFail;
                     break;
 
                 case CatcherAnimationState.Kiai:
-                    current = catcherKiai;
+                    currentCatcher = catcherKiai;
                     break;
             }
 
-            current.Show();
-            (current.Drawable as IAnimation)?.GotoFrame(0);
+            currentCatcher.Show();
+            (currentCatcher.Drawable as IAnimation)?.GotoFrame(0);
         }
 
         private void beginTrail()
         {
-            Trail &= dashing || HyperDashing;
-            Trail &= AdditiveTarget != null;
+            if (!dashing && !HyperDashing)
+            {
+                Trail = false;
+                return;
+            }
 
-            if (!Trail) return;
-
-            var additive = createAdditiveSprite(HyperDashing);
+            var additive = createAdditiveSprite();
 
             additive.FadeTo(0.4f).FadeOut(800, Easing.OutQuint);
             additive.Expire(true);
@@ -428,6 +428,25 @@ namespace osu.Game.Rulesets.Catch.UI
             updateCatcher();
         }
 
+        private CatcherTrailSprite createAdditiveSprite()
+        {
+            var tex = (currentCatcher.Drawable as TextureAnimation)?.CurrentFrame ?? ((Sprite)currentCatcher.Drawable).Texture;
+
+            var sprite = new CatcherTrailSprite(tex)
+            {
+                Anchor = Anchor,
+                Scale = Scale,
+                Colour = HyperDashing ? Color4.Red : Color4.White,
+                Blending = BlendingParameters.Additive,
+                RelativePositionAxes = RelativePositionAxes,
+                Position = Position
+            };
+
+            AdditiveTarget?.Add(sprite);
+
+            return sprite;
+        }
+
         private void removeFromPlateWithTransform(DrawableHitObject fruit, Action<DrawableHitObject> action)
         {
             if (ExplodingFruitTarget != null)

From 74c9d5fc93f85780df7da15124e92b386e4ea517 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 14 Mar 2020 13:45:55 +0300
Subject: [PATCH 1088/1142] Use AccentColour

---
 .../Objects/Drawables/DrawableSlider.cs           |  2 +-
 .../Objects/Drawables/Pieces/SliderBall.cs        | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 7403649184..ccc731779d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -185,7 +185,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             base.ApplySkin(skin, allowFallback);
 
             bool allowBallTint = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.AllowSliderBallTint)?.Value ?? false;
-            Ball.Colour = allowBallTint ? AccentColour.Value : Color4.White;
+            Ball.AccentColour = allowBallTint ? AccentColour.Value : Color4.White;
         }
 
         protected override void CheckForResult(bool userTriggered, double timeOffset)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
index 287a2d7e92..0c046604c0 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
@@ -16,17 +16,24 @@ using osu.Game.Rulesets.Osu.Skinning;
 using osuTK.Graphics;
 using osu.Game.Skinning;
 using osuTK;
+using osu.Game.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
 {
-    public class SliderBall : CircularContainer, ISliderProgress, IRequireHighFrequencyMousePosition
+    public class SliderBall : CircularContainer, ISliderProgress, IRequireHighFrequencyMousePosition, IHasAccentColour
     {
         public Func<OsuAction?> GetInitialHitAction;
 
-        public new Color4 Colour
+        private Color4 accentColour;
+
+        public Color4 AccentColour
         {
-            get => ball.Colour;
-            set => ball.Colour = value;
+            get => accentColour;
+            set
+            {
+                accentColour = value;
+                ball.Colour = value;
+            }
         }
 
         private readonly Slider slider;

From c271d1755715822bd0dd5d47040a91da74ab23f6 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sat, 14 Mar 2020 14:07:52 +0300
Subject: [PATCH 1089/1142] Remove useless field

---
 .../Objects/Drawables/Pieces/SliderBall.cs             | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
index 0c046604c0..5a6dd49c44 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
@@ -24,16 +24,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
     {
         public Func<OsuAction?> GetInitialHitAction;
 
-        private Color4 accentColour;
-
         public Color4 AccentColour
         {
-            get => accentColour;
-            set
-            {
-                accentColour = value;
-                ball.Colour = value;
-            }
+            get => ball.Colour;
+            set => ball.Colour = value;
         }
 
         private readonly Slider slider;

From 62ce5031269446adbc8c107fa16f832678a5d441 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 15 Mar 2020 00:36:21 +0900
Subject: [PATCH 1090/1142] Fix changelog alignment and italics usage

---
 osu.Game/Overlays/Changelog/ChangelogBuild.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Changelog/ChangelogBuild.cs b/osu.Game/Overlays/Changelog/ChangelogBuild.cs
index 8aee76cb08..48bf6c2ddd 100644
--- a/osu.Game/Overlays/Changelog/ChangelogBuild.cs
+++ b/osu.Game/Overlays/Changelog/ChangelogBuild.cs
@@ -93,6 +93,7 @@ namespace osu.Game.Overlays.Changelog
                                 Direction = FillDirection.Full,
                                 RelativeSizeAxes = Axes.X,
                                 AutoSizeAxes = Axes.Y,
+                                TextAnchor = Anchor.BottomLeft,
                             }
                         }
                     };
@@ -125,7 +126,7 @@ namespace osu.Game.Overlays.Changelog
 
                     title.AddText("by ", t =>
                     {
-                        t.Font = fontMedium.With(italics: true);
+                        t.Font = fontMedium;
                         t.Colour = entryColour;
                         t.Padding = new MarginPadding { Left = 10 };
                     });
@@ -138,7 +139,7 @@ namespace osu.Game.Overlays.Changelog
                             Id = entry.GithubUser.UserId.Value
                         }, t =>
                         {
-                            t.Font = fontMedium.With(italics: true);
+                            t.Font = fontMedium;
                             t.Colour = entryColour;
                         });
                     }
@@ -146,7 +147,7 @@ namespace osu.Game.Overlays.Changelog
                     {
                         title.AddLink(entry.GithubUser.DisplayName, entry.GithubUser.GithubUrl, t =>
                         {
-                            t.Font = fontMedium.With(italics: true);
+                            t.Font = fontMedium;
                             t.Colour = entryColour;
                         });
                     }
@@ -154,7 +155,7 @@ namespace osu.Game.Overlays.Changelog
                     {
                         title.AddText(entry.GithubUser.DisplayName, t =>
                         {
-                            t.Font = fontMedium.With(italics: true);
+                            t.Font = fontMedium;
                             t.Colour = entryColour;
                         });
                     }

From cd604785a87e14dfec1bf2317762f44325d1c196 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 15 Mar 2020 00:38:27 +0900
Subject: [PATCH 1091/1142] Ignore italics specification for now

---
 osu.Game/Graphics/OsuFont.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Graphics/OsuFont.cs b/osu.Game/Graphics/OsuFont.cs
index 076cc241ed..7c78141b4d 100644
--- a/osu.Game/Graphics/OsuFont.cs
+++ b/osu.Game/Graphics/OsuFont.cs
@@ -31,7 +31,14 @@ namespace osu.Game.Graphics
         /// <param name="fixedWidth">Whether all characters should be spaced the same distance apart.</param>
         /// <returns>The <see cref="FontUsage"/>.</returns>
         public static FontUsage GetFont(Typeface typeface = Typeface.Torus, float size = DEFAULT_FONT_SIZE, FontWeight weight = FontWeight.Medium, bool italics = false, bool fixedWidth = false)
-            => new FontUsage(GetFamilyString(typeface), size, GetWeightString(typeface, weight), italics, fixedWidth);
+            => new FontUsage(GetFamilyString(typeface), size, GetWeightString(typeface, weight), getItalics(italics), fixedWidth);
+
+        private static bool getItalics(in bool italicsRequested)
+        {
+            // right now none of our fonts support italics.
+            // should add exceptions to this rule if they come up.
+            return false;
+        }
 
         /// <summary>
         /// Retrieves the string representation of a <see cref="Typeface"/>.

From 0b788065b46a0a579e849bfe893ba0b3b57d301a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 15 Mar 2020 01:00:25 +0900
Subject: [PATCH 1092/1142] Update resources package

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index f623a92ade..1a63b893a1 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -51,7 +51,7 @@
     <Reference Include="Java.Interop" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.304.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.315.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2020.312.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index ba6f0e2251..95d09e84eb 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -22,7 +22,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.304.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.315.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2020.312.0" />
     <PackageReference Include="Sentry" Version="2.1.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 54cd400d51..ce7ff38988 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.304.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2020.315.0" />
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.312.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->

From 1a6056637b9918f66ad0dc5282d660665c17ebdc Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 15 Mar 2020 01:43:29 +0900
Subject: [PATCH 1093/1142] Turn off italics test for now (may come back if we
 switch chat to content font)

---
 osu.Game.Tests/Visual/Online/TestSceneChatLink.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
index c76d4fd5b8..7a257a1603 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatLink.cs
@@ -12,7 +12,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Online.Chat;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Chat;
@@ -78,7 +77,7 @@ namespace osu.Game.Tests.Visual.Online
 
             AddAssert($"msg #{index} has {linkAmount} link(s)", () => newLine.Message.Links.Count == linkAmount);
             AddAssert($"msg #{index} has the right action", hasExpectedActions);
-            AddAssert($"msg #{index} is " + (isAction ? "italic" : "not italic"), () => newLine.ContentFlow.Any() && isAction == isItalic());
+            //AddAssert($"msg #{index} is " + (isAction ? "italic" : "not italic"), () => newLine.ContentFlow.Any() && isAction == isItalic());
             AddAssert($"msg #{index} shows {linkAmount} link(s)", isShowingLinks);
 
             bool hasExpectedActions()
@@ -97,7 +96,7 @@ namespace osu.Game.Tests.Visual.Online
                 return true;
             }
 
-            bool isItalic() => newLine.ContentFlow.Where(d => d is OsuSpriteText).Cast<OsuSpriteText>().All(sprite => sprite.Font.Italics);
+            //bool isItalic() => newLine.ContentFlow.Where(d => d is OsuSpriteText).Cast<OsuSpriteText>().All(sprite => sprite.Font.Italics);
 
             bool isShowingLinks()
             {

From 12b7727af6022d1d4f88397f542a12497899b7be Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 15 Mar 2020 03:25:01 +0900
Subject: [PATCH 1094/1142] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 1a63b893a1..66a1523843 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.315.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.312.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.314.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 95d09e84eb..647f05b428 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.315.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.312.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.314.0" />
     <PackageReference Include="Sentry" Version="2.1.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index ce7ff38988..0e5c64cf0f 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.315.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.312.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.314.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
@@ -79,7 +79,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.312.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.314.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 340d362d69230a79a005cf86cc4bee0295709e00 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 15 Mar 2020 03:51:30 +0900
Subject: [PATCH 1095/1142] Appease inspectcode

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 20f9bb1be8..e2e7ba8031 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -779,7 +779,7 @@ namespace osu.Game.Screens.Select
             /// </summary>
             public bool UserScrolling { get; private set; }
 
-            protected override void OnUserScroll(float value, bool animated = true, double? distanceDecay = null)
+            protected override void OnUserScroll(float value, bool animated = true, double? distanceDecay = default)
             {
                 UserScrolling = true;
                 base.OnUserScroll(value, animated, distanceDecay);

From f90485994367f5b6b1b57da6cb452536f92cc04b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 15 Mar 2020 15:45:13 +0100
Subject: [PATCH 1096/1142] Remove leftover unused private methods

---
 osu.Game.Rulesets.Catch/UI/Catcher.cs | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/UI/Catcher.cs b/osu.Game.Rulesets.Catch/UI/Catcher.cs
index 29bed00d61..e361b29a9d 100644
--- a/osu.Game.Rulesets.Catch/UI/Catcher.cs
+++ b/osu.Game.Rulesets.Catch/UI/Catcher.cs
@@ -398,27 +398,6 @@ namespace osu.Game.Rulesets.Catch.UI
             Scheduler.AddDelayed(beginTrail, HyperDashing ? 25 : 50);
         }
 
-        private Drawable createAdditiveSprite(bool hyperDash)
-        {
-            var additive = createCatcherSprite();
-
-            additive.Anchor = Anchor;
-            additive.Scale = Scale;
-            additive.Colour = hyperDash ? Color4.Red : Color4.White;
-            additive.Blending = BlendingParameters.Additive;
-            additive.RelativePositionAxes = RelativePositionAxes;
-            additive.Position = Position;
-
-            AdditiveTarget.Add(additive);
-
-            return additive;
-        }
-
-        private Drawable createCatcherSprite()
-        {
-            return new CatcherSprite(CurrentState);
-        }
-
         private void updateState(CatcherAnimationState state)
         {
             if (CurrentState == state)

From e68d4f92f5f5694d306a8b11d35eb7545685de4a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 16 Mar 2020 01:19:10 +0900
Subject: [PATCH 1097/1142] Fix framework version mismatch

---
 osu.iOS.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.iOS.props b/osu.iOS.props
index 1387026799..0e5c64cf0f 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -79,7 +79,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.312.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.314.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From acd280c85552ec22073606807e75eeda663ebe11 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Sun, 15 Mar 2020 22:13:26 +0100
Subject: [PATCH 1098/1142] Add System channel type and use it for the
 ChannelSelectorTab

---
 osu.Game/Online/Chat/ChannelType.cs                   | 1 +
 osu.Game/Overlays/Chat/Tabs/ChannelSelectorTabItem.cs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Chat/ChannelType.cs b/osu.Game/Online/Chat/ChannelType.cs
index 7d2b661164..151efc4645 100644
--- a/osu.Game/Online/Chat/ChannelType.cs
+++ b/osu.Game/Online/Chat/ChannelType.cs
@@ -12,5 +12,6 @@ namespace osu.Game.Online.Chat
         Temporary,
         PM,
         Group,
+        System,
     }
 }
diff --git a/osu.Game/Overlays/Chat/Tabs/ChannelSelectorTabItem.cs b/osu.Game/Overlays/Chat/Tabs/ChannelSelectorTabItem.cs
index 5fb56a3f75..e3ede04edd 100644
--- a/osu.Game/Overlays/Chat/Tabs/ChannelSelectorTabItem.cs
+++ b/osu.Game/Overlays/Chat/Tabs/ChannelSelectorTabItem.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Overlays.Chat.Tabs
             public ChannelSelectorTabChannel()
             {
                 Name = "+";
-                Type = ChannelType.Temporary;
+                Type = ChannelType.System;
             }
         }
     }

From f390c1995db413005cea88a68d832e92382768e2 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 16 Mar 2020 11:29:28 +0900
Subject: [PATCH 1099/1142] Apply comment suggestions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Dean Herbert <pe@ppy.sh>
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
---
 osu.Game/Beatmaps/IWorkingBeatmap.cs        | 2 +-
 osu.Game/Screens/Edit/Editor.cs             | 4 ++--
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Beatmaps/IWorkingBeatmap.cs b/osu.Game/Beatmaps/IWorkingBeatmap.cs
index 61bd962648..526bc668af 100644
--- a/osu.Game/Beatmaps/IWorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/IWorkingBeatmap.cs
@@ -61,7 +61,7 @@ namespace osu.Game.Beatmaps
         /// </summary>
         /// <param name="ruleset">The <see cref="RulesetInfo"/> to create a playable <see cref="IBeatmap"/> for.</param>
         /// <param name="mods">The <see cref="Mod"/>s to apply to the <see cref="IBeatmap"/>.</param>
-        /// <param name="timeout">The loading timeout.</param>
+        /// <param name="timeout">The maximum length in milliseconds to wait for load to complete. Defaults to 10,000ms.</param>
         /// <returns>The converted <see cref="IBeatmap"/>.</returns>
         /// <exception cref="BeatmapInvalidForRulesetException">If <see cref="Beatmap"/> could not be converted to <paramref name="ruleset"/>.</exception>
         IBeatmap GetPlayableBeatmap(RulesetInfo ruleset, IReadOnlyList<Mod> mods = null, TimeSpan? timeout = null);
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index cf13f8a3a1..f1cbed57f1 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -93,8 +93,8 @@ namespace osu.Game.Screens.Edit
             }
             catch (Exception e)
             {
-                Logger.Error(e, "Could not load beatmap sucessfully!");
-                //couldn't load, hard abort!
+                Logger.Error(e, "Could not load beatmap successfully!");
+                // couldn't load, hard abort!
                 this.Exit();
                 return;
             }
diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index 59d2aca17d..7a8a1593b9 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -331,7 +331,7 @@ namespace osu.Game.Screens.Select
                     }
                     catch (Exception e)
                     {
-                        Logger.Error(e, "Could not load beatmap sucessfully!");
+                        Logger.Error(e, "Could not load beatmap successfully!");
                     }
                 }
 

From 9c5423734a30587063c9a1375eeccb6243cc0d78 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 16 Mar 2020 11:33:26 +0900
Subject: [PATCH 1100/1142] Throw timeout exceptions instead

---
 osu.Game/Beatmaps/WorkingBeatmap.cs | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index bdcfc058b4..dd4f893ac2 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -100,7 +100,9 @@ namespace osu.Game.Beatmaps
                 // Apply conversion mods
                 foreach (var mod in mods.OfType<IApplicableToBeatmapConverter>())
                 {
-                    cancellationSource.Token.ThrowIfCancellationRequested();
+                    if (cancellationSource.IsCancellationRequested)
+                        throw new BeatmapLoadTimeoutException(BeatmapInfo);
+
                     mod.ApplyToBeatmapConverter(converter);
                 }
 
@@ -115,7 +117,9 @@ namespace osu.Game.Beatmaps
 
                     foreach (var mod in mods.OfType<IApplicableToDifficulty>())
                     {
-                        cancellationSource.Token.ThrowIfCancellationRequested();
+                        if (cancellationSource.IsCancellationRequested)
+                            throw new BeatmapLoadTimeoutException(BeatmapInfo);
+
                         mod.ApplyToDifficulty(converted.BeatmapInfo.BaseDifficulty);
                     }
                 }
@@ -127,7 +131,9 @@ namespace osu.Game.Beatmaps
                 // Compute default values for hitobjects, including creating nested hitobjects in-case they're needed
                 foreach (var obj in converted.HitObjects)
                 {
-                    cancellationSource.Token.ThrowIfCancellationRequested();
+                    if (cancellationSource.IsCancellationRequested)
+                        throw new BeatmapLoadTimeoutException(BeatmapInfo);
+
                     obj.ApplyDefaults(converted.ControlPointInfo, converted.BeatmapInfo.BaseDifficulty);
                 }
 
@@ -135,7 +141,9 @@ namespace osu.Game.Beatmaps
                 {
                     foreach (var obj in converted.HitObjects)
                     {
-                        cancellationSource.Token.ThrowIfCancellationRequested();
+                        if (cancellationSource.IsCancellationRequested)
+                            throw new BeatmapLoadTimeoutException(BeatmapInfo);
+
                         mod.ApplyToHitObject(obj);
                     }
                 }
@@ -315,5 +323,13 @@ namespace osu.Game.Beatmaps
 
             private void recreate() => lazy = new Lazy<T>(valueFactory, LazyThreadSafetyMode.ExecutionAndPublication);
         }
+
+        private class BeatmapLoadTimeoutException : TimeoutException
+        {
+            public BeatmapLoadTimeoutException(BeatmapInfo beatmapInfo)
+                : base($"Timed out while loading beatmap ({beatmapInfo}).")
+            {
+            }
+        }
     }
 }

From 58fc947be3417ce9edbeadbd00b885bcb569dba7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 16 Mar 2020 14:06:42 +0900
Subject: [PATCH 1101/1142] Privatise some setters

---
 osu.Game/Users/UserPanel.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Users/UserPanel.cs b/osu.Game/Users/UserPanel.cs
index 5676113aad..289244cdc3 100644
--- a/osu.Game/Users/UserPanel.cs
+++ b/osu.Game/Users/UserPanel.cs
@@ -32,9 +32,9 @@ namespace osu.Game.Users
 
         public new Action Action;
 
-        protected Action ViewProfile;
+        protected Action ViewProfile { get; private set; }
 
-        protected DelayedLoadUnloadWrapper Background;
+        protected DelayedLoadUnloadWrapper Background { get; private set; }
 
         private SpriteIcon statusIcon;
         private OsuSpriteText statusMessage;

From 24fe7538fd0e7eb7d9592760978e716636751069 Mon Sep 17 00:00:00 2001
From: "Marcus \"Mestro\" Nordgren" <itsmestro@gmail.com>
Date: Mon, 16 Mar 2020 13:09:15 +0100
Subject: [PATCH 1102/1142] Use new logo name for showcase screen

---
 osu.Game.Tournament/Screens/Showcase/TournamentLogo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tournament/Screens/Showcase/TournamentLogo.cs b/osu.Game.Tournament/Screens/Showcase/TournamentLogo.cs
index 6ad5ccaf0c..bd5aa2f5d9 100644
--- a/osu.Game.Tournament/Screens/Showcase/TournamentLogo.cs
+++ b/osu.Game.Tournament/Screens/Showcase/TournamentLogo.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Tournament.Screens.Showcase
                 Origin = Anchor.TopCentre,
                 FillMode = FillMode.Fit,
                 RelativeSizeAxes = Axes.Both,
-                Texture = textures.Get("game-screen-logo"),
+                Texture = textures.Get("header-logo"),
             };
         }
     }

From 50c2e65e3c2b5da4378171d3c920e1648521e4f0 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Mon, 16 Mar 2020 19:10:42 +0100
Subject: [PATCH 1103/1142] Improve TestSceneChatOverlay

---
 .../Visual/Online/TestSceneChatOverlay.cs     | 86 ++++++++++++-------
 1 file changed, 55 insertions(+), 31 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index 736bfd8e7d..03251f1d5e 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -47,14 +47,20 @@ namespace osu.Game.Tests.Visual.Online
         private Channel previousChannel => joinedChannels.ElementAt(joinedChannels.ToList().IndexOf(currentChannel) - 1);
         private Channel channel1 => channels[0];
         private Channel channel2 => channels[1];
+        private Channel channelPM => channels.Last();
 
         public TestSceneChatOverlay()
         {
             channels = Enumerable.Range(1, 10)
-                                 .Select(index => new Channel(new User())
+                                 .Select(index => new Channel
                                  {
                                      Name = $"Channel no. {index}",
-                                     Topic = index == 3 ? null : $"We talk about the number {index} here"
+                                     Topic = index == 3 ? null : $"We talk about the number {index} here",
+                                     Type = ChannelType.Temporary
+                                 })
+                                 .Append(new Channel(new User())
+                                 {
+                                     Name = "PM channel"
                                  })
                                  .ToList();
         }
@@ -100,28 +106,11 @@ namespace osu.Game.Tests.Visual.Online
             AddAssert("Channel selector was closed", () => chatOverlay.SelectionOverlayState == Visibility.Hidden);
         }
 
-        [Test]
-        public void TestCloseChannelWhileSelectorClosed()
-        {
-            AddStep("Join channel 1", () => channelManager.JoinChannel(channel1));
-            AddStep("Join channel 2", () => channelManager.JoinChannel(channel2));
-
-            AddStep("Switch to channel 2", () => clickDrawable(chatOverlay.TabMap[channel2]));
-            AddStep("Close channel 2", () => clickDrawable(((TestPrivateChannelTabItem)chatOverlay.TabMap[channel2]).CloseButton.Child));
-
-            AddAssert("Selector remained closed", () => chatOverlay.SelectionOverlayState == Visibility.Hidden);
-            AddAssert("Current channel is channel 1", () => currentChannel == channel1);
-
-            AddStep("Close channel 1", () => clickDrawable(((TestPrivateChannelTabItem)chatOverlay.TabMap[channel1]).CloseButton.Child));
-
-            AddAssert("Selector is visible", () => chatOverlay.SelectionOverlayState == Visibility.Visible);
-        }
-
         [Test]
         public void TestSearchInSelector()
         {
-            AddStep("search for 'no. 2'", () => chatOverlay.ChildrenOfType<SearchTextBox>().First().Text = "no. 2");
-            AddUntilStep("only channel 2 visible", () =>
+            AddStep("Search for 'no. 2'", () => chatOverlay.ChildrenOfType<SearchTextBox>().First().Text = "no. 2");
+            AddUntilStep("Only channel 2 visible", () =>
             {
                 var listItems = chatOverlay.ChildrenOfType<ChannelListItem>().Where(c => c.IsPresent);
                 return listItems.Count() == 1 && listItems.Single().Channel == channel2;
@@ -131,28 +120,28 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestChannelShortcutKeys()
         {
-            AddStep("join 10 channels", () => channels.ForEach(channel => channelManager.JoinChannel(channel)));
-            AddStep("close channel selector", () =>
+            AddStep("Join channels", () => channels.ForEach(channel => channelManager.JoinChannel(channel)));
+            AddStep("Close channel selector", () =>
             {
                 InputManager.PressKey(Key.Escape);
                 InputManager.ReleaseKey(Key.Escape);
             });
-            AddUntilStep("wait for close", () => chatOverlay.SelectionOverlayState == Visibility.Hidden);
+            AddUntilStep("Wait for close", () => chatOverlay.SelectionOverlayState == Visibility.Hidden);
 
             for (int zeroBasedIndex = 0; zeroBasedIndex < 10; ++zeroBasedIndex)
             {
                 var oneBasedIndex = zeroBasedIndex + 1;
                 var targetNumberKey = oneBasedIndex % 10;
                 var targetChannel = channels[zeroBasedIndex];
-                AddStep($"press Alt+{targetNumberKey}", () => pressChannelHotkey(targetNumberKey));
-                AddAssert($"channel #{oneBasedIndex} is selected", () => currentChannel == targetChannel);
+                AddStep($"Press Alt+{targetNumberKey}", () => pressChannelHotkey(targetNumberKey));
+                AddAssert($"Channel #{oneBasedIndex} is selected", () => currentChannel == targetChannel);
             }
         }
 
         private Channel expectedChannel;
 
         [Test]
-        public void TestCloseChannelWhileActive()
+        public void TestCloseChannelBehaviour()
         {
             AddUntilStep("Join until dropdown has channels", () =>
             {
@@ -160,8 +149,11 @@ namespace osu.Game.Tests.Visual.Online
                     return true;
 
                 // Using temporary channels because they don't hide their names when not active
-                Channel toAdd = new Channel { Name = $"test channel {joinedChannels.Count()}", Type = ChannelType.Temporary };
-                channelManager.JoinChannel(toAdd);
+                channelManager.JoinChannel(new Channel
+                { 
+                    Name = $"Channel no. {joinedChannels.Count() + 1}",
+                    Type = ChannelType.Temporary 
+                });
 
                 return false;
             });
@@ -176,6 +168,7 @@ namespace osu.Game.Tests.Visual.Online
                 chatOverlay.ChannelTabControl.RemoveChannel(currentChannel);
             });
             AddAssert("Next channel selected", () => currentChannel == expectedChannel);
+            AddAssert("Selector remained closed", () => chatOverlay.SelectionOverlayState == Visibility.Hidden);
 
             // Depending on the window size, one more channel might need to be closed for the selectorTab to appear
             AddUntilStep("Close channels until selector visible", () =>
@@ -194,7 +187,7 @@ namespace osu.Game.Tests.Visual.Online
                 expectedChannel = previousChannel;
                 chatOverlay.ChannelTabControl.RemoveChannel(currentChannel);
             });
-            AddAssert("Channel changed to previous", () => currentChannel == expectedChannel);
+            AddAssert("Previous channel selected", () => currentChannel == expectedChannel);
 
             // Standard channel closing
             AddStep("Switch to previous channel", () => chatOverlay.ChannelTabControl.SwitchTab(-1));
@@ -203,7 +196,38 @@ namespace osu.Game.Tests.Visual.Online
                 expectedChannel = nextChannel;
                 chatOverlay.ChannelTabControl.RemoveChannel(currentChannel);
             });
-            AddAssert("Channel changed to next", () => currentChannel == expectedChannel);
+            AddAssert("Next channel selected", () => currentChannel == expectedChannel);
+
+            // Selector reappearing after all channels closed
+            AddUntilStep("Close all channels", () =>
+            {
+                if (!joinedChannels.Any())
+                    return true;
+                
+                chatOverlay.ChannelTabControl.RemoveChannel(joinedChannels.Last());
+                return false;
+            });
+            AddAssert("Selector is visible", () => chatOverlay.SelectionOverlayState == Visibility.Visible);
+        }
+
+        [Test]
+        public void TestChannelCloseButton()
+        {
+            AddStep("Join channels", () =>
+            {
+                channelManager.JoinChannel(channel1);
+                channelManager.JoinChannel(channelPM);
+            });
+
+            // PM channel close button only appears when active
+            AddStep("Select PM channel", () => clickDrawable(chatOverlay.TabMap[channelPM]));
+            AddStep("Click PM close button", () => clickDrawable(((TestPrivateChannelTabItem)chatOverlay.TabMap[channelPM]).CloseButton.Child));
+            AddAssert("PM channel closed", () => !channelManager.JoinedChannels.Contains(channelPM));
+
+            // Non-PM chat channel close button only appears when hovered
+            AddStep("Hover normal channel tab", () => InputManager.MoveMouseTo(chatOverlay.TabMap[channel1]));
+            AddStep("Click normal close button", () => clickDrawable(((TestChannelTabItem)chatOverlay.TabMap[channel1]).CloseButton.Child));
+            AddAssert("All channels closed", () => !channelManager.JoinedChannels.Any());
         }
 
         private void pressChannelHotkey(int number)

From 0f40671e69ea9d2baaa426f0d841223c2bb65959 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Mon, 16 Mar 2020 19:44:03 +0100
Subject: [PATCH 1104/1142] Mix normal channel tabs with PM ones

---
 .../Visual/Online/TestSceneChatOverlay.cs     | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index 03251f1d5e..02460282d8 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -47,20 +47,15 @@ namespace osu.Game.Tests.Visual.Online
         private Channel previousChannel => joinedChannels.ElementAt(joinedChannels.ToList().IndexOf(currentChannel) - 1);
         private Channel channel1 => channels[0];
         private Channel channel2 => channels[1];
-        private Channel channelPM => channels.Last();
 
         public TestSceneChatOverlay()
         {
             channels = Enumerable.Range(1, 10)
-                                 .Select(index => new Channel
+                                 .Select(index => new Channel(new User())
                                  {
                                      Name = $"Channel no. {index}",
                                      Topic = index == 3 ? null : $"We talk about the number {index} here",
-                                     Type = ChannelType.Temporary
-                                 })
-                                 .Append(new Channel(new User())
-                                 {
-                                     Name = "PM channel"
+                                     Type = index % 2 == 0 ? ChannelType.PM : ChannelType.Temporary
                                  })
                                  .ToList();
         }
@@ -150,9 +145,9 @@ namespace osu.Game.Tests.Visual.Online
 
                 // Using temporary channels because they don't hide their names when not active
                 channelManager.JoinChannel(new Channel
-                { 
+                {
                     Name = $"Channel no. {joinedChannels.Count() + 1}",
-                    Type = ChannelType.Temporary 
+                    Type = ChannelType.Temporary
                 });
 
                 return false;
@@ -203,7 +198,7 @@ namespace osu.Game.Tests.Visual.Online
             {
                 if (!joinedChannels.Any())
                     return true;
-                
+
                 chatOverlay.ChannelTabControl.RemoveChannel(joinedChannels.Last());
                 return false;
             });
@@ -213,16 +208,16 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestChannelCloseButton()
         {
-            AddStep("Join channels", () =>
+            AddStep("Join 2 channels", () =>
             {
                 channelManager.JoinChannel(channel1);
-                channelManager.JoinChannel(channelPM);
+                channelManager.JoinChannel(channel2);
             });
 
             // PM channel close button only appears when active
-            AddStep("Select PM channel", () => clickDrawable(chatOverlay.TabMap[channelPM]));
-            AddStep("Click PM close button", () => clickDrawable(((TestPrivateChannelTabItem)chatOverlay.TabMap[channelPM]).CloseButton.Child));
-            AddAssert("PM channel closed", () => !channelManager.JoinedChannels.Contains(channelPM));
+            AddStep("Select PM channel", () => clickDrawable(chatOverlay.TabMap[channel2]));
+            AddStep("Click PM close button", () => clickDrawable(((TestPrivateChannelTabItem)chatOverlay.TabMap[channel2]).CloseButton.Child));
+            AddAssert("PM channel closed", () => !channelManager.JoinedChannels.Contains(channel2));
 
             // Non-PM chat channel close button only appears when hovered
             AddStep("Hover normal channel tab", () => InputManager.MoveMouseTo(chatOverlay.TabMap[channel1]));

From 4153f8d49db453b613f7bd1ed7624892d060f3b3 Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Mon, 16 Mar 2020 21:31:22 +0100
Subject: [PATCH 1105/1142] Fix edge case making test fail

Forgot that if a PM channel was the last tab, it hid itself upon selecting due to changing its width, which made the last-visible-selected assert fail. Made this particular test only use non-PM channels.
---
 osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
index 02460282d8..6665452d94 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
@@ -146,7 +146,7 @@ namespace osu.Game.Tests.Visual.Online
                 // Using temporary channels because they don't hide their names when not active
                 channelManager.JoinChannel(new Channel
                 {
-                    Name = $"Channel no. {joinedChannels.Count() + 1}",
+                    Name = $"Channel no. {joinedChannels.Count() + 11}",
                     Type = ChannelType.Temporary
                 });
 

From f7ea20a926d9cf512ec4ec0533777336de3744c4 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 16 Mar 2020 16:32:25 -0700
Subject: [PATCH 1106/1142] Limit font weight to bold

---
 osu.Game/Graphics/OsuFont.cs                                 | 5 -----
 osu.Game/Overlays/News/NewsArticleCover.cs                   | 2 +-
 osu.Game/Overlays/Notifications/NotificationSection.cs       | 4 ++--
 osu.Game/Overlays/OSD/Toast.cs                               | 2 +-
 osu.Game/Overlays/OverlayStreamItem.cs                       | 2 +-
 osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs | 2 +-
 osu.Game/Overlays/Settings/SettingsSubsection.cs             | 2 +-
 osu.Game/Screens/Edit/Timing/ControlPointTable.cs            | 2 +-
 osu.Game/Screens/Play/Break/BreakInfo.cs                     | 2 +-
 9 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Graphics/OsuFont.cs b/osu.Game/Graphics/OsuFont.cs
index 7c78141b4d..255f7f24f7 100644
--- a/osu.Game/Graphics/OsuFont.cs
+++ b/osu.Game/Graphics/OsuFont.cs
@@ -136,10 +136,5 @@ namespace osu.Game.Graphics
         /// Equivalent to weight 700.
         /// </summary>
         Bold = 700,
-
-        /// <summary>
-        /// Equivalent to weight 900.
-        /// </summary>
-        Black = 900
     }
 }
diff --git a/osu.Game/Overlays/News/NewsArticleCover.cs b/osu.Game/Overlays/News/NewsArticleCover.cs
index e381b629e4..cca0cfb4a0 100644
--- a/osu.Game/Overlays/News/NewsArticleCover.cs
+++ b/osu.Game/Overlays/News/NewsArticleCover.cs
@@ -148,7 +148,7 @@ namespace osu.Game.Overlays.News
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
-                        Font = OsuFont.GetFont(Typeface.Torus, 12, FontWeight.Black, false, false),
+                        Font = OsuFont.GetFont(Typeface.Torus, 12, FontWeight.Bold, false, false),
                         Text = date.ToString("d MMM yyy").ToUpper(),
                         Margin = new MarginPadding
                         {
diff --git a/osu.Game/Overlays/Notifications/NotificationSection.cs b/osu.Game/Overlays/Notifications/NotificationSection.cs
index 17a2d4cf9f..c2a958b65e 100644
--- a/osu.Game/Overlays/Notifications/NotificationSection.cs
+++ b/osu.Game/Overlays/Notifications/NotificationSection.cs
@@ -84,13 +84,13 @@ namespace osu.Game.Overlays.Notifications
                                 new OsuSpriteText
                                 {
                                     Text = titleText.ToUpperInvariant(),
-                                    Font = OsuFont.GetFont(weight: FontWeight.Black)
+                                    Font = OsuFont.GetFont(weight: FontWeight.Bold)
                                 },
                                 countDrawable = new OsuSpriteText
                                 {
                                     Text = "3",
                                     Colour = colours.Yellow,
-                                    Font = OsuFont.GetFont(weight: FontWeight.Black)
+                                    Font = OsuFont.GetFont(weight: FontWeight.Bold)
                                 },
                             }
                         },
diff --git a/osu.Game/Overlays/OSD/Toast.cs b/osu.Game/Overlays/OSD/Toast.cs
index 46c53ec409..5d36cac20e 100644
--- a/osu.Game/Overlays/OSD/Toast.cs
+++ b/osu.Game/Overlays/OSD/Toast.cs
@@ -53,7 +53,7 @@ namespace osu.Game.Overlays.OSD
                 {
                     Padding = new MarginPadding(10),
                     Name = "Description",
-                    Font = OsuFont.GetFont(size: 14, weight: FontWeight.Black),
+                    Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold),
                     Spacing = new Vector2(1, 0),
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
diff --git a/osu.Game/Overlays/OverlayStreamItem.cs b/osu.Game/Overlays/OverlayStreamItem.cs
index 630d3a0a22..7f8559e7de 100644
--- a/osu.Game/Overlays/OverlayStreamItem.cs
+++ b/osu.Game/Overlays/OverlayStreamItem.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Overlays
                         new OsuSpriteText
                         {
                             Text = MainText,
-                            Font = OsuFont.GetFont(size: 12, weight: FontWeight.Black),
+                            Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
                         },
                         new OsuSpriteText
                         {
diff --git a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
index 3ab64786a2..52b712a40e 100644
--- a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
                         {
                             Text = "ACCOUNT",
                             Margin = new MarginPadding { Bottom = 5 },
-                            Font = OsuFont.GetFont(weight: FontWeight.Black),
+                            Font = OsuFont.GetFont(weight: FontWeight.Bold),
                         },
                         form = new LoginForm
                         {
diff --git a/osu.Game/Overlays/Settings/SettingsSubsection.cs b/osu.Game/Overlays/Settings/SettingsSubsection.cs
index 9b3b2f570c..b096c146a6 100644
--- a/osu.Game/Overlays/Settings/SettingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/SettingsSubsection.cs
@@ -54,7 +54,7 @@ namespace osu.Game.Overlays.Settings
                 {
                     Text = Header.ToUpperInvariant(),
                     Margin = new MarginPadding { Bottom = 10, Left = SettingsPanel.CONTENT_MARGINS, Right = SettingsPanel.CONTENT_MARGINS },
-                    Font = OsuFont.GetFont(weight: FontWeight.Black),
+                    Font = OsuFont.GetFont(weight: FontWeight.Bold),
                 },
                 FlowContent
             });
diff --git a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
index 96e3ab48f2..5c59cfbfe8 100644
--- a/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
+++ b/osu.Game/Screens/Edit/Timing/ControlPointTable.cs
@@ -152,7 +152,7 @@ namespace osu.Game.Screens.Edit.Timing
             public HeaderText(string text)
             {
                 Text = text.ToUpper();
-                Font = OsuFont.GetFont(size: 12, weight: FontWeight.Black);
+                Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold);
             }
         }
 
diff --git a/osu.Game/Screens/Play/Break/BreakInfo.cs b/osu.Game/Screens/Play/Break/BreakInfo.cs
index a3d64d05a3..6e129b20ea 100644
--- a/osu.Game/Screens/Play/Break/BreakInfo.cs
+++ b/osu.Game/Screens/Play/Break/BreakInfo.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Screens.Play.Break
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
                         Text = "current progress".ToUpperInvariant(),
-                        Font = OsuFont.GetFont(weight: FontWeight.Black, size: 15),
+                        Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 15),
                     },
                     new FillFlowContainer
                     {

From 8895d52d298b8b474ec40dd5490d0543545a2782 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Mar 2020 13:16:18 +0900
Subject: [PATCH 1107/1142] Fix header-text scaling on intro/winner screens

---
 .../Components/TestSceneRoundDisplay.cs       | 40 +++++++++++++++++++
 .../DrawableTournamentHeaderText.cs           | 11 ++---
 .../Components/RoundDisplay.cs                | 14 +++++--
 3 files changed, 57 insertions(+), 8 deletions(-)
 create mode 100644 osu.Game.Tournament.Tests/Components/TestSceneRoundDisplay.cs

diff --git a/osu.Game.Tournament.Tests/Components/TestSceneRoundDisplay.cs b/osu.Game.Tournament.Tests/Components/TestSceneRoundDisplay.cs
new file mode 100644
index 0000000000..6f71627ce4
--- /dev/null
+++ b/osu.Game.Tournament.Tests/Components/TestSceneRoundDisplay.cs
@@ -0,0 +1,40 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using osu.Framework.Graphics;
+using osu.Game.Tournament.Components;
+using osu.Game.Tournament.Models;
+
+namespace osu.Game.Tournament.Tests.Components
+{
+    public class TestSceneRoundDisplay : TournamentTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(DrawableTournamentHeaderText),
+            typeof(DrawableTournamentHeaderLogo),
+        };
+
+        public TestSceneRoundDisplay()
+        {
+            Children = new Drawable[]
+            {
+                new RoundDisplay(new TournamentMatch
+                {
+                    Round =
+                    {
+                        Value = new TournamentRound
+                        {
+                            Name = { Value = "Test Round" }
+                        }
+                    }
+                })
+                {
+                    Margin = new MarginPadding(20)
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game.Tournament/Components/DrawableTournamentHeaderText.cs b/osu.Game.Tournament/Components/DrawableTournamentHeaderText.cs
index bda696ba00..99d914fed4 100644
--- a/osu.Game.Tournament/Components/DrawableTournamentHeaderText.cs
+++ b/osu.Game.Tournament/Components/DrawableTournamentHeaderText.cs
@@ -11,9 +11,13 @@ namespace osu.Game.Tournament.Components
 {
     public class DrawableTournamentHeaderText : CompositeDrawable
     {
-        public DrawableTournamentHeaderText()
+        public DrawableTournamentHeaderText(bool center = true)
         {
-            InternalChild = new TextSprite();
+            InternalChild = new TextSprite
+            {
+                Anchor = center ? Anchor.Centre : Anchor.TopLeft,
+                Origin = center ? Anchor.Centre : Anchor.TopLeft,
+            };
 
             Height = 22;
             RelativeSizeAxes = Axes.X;
@@ -27,9 +31,6 @@ namespace osu.Game.Tournament.Components
                 RelativeSizeAxes = Axes.Both;
                 FillMode = FillMode.Fit;
 
-                Anchor = Anchor.Centre;
-                Origin = Anchor.Centre;
-
                 Texture = textures.Get("header-text");
             }
         }
diff --git a/osu.Game.Tournament/Components/RoundDisplay.cs b/osu.Game.Tournament/Components/RoundDisplay.cs
index bebede6782..c0002e6804 100644
--- a/osu.Game.Tournament/Components/RoundDisplay.cs
+++ b/osu.Game.Tournament/Components/RoundDisplay.cs
@@ -12,19 +12,27 @@ namespace osu.Game.Tournament.Components
     {
         public RoundDisplay(TournamentMatch match)
         {
-            AutoSizeAxes = Axes.Both;
+            AutoSizeAxes = Axes.Y;
+            RelativeSizeAxes = Axes.X;
 
             InternalChildren = new Drawable[]
             {
                 new FillFlowContainer
                 {
-                    AutoSizeAxes = Axes.Both,
+                    AutoSizeAxes = Axes.Y,
+                    RelativeSizeAxes = Axes.X,
                     Direction = FillDirection.Vertical,
                     Children = new Drawable[]
                     {
-                        new DrawableTournamentHeaderText(),
+                        new DrawableTournamentHeaderText(false)
+                        {
+                            Anchor = Anchor.TopLeft,
+                            Origin = Anchor.TopLeft,
+                        },
                         new TournamentSpriteText
                         {
+                            Anchor = Anchor.TopLeft,
+                            Origin = Anchor.TopLeft,
                             Text = match.Round.Value?.Name.Value ?? "Unknown Round",
                             Font = OsuFont.Torus.With(size: 26, weight: FontWeight.SemiBold)
                         },

From 99f28efc96a5b6b459a4b81ccccb8478e539fe02 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Mar 2020 13:16:52 +0900
Subject: [PATCH 1108/1142] Automatically mark the currently selected match as
 stsrated on entering gameplay screen

---
 .../Gameplay/Components/TeamScoreDisplay.cs   | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs
index 462015f004..3e60a03f92 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TeamScoreDisplay.cs
@@ -35,7 +35,9 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
         private void load(LadderInfo ladder)
         {
             currentMatch.BindTo(ladder.CurrentMatch);
-            currentMatch.BindValueChanged(matchChanged, true);
+            currentMatch.BindValueChanged(matchChanged);
+
+            updateMatch();
         }
 
         private void matchChanged(ValueChangedEvent<TournamentMatch> match)
@@ -43,10 +45,19 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             currentTeamScore.UnbindBindings();
             currentTeam.UnbindBindings();
 
-            if (match.NewValue != null)
+            Scheduler.AddOnce(updateMatch);
+        }
+
+        private void updateMatch()
+        {
+            var match = currentMatch.Value;
+
+            if (match != null)
             {
-                currentTeamScore.BindTo(teamColour == TeamColour.Red ? match.NewValue.Team1Score : match.NewValue.Team2Score);
-                currentTeam.BindTo(teamColour == TeamColour.Red ? match.NewValue.Team1 : match.NewValue.Team2);
+                match.StartMatch();
+
+                currentTeamScore.BindTo(teamColour == TeamColour.Red ? match.Team1Score : match.Team2Score);
+                currentTeam.BindTo(teamColour == TeamColour.Red ? match.Team1 : match.Team2);
             }
 
             // team may change to same team, which means score is not in a good state.

From 9e7c388202b2cdc59b4b43a0bd55e54c83ed9135 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 17 Mar 2020 16:24:33 +0900
Subject: [PATCH 1109/1142] Expose Spacing and UseFullGlyphHeight

---
 osu.Game/Graphics/Sprites/GlowingSpriteText.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/osu.Game/Graphics/Sprites/GlowingSpriteText.cs b/osu.Game/Graphics/Sprites/GlowingSpriteText.cs
index 12688da9df..4aea5aa518 100644
--- a/osu.Game/Graphics/Sprites/GlowingSpriteText.cs
+++ b/osu.Game/Graphics/Sprites/GlowingSpriteText.cs
@@ -43,6 +43,18 @@ namespace osu.Game.Graphics.Sprites
             set => blurredText.Colour = value;
         }
 
+        public Vector2 Spacing
+        {
+            get => spriteText.Spacing;
+            set => spriteText.Spacing = blurredText.Spacing = value;
+        }
+
+        public bool UseFullGlyphHeight
+        {
+            get => spriteText.UseFullGlyphHeight;
+            set => spriteText.UseFullGlyphHeight = blurredText.UseFullGlyphHeight = value;
+        }
+
         public GlowingSpriteText()
         {
             AutoSizeAxes = Axes.Both;

From d77b0acd906a3fbb1af6bf10ca1f82fff6b9c439 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 17 Mar 2020 16:25:41 +0900
Subject: [PATCH 1110/1142] Move rank colour to OsuColour

---
 osu.Game/Graphics/OsuColour.cs               | 30 +++++++++++++++++++
 osu.Game/Online/Leaderboards/DrawableRank.cs | 31 +-------------------
 2 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Graphics/OsuColour.cs b/osu.Game/Graphics/OsuColour.cs
index 984f5e52d1..f7ed55410c 100644
--- a/osu.Game/Graphics/OsuColour.cs
+++ b/osu.Game/Graphics/OsuColour.cs
@@ -3,6 +3,7 @@
 
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Game.Beatmaps;
+using osu.Game.Scoring;
 using osuTK.Graphics;
 
 namespace osu.Game.Graphics
@@ -37,6 +38,35 @@ namespace osu.Game.Graphics
             }
         }
 
+        /// <summary>
+        /// Retrieves the colour for a <see cref="ScoreRank"/>.
+        /// </summary>
+        public static Color4 ForRank(ScoreRank rank)
+        {
+            switch (rank)
+            {
+                case ScoreRank.XH:
+                case ScoreRank.X:
+                    return Color4Extensions.FromHex(@"ce1c9d");
+
+                case ScoreRank.SH:
+                case ScoreRank.S:
+                    return Color4Extensions.FromHex(@"00a8b5");
+
+                case ScoreRank.A:
+                    return Color4Extensions.FromHex(@"7cce14");
+
+                case ScoreRank.B:
+                    return Color4Extensions.FromHex(@"e3b130");
+
+                case ScoreRank.C:
+                    return Color4Extensions.FromHex(@"f18252");
+
+                default:
+                    return Color4Extensions.FromHex(@"e95353");
+            }
+        }
+
         // See https://github.com/ppy/osu-web/blob/master/resources/assets/less/colors.less
         public readonly Color4 PurpleLighter = Color4Extensions.FromHex(@"eeeeff");
         public readonly Color4 PurpleLight = Color4Extensions.FromHex(@"aa88ff");
diff --git a/osu.Game/Online/Leaderboards/DrawableRank.cs b/osu.Game/Online/Leaderboards/DrawableRank.cs
index 45b91bbf81..0c3ab25044 100644
--- a/osu.Game/Online/Leaderboards/DrawableRank.cs
+++ b/osu.Game/Online/Leaderboards/DrawableRank.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Online.Leaderboards
             FillMode = FillMode.Fit;
             FillAspectRatio = 2;
 
-            var rankColour = getRankColour();
+            var rankColour = OsuColour.ForRank(rank);
             InternalChild = new DrawSizePreservingFillContainer
             {
                 TargetDrawSize = new Vector2(64, 32),
@@ -71,35 +71,6 @@ namespace osu.Game.Online.Leaderboards
 
         private string getRankName() => rank.GetDescription().TrimEnd('+');
 
-        /// <summary>
-        ///  Retrieves the grade background colour.
-        /// </summary>
-        private Color4 getRankColour()
-        {
-            switch (rank)
-            {
-                case ScoreRank.XH:
-                case ScoreRank.X:
-                    return Color4Extensions.FromHex(@"ce1c9d");
-
-                case ScoreRank.SH:
-                case ScoreRank.S:
-                    return Color4Extensions.FromHex(@"00a8b5");
-
-                case ScoreRank.A:
-                    return Color4Extensions.FromHex(@"7cce14");
-
-                case ScoreRank.B:
-                    return Color4Extensions.FromHex(@"e3b130");
-
-                case ScoreRank.C:
-                    return Color4Extensions.FromHex(@"f18252");
-
-                default:
-                    return Color4Extensions.FromHex(@"e95353");
-            }
-        }
-
         /// <summary>
         ///  Retrieves the grade text colour.
         /// </summary>

From e586249db70e979fd884bd050019b3a0a220f3cf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 17 Mar 2020 16:25:51 +0900
Subject: [PATCH 1111/1142] Expose GetRankName from DrawableRank

---
 osu.Game/Online/Leaderboards/DrawableRank.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/DrawableRank.cs b/osu.Game/Online/Leaderboards/DrawableRank.cs
index 0c3ab25044..4d41230799 100644
--- a/osu.Game/Online/Leaderboards/DrawableRank.cs
+++ b/osu.Game/Online/Leaderboards/DrawableRank.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Online.Leaderboards
                             Padding = new MarginPadding { Top = 5 },
                             Colour = getRankNameColour(),
                             Font = OsuFont.Numeric.With(size: 25),
-                            Text = getRankName(),
+                            Text = GetRankName(rank),
                             ShadowColour = Color4.Black.Opacity(0.3f),
                             ShadowOffset = new Vector2(0, 0.08f),
                             Shadow = true,
@@ -69,7 +69,7 @@ namespace osu.Game.Online.Leaderboards
             };
         }
 
-        private string getRankName() => rank.GetDescription().TrimEnd('+');
+        public static string GetRankName(ScoreRank rank) => rank.GetDescription().TrimEnd('+');
 
         /// <summary>
         ///  Retrieves the grade text colour.

From dca2e1d816971316351eec8bb266c0019abdf188 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 17 Mar 2020 16:37:56 +0900
Subject: [PATCH 1112/1142] Implement the accuracy circle

---
 .../Visual/Ranking/TestSceneAccuracyCircle.cs | 155 +++++++++++
 .../Expanded/Accuracy/AccuracyCircle.cs       | 253 ++++++++++++++++++
 .../Ranking/Expanded/Accuracy/RankBadge.cs    |  99 +++++++
 .../Ranking/Expanded/Accuracy/RankNotch.cs    |  49 ++++
 .../Ranking/Expanded/Accuracy/RankText.cs     |  83 ++++++
 .../Accuracy/SmoothCircularProgress.cs        | 126 +++++++++
 6 files changed, 765 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
 create mode 100644 osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
 create mode 100644 osu.Game/Screens/Ranking/Expanded/Accuracy/RankBadge.cs
 create mode 100644 osu.Game/Screens/Ranking/Expanded/Accuracy/RankNotch.cs
 create mode 100644 osu.Game/Screens/Ranking/Expanded/Accuracy/RankText.cs
 create mode 100644 osu.Game/Screens/Ranking/Expanded/Accuracy/SmoothCircularProgress.cs

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
new file mode 100644
index 0000000000..d0b9d43f51
--- /dev/null
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
@@ -0,0 +1,155 @@
+// 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 NUnit.Framework;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Screens.Ranking.Expanded.Accuracy;
+using osu.Game.Tests.Beatmaps;
+using osu.Game.Users;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Ranking
+{
+    public class TestSceneAccuracyCircle : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(AccuracyCircle),
+            typeof(RankBadge),
+            typeof(RankNotch),
+            typeof(RankText),
+            typeof(SmoothCircularProgress)
+        };
+
+        [Test]
+        public void TestDRank()
+        {
+            var score = createScore();
+            score.Accuracy = 0.5;
+            score.Rank = ScoreRank.D;
+
+            addCircleStep(score);
+        }
+
+        [Test]
+        public void TestCRank()
+        {
+            var score = createScore();
+            score.Accuracy = 0.75;
+            score.Rank = ScoreRank.C;
+
+            addCircleStep(score);
+        }
+
+        [Test]
+        public void TestBRank()
+        {
+            var score = createScore();
+            score.Accuracy = 0.85;
+            score.Rank = ScoreRank.B;
+
+            addCircleStep(score);
+        }
+
+        [Test]
+        public void TestARank()
+        {
+            var score = createScore();
+            score.Accuracy = 0.925;
+            score.Rank = ScoreRank.A;
+
+            addCircleStep(score);
+        }
+
+        [Test]
+        public void TestSRank()
+        {
+            var score = createScore();
+            score.Accuracy = 0.975;
+            score.Rank = ScoreRank.S;
+
+            addCircleStep(score);
+        }
+
+        [Test]
+        public void TestAlmostSSRank()
+        {
+            var score = createScore();
+            score.Accuracy = 0.9999;
+            score.Rank = ScoreRank.S;
+
+            addCircleStep(score);
+        }
+
+        [Test]
+        public void TestSSRank()
+        {
+            var score = createScore();
+            score.Accuracy = 1;
+            score.Rank = ScoreRank.X;
+
+            addCircleStep(score);
+        }
+
+        private void addCircleStep(ScoreInfo score) => AddStep("add panel", () =>
+        {
+            Children = new Drawable[]
+            {
+                new Container
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(500, 700),
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = ColourInfo.GradientVertical(Color4Extensions.FromHex("#555"), Color4Extensions.FromHex("#333"))
+                        }
+                    }
+                },
+                new AccuracyCircle(score)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(230)
+                }
+            };
+        });
+
+        private ScoreInfo createScore() => new ScoreInfo
+        {
+            User = new User
+            {
+                Id = 2,
+                Username = "peppy",
+            },
+            Beatmap = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo,
+            Mods = new Mod[] { new OsuModHardRock(), new OsuModDoubleTime() },
+            TotalScore = 2845370,
+            Accuracy = 0.95,
+            MaxCombo = 999,
+            Rank = ScoreRank.S,
+            Date = DateTimeOffset.Now,
+            Statistics =
+            {
+                { HitResult.Miss, 1 },
+                { HitResult.Meh, 50 },
+                { HitResult.Good, 100 },
+                { HitResult.Great, 300 },
+            }
+        };
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
new file mode 100644
index 0000000000..873c20cc2b
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
@@ -0,0 +1,253 @@
+// 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.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Utils;
+using osu.Game.Graphics;
+using osu.Game.Scoring;
+using osuTK;
+
+namespace osu.Game.Screens.Ranking.Expanded.Accuracy
+{
+    /// <summary>
+    /// The component that displays the player's accuracy on the results screen.
+    /// </summary>
+    public class AccuracyCircle : CompositeDrawable
+    {
+        /// <summary>
+        /// Duration for the transforms causing this component to appear.
+        /// </summary>
+        public const double APPEAR_DURATION = 200;
+
+        /// <summary>
+        /// Delay before the accuracy circle starts filling.
+        /// </summary>
+        public const double ACCURACY_TRANSFORM_DELAY = 450;
+
+        /// <summary>
+        /// Duration for the accuracy circle fill.
+        /// </summary>
+        public const double ACCURACY_TRANSFORM_DURATION = 3000;
+
+        /// <summary>
+        /// Delay after <see cref="ACCURACY_TRANSFORM_DURATION"/> for the rank text (A/B/C/D/S/SS) to appear.
+        /// </summary>
+        public const double TEXT_APPEAR_DELAY = ACCURACY_TRANSFORM_DURATION / 2;
+
+        /// <summary>
+        /// Delay before the rank circles start filling.
+        /// </summary>
+        public const double RANK_CIRCLE_TRANSFORM_DELAY = 150;
+
+        /// <summary>
+        /// Duration for the rank circle fills.
+        /// </summary>
+        public const double RANK_CIRCLE_TRANSFORM_DURATION = 800;
+
+        /// <summary>
+        /// Relative width of the rank circles.
+        /// </summary>
+        public const float RANK_CIRCLE_RADIUS = 0.06f;
+
+        /// <summary>
+        /// Relative width of the circle showing the accuracy.
+        /// </summary>
+        private const float accuracy_circle_radius = 0.2f;
+
+        /// <summary>
+        /// SS is displayed as a 1% region, otherwise it would be invisible.
+        /// </summary>
+        private const double virtual_ss_percentage = 0.01;
+
+        /// <summary>
+        /// The easing for the circle filling transforms.
+        /// </summary>
+        public static readonly Easing ACCURACY_TRANSFORM_EASING = Easing.OutPow10;
+
+        private readonly ScoreInfo score;
+
+        private SmoothCircularProgress accuracyCircle;
+        private SmoothCircularProgress innerMask;
+        private Container<RankBadge> badges;
+        private RankText rankText;
+
+        public AccuracyCircle(ScoreInfo score)
+        {
+            this.score = score;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChildren = new Drawable[]
+            {
+                new SmoothCircularProgress
+                {
+                    Name = "Background circle",
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = OsuColour.Gray(47),
+                    Alpha = 0.5f,
+                    InnerRadius = accuracy_circle_radius + 0.01f, // Extends a little bit into the circle
+                    Current = { Value = 1 },
+                },
+                accuracyCircle = new SmoothCircularProgress
+                {
+                    Name = "Accuracy circle",
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = ColourInfo.GradientVertical(Color4Extensions.FromHex("#7CF6FF"), Color4Extensions.FromHex("#BAFFA9")),
+                    InnerRadius = accuracy_circle_radius,
+                },
+                new BufferedContainer
+                {
+                    Name = "Graded circles",
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
+                    Size = new Vector2(0.8f),
+                    Padding = new MarginPadding(2),
+                    Children = new Drawable[]
+                    {
+                        new SmoothCircularProgress
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = Color4Extensions.FromHex("#BE0089"),
+                            InnerRadius = RANK_CIRCLE_RADIUS,
+                            Current = { Value = 1 }
+                        },
+                        new SmoothCircularProgress
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = Color4Extensions.FromHex("#0096A2"),
+                            InnerRadius = RANK_CIRCLE_RADIUS,
+                            Current = { Value = 1 - virtual_ss_percentage }
+                        },
+                        new SmoothCircularProgress
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = Color4Extensions.FromHex("#72C904"),
+                            InnerRadius = RANK_CIRCLE_RADIUS,
+                            Current = { Value = 0.95f }
+                        },
+                        new SmoothCircularProgress
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = Color4Extensions.FromHex("#D99D03"),
+                            InnerRadius = RANK_CIRCLE_RADIUS,
+                            Current = { Value = 0.9f }
+                        },
+                        new SmoothCircularProgress
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = Color4Extensions.FromHex("#EA7948"),
+                            InnerRadius = RANK_CIRCLE_RADIUS,
+                            Current = { Value = 0.8f }
+                        },
+                        new SmoothCircularProgress
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = Color4Extensions.FromHex("#FF5858"),
+                            InnerRadius = RANK_CIRCLE_RADIUS,
+                            Current = { Value = 0.7f }
+                        },
+                        new RankNotch(0),
+                        new RankNotch((float)(1 - virtual_ss_percentage)),
+                        new RankNotch(0.95f),
+                        new RankNotch(0.9f),
+                        new RankNotch(0.8f),
+                        new RankNotch(0.7f),
+                        new BufferedContainer
+                        {
+                            Name = "Graded circle mask",
+                            RelativeSizeAxes = Axes.Both,
+                            Padding = new MarginPadding(1),
+                            Blending = new BlendingParameters
+                            {
+                                Source = BlendingType.DstColor,
+                                Destination = BlendingType.OneMinusSrcAlpha,
+                                SourceAlpha = BlendingType.One,
+                                DestinationAlpha = BlendingType.SrcAlpha
+                            },
+                            Child = innerMask = new SmoothCircularProgress
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                InnerRadius = RANK_CIRCLE_RADIUS - 0.01f,
+                            }
+                        }
+                    }
+                },
+                badges = new Container<RankBadge>
+                {
+                    Name = "Rank badges",
+                    RelativeSizeAxes = Axes.Both,
+                    Padding = new MarginPadding { Vertical = -15, Horizontal = -20 },
+                    Children = new[]
+                    {
+                        new RankBadge(1f, ScoreRank.X),
+                        new RankBadge(0.95f, ScoreRank.S),
+                        new RankBadge(0.9f, ScoreRank.A),
+                        new RankBadge(0.8f, ScoreRank.B),
+                        new RankBadge(0.7f, ScoreRank.C),
+                    }
+                },
+                rankText = new RankText(score.Rank)
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            this.ScaleTo(0).Then().ScaleTo(1, APPEAR_DURATION, Easing.OutQuint);
+
+            using (BeginDelayedSequence(RANK_CIRCLE_TRANSFORM_DELAY, true))
+                innerMask.FillTo(1f, RANK_CIRCLE_TRANSFORM_DURATION, ACCURACY_TRANSFORM_EASING);
+
+            using (BeginDelayedSequence(ACCURACY_TRANSFORM_DELAY, true))
+            {
+                double targetAccuracy = score.Rank == ScoreRank.X || score.Rank == ScoreRank.XH ? 1 : Math.Min(1 - virtual_ss_percentage, score.Accuracy);
+
+                accuracyCircle.FillTo(targetAccuracy, ACCURACY_TRANSFORM_DURATION, ACCURACY_TRANSFORM_EASING);
+
+                foreach (var badge in badges)
+                {
+                    if (badge.Accuracy > score.Accuracy)
+                        continue;
+
+                    using (BeginDelayedSequence(inverseEasing(ACCURACY_TRANSFORM_EASING, badge.Accuracy / targetAccuracy) * ACCURACY_TRANSFORM_DURATION, true))
+                        badge.Appear();
+                }
+
+                using (BeginDelayedSequence(TEXT_APPEAR_DELAY, true))
+                    rankText.Appear();
+            }
+        }
+
+        private double inverseEasing(Easing easing, double targetValue)
+        {
+            double test = 0;
+            double result = 0;
+            int count = 2;
+
+            while (Math.Abs(result - targetValue) > 0.005)
+            {
+                int dir = Math.Sign(targetValue - result);
+
+                test += dir * 1.0 / count;
+                result = Interpolation.ApplyEasing(easing, test);
+
+                count++;
+            }
+
+            return test;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/RankBadge.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/RankBadge.cs
new file mode 100644
index 0000000000..76cd408daa
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/RankBadge.cs
@@ -0,0 +1,99 @@
+// 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.Effects;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Online.Leaderboards;
+using osu.Game.Scoring;
+using osuTK;
+
+namespace osu.Game.Screens.Ranking.Expanded.Accuracy
+{
+    /// <summary>
+    /// Contains a <see cref="DrawableRank"/> that is positioned around the <see cref="AccuracyCircle"/>.
+    /// </summary>
+    public class RankBadge : CompositeDrawable
+    {
+        /// <summary>
+        /// The accuracy value corresponding to the <see cref="ScoreRank"/> displayed by this badge.
+        /// </summary>
+        public readonly float Accuracy;
+
+        private readonly ScoreRank rank;
+
+        private Drawable rankContainer;
+        private Drawable overlay;
+
+        /// <summary>
+        /// Creates a new <see cref="RankBadge"/>.
+        /// </summary>
+        /// <param name="accuracy">The accuracy value corresponding to <paramref name="rank"/>.</param>
+        /// <param name="rank">The <see cref="ScoreRank"/> to be displayed in this <see cref="RankBadge"/>.</param>
+        public RankBadge(float accuracy, ScoreRank rank)
+        {
+            Accuracy = accuracy;
+            this.rank = rank;
+
+            RelativeSizeAxes = Axes.Both;
+            Alpha = 0;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChild = rankContainer = new Container
+            {
+                Origin = Anchor.Centre,
+                Size = new Vector2(28, 14),
+                Children = new[]
+                {
+                    new DrawableRank(rank),
+                    overlay = new CircularContainer
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Blending = BlendingParameters.Additive,
+                        Masking = true,
+                        EdgeEffect = new EdgeEffectParameters
+                        {
+                            Type = EdgeEffectType.Glow,
+                            Colour = OsuColour.ForRank(rank).Opacity(0.2f),
+                            Radius = 10,
+                        },
+                        Child = new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Alpha = 0,
+                            AlwaysPresent = true,
+                        }
+                    }
+                }
+            };
+        }
+
+        /// <summary>
+        /// Shows this <see cref="RankBadge"/>.
+        /// </summary>
+        public void Appear()
+        {
+            this.FadeIn(50);
+            overlay.FadeIn().FadeOut(500, Easing.In);
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            // Starts at -90deg (top) and moves counter-clockwise by the accuracy
+            rankContainer.Position = circlePosition(-MathF.PI / 2 - (1 - Accuracy) * MathF.PI * 2);
+        }
+
+        private Vector2 circlePosition(float t)
+            => DrawSize / 2 + new Vector2(MathF.Cos(t), MathF.Sin(t)) * DrawSize / 2;
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/RankNotch.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/RankNotch.cs
new file mode 100644
index 0000000000..894790b5b6
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/RankNotch.cs
@@ -0,0 +1,49 @@
+// 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 osuTK;
+
+namespace osu.Game.Screens.Ranking.Expanded.Accuracy
+{
+    /// <summary>
+    /// A solid "notch" of the <see cref="AccuracyCircle"/> that appears at the ends of the rank circles to add separation.
+    /// </summary>
+    public class RankNotch : CompositeDrawable
+    {
+        private readonly float position;
+
+        public RankNotch(float position)
+        {
+            this.position = position;
+
+            RelativeSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChild = new Container
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                RelativeSizeAxes = Axes.Both,
+                Rotation = position * 360f,
+                Child = new Box
+                {
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.TopCentre,
+                    RelativeSizeAxes = Axes.Y,
+                    Height = AccuracyCircle.RANK_CIRCLE_RADIUS,
+                    Width = 1f,
+                    Colour = OsuColour.Gray(0.3f),
+                    EdgeSmoothness = new Vector2(1f)
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/RankText.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/RankText.cs
new file mode 100644
index 0000000000..b803fe6022
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/RankText.cs
@@ -0,0 +1,83 @@
+// 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.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Online.Leaderboards;
+using osu.Game.Scoring;
+using osuTK;
+
+namespace osu.Game.Screens.Ranking.Expanded.Accuracy
+{
+    /// <summary>
+    /// The text that appears in the middle of the <see cref="AccuracyCircle"/> displaying the user's rank.
+    /// </summary>
+    public class RankText : CompositeDrawable
+    {
+        private readonly ScoreRank rank;
+
+        private Drawable flash;
+
+        public RankText(ScoreRank rank)
+        {
+            this.rank = rank;
+
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
+            Alpha = 0;
+            AutoSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChildren = new[]
+            {
+                new GlowingSpriteText
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Spacing = new Vector2(-15, 0),
+                    Text = DrawableRank.GetRankName(rank),
+                    Font = OsuFont.Numeric.With(size: 76),
+                    UseFullGlyphHeight = false
+                },
+                flash = new BufferedContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    BlurSigma = new Vector2(35),
+                    BypassAutoSizeAxes = Axes.Both,
+                    RelativeSizeAxes = Axes.Both,
+                    Blending = BlendingParameters.Additive,
+                    Size = new Vector2(2f),
+                    Scale = new Vector2(1.8f),
+                    Children = new[]
+                    {
+                        new OsuSpriteText
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            Spacing = new Vector2(-15, 0),
+                            Text = DrawableRank.GetRankName(rank),
+                            Font = OsuFont.Numeric.With(size: 76),
+                            UseFullGlyphHeight = false,
+                            Shadow = false
+                        },
+                    },
+                },
+            };
+        }
+
+        public void Appear()
+        {
+            this.FadeIn(0, Easing.In);
+
+            flash.FadeIn(0, Easing.In).Then().FadeOut(800, Easing.OutQuint);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/SmoothCircularProgress.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/SmoothCircularProgress.cs
new file mode 100644
index 0000000000..106af31cae
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/SmoothCircularProgress.cs
@@ -0,0 +1,126 @@
+// 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.Bindables;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Transforms;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics;
+using osuTK;
+
+namespace osu.Game.Screens.Ranking.Expanded.Accuracy
+{
+    /// <summary>
+    /// Contains a <see cref="CircularProgress"/> with smoothened edges.
+    /// </summary>
+    public class SmoothCircularProgress : CompositeDrawable
+    {
+        public Bindable<double> Current
+        {
+            get => progress.Current;
+            set => progress.Current = value;
+        }
+
+        public float InnerRadius
+        {
+            get => progress.InnerRadius;
+            set
+            {
+                progress.InnerRadius = value;
+                innerSmoothingContainer.Size = new Vector2(1 - value);
+                smoothingWedge.Height = value / 2;
+            }
+        }
+
+        private readonly CircularProgress progress;
+        private readonly Container innerSmoothingContainer;
+        private readonly Drawable smoothingWedge;
+
+        public SmoothCircularProgress()
+        {
+            Container smoothingWedgeContainer;
+
+            InternalChild = new BufferedContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Children = new Drawable[]
+                {
+                    progress = new CircularProgress { RelativeSizeAxes = Axes.Both },
+                    smoothingWedgeContainer = new Container
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Both,
+                        Child = smoothingWedge = new Box
+                        {
+                            Anchor = Anchor.TopCentre,
+                            Origin = Anchor.TopCentre,
+                            RelativeSizeAxes = Axes.Y,
+                            Width = 1f,
+                            EdgeSmoothness = new Vector2(2, 0),
+                        }
+                    },
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Padding = new MarginPadding(-1),
+                        Child = new CircularContainer
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            BorderThickness = 2,
+                            Masking = true,
+                            BorderColour = OsuColour.Gray(0.5f).Opacity(0.75f),
+                            Blending = new BlendingParameters
+                            {
+                                AlphaEquation = BlendingEquation.ReverseSubtract,
+                            },
+                            Child = new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Alpha = 0,
+                                AlwaysPresent = true
+                            }
+                        }
+                    },
+                    innerSmoothingContainer = new Container
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        RelativeSizeAxes = Axes.Both,
+                        Size = Vector2.Zero,
+                        Padding = new MarginPadding(-1),
+                        Child = new CircularContainer
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            BorderThickness = 2,
+                            BorderColour = OsuColour.Gray(0.5f).Opacity(0.75f),
+                            Masking = true,
+                            Blending = new BlendingParameters
+                            {
+                                AlphaEquation = BlendingEquation.ReverseSubtract,
+                            },
+                            Child = new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Alpha = 0,
+                                AlwaysPresent = true
+                            }
+                        }
+                    },
+                }
+            };
+
+            Current.BindValueChanged(c =>
+            {
+                smoothingWedgeContainer.Alpha = c.NewValue > 0 ? 1 : 0;
+                smoothingWedgeContainer.Rotation = (float)(360 * c.NewValue);
+            }, true);
+        }
+
+        public TransformSequence<CircularProgress> FillTo(double newValue, double duration = 0, Easing easing = Easing.None)
+            => progress.FillTo(newValue, duration, easing);
+    }
+}

From daa5e63d0d40e79787fed6d5729c9382854808b7 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 17 Mar 2020 16:42:55 +0900
Subject: [PATCH 1113/1142] Fix replay scores not being populated via player

---
 osu.Game/Screens/Play/Player.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index bcadba14af..79f92c3762 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -401,14 +401,18 @@ namespace osu.Game.Screens.Play
 
         protected virtual ScoreInfo CreateScore()
         {
-            var score = DrawableRuleset.ReplayScore?.ScoreInfo ?? new ScoreInfo
+            var score = new ScoreInfo
             {
                 Beatmap = Beatmap.Value.BeatmapInfo,
                 Ruleset = rulesetInfo,
                 Mods = Mods.Value.ToArray(),
-                User = api.LocalUser.Value,
             };
 
+            if (DrawableRuleset.ReplayScore != null)
+                score.User = DrawableRuleset.ReplayScore.ScoreInfo?.User ?? new GuestUser();
+            else
+                score.User = api.LocalUser.Value;
+
             ScoreProcessor.PopulateScore(score);
 
             return score;

From d322c8c2d76b9030838cdaf3ad8a0543699ae539 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Mar 2020 16:47:23 +0900
Subject: [PATCH 1114/1142] Update framework

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 66a1523843..942970c890 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.315.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.314.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.317.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 647f05b428..54f1ad2845 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.315.0" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.314.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.317.0" />
     <PackageReference Include="Sentry" Version="2.1.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
diff --git a/osu.iOS.props b/osu.iOS.props
index 0e5c64cf0f..816a430b52 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.315.0" />
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.314.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.317.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
   <ItemGroup Label="Transitive Dependencies">
@@ -79,7 +79,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.314.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.317.0" />
     <PackageReference Include="SharpCompress" Version="0.24.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />

From 05789e6fe4c91b20edb3ce3bcdb3a8c4e6c986d6 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 17 Mar 2020 16:59:34 +0900
Subject: [PATCH 1115/1142] Implement the score panel

---
 .../Visual/Ranking/TestSceneScorePanel.cs     | 143 +++++++++++
 .../Expanded/ExpandedPanelMiddleContent.cs    |  15 ++
 .../Expanded/ExpandedPanelTopContent.cs       |  15 ++
 osu.Game/Screens/Ranking/PanelState.cs        |  11 +
 osu.Game/Screens/Ranking/ScorePanel.cs        | 223 ++++++++++++++++++
 5 files changed, 407 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
 create mode 100644 osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
 create mode 100644 osu.Game/Screens/Ranking/Expanded/ExpandedPanelTopContent.cs
 create mode 100644 osu.Game/Screens/Ranking/PanelState.cs
 create mode 100644 osu.Game/Screens/Ranking/ScorePanel.cs

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
new file mode 100644
index 0000000000..1e55885385
--- /dev/null
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneScorePanel.cs
@@ -0,0 +1,143 @@
+// 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 NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Screens.Ranking;
+using osu.Game.Screens.Ranking.Expanded;
+using osu.Game.Tests.Beatmaps;
+using osu.Game.Users;
+
+namespace osu.Game.Tests.Visual.Ranking
+{
+    public class TestSceneScorePanel : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(ScorePanel),
+            typeof(PanelState),
+            typeof(ExpandedPanelMiddleContent),
+            typeof(ExpandedPanelTopContent),
+        };
+
+        [Test]
+        public void TestDRank()
+        {
+            var score = createScore();
+            score.Accuracy = 0.5;
+            score.Rank = ScoreRank.D;
+
+            addPanelStep(score);
+        }
+
+        [Test]
+        public void TestCRank()
+        {
+            var score = createScore();
+            score.Accuracy = 0.75;
+            score.Rank = ScoreRank.C;
+
+            addPanelStep(score);
+        }
+
+        [Test]
+        public void TestBRank()
+        {
+            var score = createScore();
+            score.Accuracy = 0.85;
+            score.Rank = ScoreRank.B;
+
+            addPanelStep(score);
+        }
+
+        [Test]
+        public void TestARank()
+        {
+            var score = createScore();
+            score.Accuracy = 0.925;
+            score.Rank = ScoreRank.A;
+
+            addPanelStep(score);
+        }
+
+        [Test]
+        public void TestSRank()
+        {
+            var score = createScore();
+            score.Accuracy = 0.975;
+            score.Rank = ScoreRank.S;
+
+            addPanelStep(score);
+        }
+
+        [Test]
+        public void TestAlmostSSRank()
+        {
+            var score = createScore();
+            score.Accuracy = 0.9999;
+            score.Rank = ScoreRank.S;
+
+            addPanelStep(score);
+        }
+
+        [Test]
+        public void TestSSRank()
+        {
+            var score = createScore();
+            score.Accuracy = 1;
+            score.Rank = ScoreRank.X;
+
+            addPanelStep(score);
+        }
+
+        [Test]
+        public void TestAllHitResults()
+        {
+            var score = createScore();
+            score.Statistics[HitResult.Perfect] = 350;
+            score.Statistics[HitResult.Ok] = 200;
+
+            addPanelStep(score);
+        }
+
+        private void addPanelStep(ScoreInfo score) => AddStep("add panel", () =>
+        {
+            Child = new ScorePanel(score)
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                State = PanelState.Expanded
+            };
+        });
+
+        private ScoreInfo createScore() => new ScoreInfo
+        {
+            User = new User
+            {
+                Id = 2,
+                Username = "peppy",
+            },
+            Beatmap = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo,
+            Mods = new Mod[] { new OsuModHardRock(), new OsuModDoubleTime() },
+            TotalScore = 2845370,
+            Accuracy = 0.95,
+            MaxCombo = 999,
+            Rank = ScoreRank.S,
+            Date = DateTimeOffset.Now,
+            Statistics =
+            {
+                { HitResult.Miss, 1 },
+                { HitResult.Meh, 50 },
+                { HitResult.Good, 100 },
+                { HitResult.Great, 300 },
+            }
+        };
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
new file mode 100644
index 0000000000..c41829051a
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -0,0 +1,15 @@
+// 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.Game.Scoring;
+
+namespace osu.Game.Screens.Ranking.Expanded
+{
+    public class ExpandedPanelMiddleContent : CompositeDrawable
+    {
+        public ExpandedPanelMiddleContent(ScoreInfo score)
+        {
+        }
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelTopContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelTopContent.cs
new file mode 100644
index 0000000000..064d1ed7b9
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelTopContent.cs
@@ -0,0 +1,15 @@
+// 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.Game.Users;
+
+namespace osu.Game.Screens.Ranking.Expanded
+{
+    public class ExpandedPanelTopContent : CompositeDrawable
+    {
+        public ExpandedPanelTopContent(User user)
+        {
+        }
+    }
+}
diff --git a/osu.Game/Screens/Ranking/PanelState.cs b/osu.Game/Screens/Ranking/PanelState.cs
new file mode 100644
index 0000000000..94e2c7cef4
--- /dev/null
+++ b/osu.Game/Screens/Ranking/PanelState.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.Screens.Ranking
+{
+    public enum PanelState
+    {
+        Expanded,
+        Contracted
+    }
+}
diff --git a/osu.Game/Screens/Ranking/ScorePanel.cs b/osu.Game/Screens/Ranking/ScorePanel.cs
new file mode 100644
index 0000000000..a1adfcc500
--- /dev/null
+++ b/osu.Game/Screens/Ranking/ScorePanel.cs
@@ -0,0 +1,223 @@
+// 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;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Scoring;
+using osu.Game.Screens.Ranking.Expanded;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Ranking
+{
+    public class ScorePanel : CompositeDrawable, IStateful<PanelState>
+    {
+        /// <summary>
+        /// Width of the panel when contracted.
+        /// </summary>
+        private const float contracted_width = 160;
+
+        /// <summary>
+        /// Height of the panel when contracted.
+        /// </summary>
+        private const float contracted_height = 320;
+
+        /// <summary>
+        /// Width of the panel when expanded.
+        /// </summary>
+        private const float expanded_width = 360;
+
+        /// <summary>
+        /// Height of the panel when expanded.
+        /// </summary>
+        private const float expanded_height = 560;
+
+        /// <summary>
+        /// Height of the top layer when the panel is expanded.
+        /// </summary>
+        private const float expanded_top_layer_height = 53;
+
+        /// <summary>
+        /// Height of the top layer when the panel is contracted.
+        /// </summary>
+        private const float contracted_top_layer_height = 40;
+
+        /// <summary>
+        /// Duration for the panel to resize into its expanded/contracted size.
+        /// </summary>
+        private const double resize_duration = 200;
+
+        /// <summary>
+        /// Delay after <see cref="resize_duration"/> before the top layer is expanded.
+        /// </summary>
+        private const double top_layer_expand_delay = 100;
+
+        /// <summary>
+        /// Duration for the top layer expansion.
+        /// </summary>
+        private const double top_layer_expand_duration = 200;
+
+        /// <summary>
+        /// Duration for the panel contents to fade in.
+        /// </summary>
+        private const double content_fade_duration = 50;
+
+        private static readonly ColourInfo expanded_top_layer_colour = ColourInfo.GradientVertical(Color4Extensions.FromHex("#444"), Color4Extensions.FromHex("#333"));
+        private static readonly ColourInfo expanded_middle_layer_colour = ColourInfo.GradientVertical(Color4Extensions.FromHex("#555"), Color4Extensions.FromHex("#333"));
+        private static readonly Color4 contracted_top_layer_colour = Color4Extensions.FromHex("#353535");
+        private static readonly Color4 contracted_middle_layer_colour = Color4Extensions.FromHex("#444");
+
+        public event Action<PanelState> StateChanged;
+
+        private readonly ScoreInfo score;
+
+        private Container topLayerContainer;
+        private Drawable topLayerBackground;
+        private Container topLayerContentContainer;
+        private Drawable topLayerContent;
+
+        private Container middleLayerContainer;
+        private Drawable middleLayerBackground;
+        private Container middleLayerContentContainer;
+        private Drawable middleLayerContent;
+
+        public ScorePanel(ScoreInfo score)
+        {
+            this.score = score;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChildren = new Drawable[]
+            {
+                topLayerContainer = new Container
+                {
+                    Name = "Top layer",
+                    RelativeSizeAxes = Axes.X,
+                    Height = 120,
+                    Children = new Drawable[]
+                    {
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            CornerRadius = 20,
+                            CornerExponent = 2.5f,
+                            Masking = true,
+                            Child = topLayerBackground = new Box { RelativeSizeAxes = Axes.Both }
+                        },
+                        topLayerContentContainer = new Container { RelativeSizeAxes = Axes.Both }
+                    }
+                },
+                middleLayerContainer = new Container
+                {
+                    Name = "Middle layer",
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            CornerRadius = 20,
+                            CornerExponent = 2.5f,
+                            Masking = true,
+                            Child = middleLayerBackground = new Box { RelativeSizeAxes = Axes.Both }
+                        },
+                        middleLayerContentContainer = new Container { RelativeSizeAxes = Axes.Both }
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            if (state == PanelState.Expanded)
+            {
+                topLayerBackground.FadeColour(expanded_top_layer_colour);
+                middleLayerBackground.FadeColour(expanded_middle_layer_colour);
+            }
+            else
+            {
+                topLayerBackground.FadeColour(contracted_top_layer_colour);
+                middleLayerBackground.FadeColour(contracted_middle_layer_colour);
+            }
+
+            updateState();
+        }
+
+        private PanelState state = PanelState.Contracted;
+
+        public PanelState State
+        {
+            get => state;
+            set
+            {
+                if (state == value)
+                    return;
+
+                state = value;
+
+                if (LoadState >= LoadState.Ready)
+                    updateState();
+
+                StateChanged?.Invoke(value);
+            }
+        }
+
+        private void updateState()
+        {
+            topLayerContainer.MoveToY(0, resize_duration, Easing.OutQuint);
+            middleLayerContainer.MoveToY(0, resize_duration, Easing.OutQuint);
+
+            topLayerContent?.FadeOut(content_fade_duration).Expire();
+            middleLayerContent?.FadeOut(content_fade_duration).Expire();
+
+            switch (state)
+            {
+                case PanelState.Expanded:
+                    this.ResizeTo(new Vector2(expanded_width, expanded_height), resize_duration, Easing.OutQuint);
+
+                    topLayerBackground.FadeColour(expanded_top_layer_colour, resize_duration, Easing.OutQuint);
+                    middleLayerBackground.FadeColour(expanded_middle_layer_colour, resize_duration, Easing.OutQuint);
+
+                    topLayerContentContainer.Add(middleLayerContent = new ExpandedPanelTopContent(score.User).With(d => d.Alpha = 0));
+                    middleLayerContentContainer.Add(topLayerContent = new ExpandedPanelMiddleContent(score).With(d => d.Alpha = 0));
+                    break;
+
+                case PanelState.Contracted:
+                    this.ResizeTo(new Vector2(contracted_width, contracted_height), resize_duration, Easing.OutQuint);
+
+                    topLayerBackground.FadeColour(contracted_top_layer_colour, resize_duration, Easing.OutQuint);
+                    middleLayerBackground.FadeColour(contracted_middle_layer_colour, resize_duration, Easing.OutQuint);
+                    break;
+            }
+
+            using (BeginDelayedSequence(resize_duration + top_layer_expand_delay, true))
+            {
+                switch (state)
+                {
+                    case PanelState.Expanded:
+                        topLayerContainer.MoveToY(-expanded_top_layer_height / 2, top_layer_expand_duration, Easing.OutQuint);
+                        middleLayerContainer.MoveToY(expanded_top_layer_height / 2, top_layer_expand_duration, Easing.OutQuint);
+                        break;
+
+                    case PanelState.Contracted:
+                        topLayerContainer.MoveToY(-contracted_top_layer_height / 2, top_layer_expand_duration, Easing.OutQuint);
+                        middleLayerContainer.MoveToY(contracted_top_layer_height / 2, top_layer_expand_duration, Easing.OutQuint);
+                        break;
+                }
+
+                topLayerContent?.FadeIn(content_fade_duration);
+                middleLayerContent?.FadeIn(content_fade_duration);
+            }
+        }
+    }
+}

From 7cc1a6040fca3fff5f6870252662c3f4e575086c Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 17 Mar 2020 17:01:38 +0900
Subject: [PATCH 1116/1142] Implement top panel contents

---
 .../TestSceneExpandedPanelTopContent.cs       | 35 ++++++++++++++++
 .../Expanded/ExpandedPanelTopContent.cs       | 42 +++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelTopContent.cs

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelTopContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelTopContent.cs
new file mode 100644
index 0000000000..afaa607099
--- /dev/null
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelTopContent.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 osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Screens.Ranking.Expanded;
+using osu.Game.Users;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Ranking
+{
+    public class TestSceneExpandedPanelTopContent : OsuTestScene
+    {
+        public TestSceneExpandedPanelTopContent()
+        {
+            Child = new Container
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(500, 200),
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4Extensions.FromHex("#444"),
+                    },
+                    new ExpandedPanelTopContent(new User { Id = 2, Username = "peppy" }),
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelTopContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelTopContent.cs
index 064d1ed7b9..a9853c217c 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelTopContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelTopContent.cs
@@ -1,15 +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 osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
 using osu.Game.Users;
+using osu.Game.Users.Drawables;
+using osuTK;
 
 namespace osu.Game.Screens.Ranking.Expanded
 {
     public class ExpandedPanelTopContent : CompositeDrawable
     {
+        private readonly User user;
+
         public ExpandedPanelTopContent(User user)
         {
+            this.user = user;
+            Anchor = Anchor.TopCentre;
+            Origin = Anchor.Centre;
+
+            AutoSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChild = new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Vertical,
+                Children = new Drawable[]
+                {
+                    new UpdateableAvatar(user)
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        Size = new Vector2(80),
+                        CornerRadius = 20,
+                        CornerExponent = 2.5f,
+                        Masking = true,
+                    },
+                    new OsuSpriteText
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        Text = user.Username,
+                        Font = OsuFont.Torus.With(size: 16, weight: FontWeight.SemiBold)
+                    }
+                }
+            };
         }
     }
 }

From e56d0f2eeaaed4fce4faded742b5fdb6ac3b93d2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 17 Mar 2020 17:16:10 +0900
Subject: [PATCH 1117/1142] Add black font weighting

---
 osu.Game/Graphics/OsuFont.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/osu.Game/Graphics/OsuFont.cs b/osu.Game/Graphics/OsuFont.cs
index 255f7f24f7..7c78141b4d 100644
--- a/osu.Game/Graphics/OsuFont.cs
+++ b/osu.Game/Graphics/OsuFont.cs
@@ -136,5 +136,10 @@ namespace osu.Game.Graphics
         /// Equivalent to weight 700.
         /// </summary>
         Bold = 700,
+
+        /// <summary>
+        /// Equivalent to weight 900.
+        /// </summary>
+        Black = 900
     }
 }

From 1521f25c96eec4c30119252d7a51311794a1c580 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 17 Mar 2020 17:25:24 +0900
Subject: [PATCH 1118/1142] Implement middle panel contents

---
 .../TestSceneExpandedPanelMiddleContent.cs    |  80 +++++++
 .../Expanded/ExpandedPanelMiddleContent.cs    | 204 ++++++++++++++++++
 .../Ranking/Expanded/StarRatingDisplay.cs     |  95 ++++++++
 .../Expanded/Statistics/AccuracyStatistic.cs  |  51 +++++
 .../Expanded/Statistics/ComboStatistic.cs     |  66 ++++++
 .../Expanded/Statistics/CounterStatistic.cs   |  48 +++++
 .../Expanded/Statistics/StatisticDisplay.cs   |  82 +++++++
 .../Ranking/Expanded/TotalScoreCounter.cs     |  35 +++
 8 files changed, 661 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
 create mode 100644 osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
 create mode 100644 osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs
 create mode 100644 osu.Game/Screens/Ranking/Expanded/Statistics/ComboStatistic.cs
 create mode 100644 osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
 create mode 100644 osu.Game/Screens/Ranking/Expanded/Statistics/StatisticDisplay.cs
 create mode 100644 osu.Game/Screens/Ranking/Expanded/TotalScoreCounter.cs

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
new file mode 100644
index 0000000000..665b3ad455
--- /dev/null
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.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 System;
+using System.Collections.Generic;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Screens.Ranking.Expanded;
+using osu.Game.Screens.Ranking.Expanded.Accuracy;
+using osu.Game.Screens.Ranking.Expanded.Statistics;
+using osu.Game.Tests.Beatmaps;
+using osu.Game.Users;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.Ranking
+{
+    public class TestSceneExpandedPanelMiddleContent : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(ExpandedPanelMiddleContent),
+            typeof(AccuracyCircle),
+            typeof(AccuracyStatistic),
+            typeof(ComboStatistic),
+            typeof(CounterStatistic),
+            typeof(StarRatingDisplay),
+            typeof(StatisticDisplay),
+            typeof(TotalScoreCounter)
+        };
+
+        public TestSceneExpandedPanelMiddleContent()
+        {
+            Child = new Container
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Size = new Vector2(500, 700),
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4Extensions.FromHex("#444"),
+                    },
+                    new ExpandedPanelMiddleContent(createTestScore())
+                }
+            };
+        }
+
+        private ScoreInfo createTestScore() => new ScoreInfo
+        {
+            User = new User
+            {
+                Id = 2,
+                Username = "peppy",
+            },
+            Beatmap = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo,
+            Mods = new Mod[] { new OsuModHardRock(), new OsuModDoubleTime() },
+            TotalScore = 999999,
+            Accuracy = 0.95,
+            MaxCombo = 999,
+            Rank = ScoreRank.S,
+            Date = DateTimeOffset.Now,
+            Statistics =
+            {
+                { HitResult.Miss, 1 },
+                { HitResult.Meh, 50 },
+                { HitResult.Good, 100 },
+                { HitResult.Great, 300 },
+            }
+        };
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index c41829051a..4f45b1c5d7 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -1,15 +1,219 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Localisation;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Scoring;
+using osu.Game.Screens.Play.HUD;
+using osu.Game.Screens.Ranking.Expanded.Accuracy;
+using osu.Game.Screens.Ranking.Expanded.Statistics;
+using osuTK;
 
 namespace osu.Game.Screens.Ranking.Expanded
 {
     public class ExpandedPanelMiddleContent : CompositeDrawable
     {
+        private readonly ScoreInfo score;
+
+        private readonly List<StatisticDisplay> statisticDisplays = new List<StatisticDisplay>();
+        private RollingCounter<long> scoreCounter;
+
         public ExpandedPanelMiddleContent(ScoreInfo score)
         {
+            this.score = score;
+
+            RelativeSizeAxes = Axes.Both;
+            Masking = true;
+
+            Padding = new MarginPadding { Vertical = 10, Horizontal = 10 };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            var topStatistics = new List<StatisticDisplay>
+            {
+                new AccuracyStatistic(score.Accuracy),
+                new ComboStatistic(score.MaxCombo, true),
+                new CounterStatistic("pp", (int)(score.PP ?? 0)),
+            };
+
+            var bottomStatistics = new List<StatisticDisplay>();
+            foreach (var stat in score.SortedStatistics)
+                bottomStatistics.Add(new CounterStatistic(stat.Key.GetDescription(), stat.Value));
+
+            statisticDisplays.AddRange(topStatistics);
+            statisticDisplays.AddRange(bottomStatistics);
+
+            InternalChild = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Direction = FillDirection.Vertical,
+                Spacing = new Vector2(20),
+                Children = new Drawable[]
+                {
+                    new FillFlowContainer
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
+                        Children = new Drawable[]
+                        {
+                            new OsuSpriteText
+                            {
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.TopCentre,
+                                Text = new LocalisedString((score.Beatmap.Metadata.Title, score.Beatmap.Metadata.TitleUnicode)),
+                                Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
+                            },
+                            new OsuSpriteText
+                            {
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.TopCentre,
+                                Text = new LocalisedString((score.Beatmap.Metadata.Artist, score.Beatmap.Metadata.ArtistUnicode)),
+                                Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold)
+                            },
+                            new Container
+                            {
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.TopCentre,
+                                Margin = new MarginPadding { Top = 40 },
+                                RelativeSizeAxes = Axes.X,
+                                Height = 230,
+                                Child = new AccuracyCircle(score)
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    RelativeSizeAxes = Axes.Both,
+                                    FillMode = FillMode.Fit,
+                                }
+                            },
+                            scoreCounter = new TotalScoreCounter
+                            {
+                                Margin = new MarginPadding { Top = 0, Bottom = 5 },
+                                Current = { Value = 0 },
+                                Alpha = 0,
+                                AlwaysPresent = true
+                            },
+                            new FillFlowContainer
+                            {
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.TopCentre,
+                                AutoSizeAxes = Axes.Both,
+                                Children = new Drawable[]
+                                {
+                                    new StarRatingDisplay(score.Beatmap)
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft
+                                    },
+                                    new ModDisplay
+                                    {
+                                        Anchor = Anchor.CentreLeft,
+                                        Origin = Anchor.CentreLeft,
+                                        DisplayUnrankedText = false,
+                                        ExpansionMode = ExpansionMode.AlwaysExpanded,
+                                        Scale = new Vector2(0.5f),
+                                        Current = { Value = score.Mods }
+                                    }
+                                }
+                            },
+                            new FillFlowContainer
+                            {
+                                Anchor = Anchor.TopCentre,
+                                Origin = Anchor.TopCentre,
+                                Direction = FillDirection.Vertical,
+                                AutoSizeAxes = Axes.Both,
+                                Children = new Drawable[]
+                                {
+                                    new OsuSpriteText
+                                    {
+                                        Anchor = Anchor.TopCentre,
+                                        Origin = Anchor.TopCentre,
+                                        Text = score.Beatmap.Version,
+                                        Font = OsuFont.Torus.With(size: 16, weight: FontWeight.SemiBold),
+                                    },
+                                    new OsuTextFlowContainer(s => s.Font = OsuFont.Torus.With(size: 12))
+                                    {
+                                        AutoSizeAxes = Axes.Both,
+                                        Direction = FillDirection.Horizontal,
+                                    }.With(t =>
+                                    {
+                                        t.AddText("mapped by ");
+                                        t.AddText(score.UserString, s => s.Font = s.Font.With(weight: FontWeight.SemiBold));
+                                    })
+                                }
+                            },
+                        }
+                    },
+                    new FillFlowContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        AutoSizeAxes = Axes.Y,
+                        Direction = FillDirection.Vertical,
+                        Spacing = new Vector2(0, 5),
+                        Children = new Drawable[]
+                        {
+                            new GridContainer
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                                Content = new[] { topStatistics.Cast<Drawable>().ToArray() },
+                                RowDimensions = new[]
+                                {
+                                    new Dimension(GridSizeMode.AutoSize),
+                                }
+                            },
+                            new GridContainer
+                            {
+                                RelativeSizeAxes = Axes.X,
+                                AutoSizeAxes = Axes.Y,
+                                Content = new[] { bottomStatistics.Cast<Drawable>().ToArray() },
+                                RowDimensions = new[]
+                                {
+                                    new Dimension(GridSizeMode.AutoSize),
+                                }
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            // Score counter value setting must be scheduled so it isn't transferred instantaneously
+            ScheduleAfterChildren(() =>
+            {
+                using (BeginDelayedSequence(AccuracyCircle.ACCURACY_TRANSFORM_DELAY, true))
+                {
+                    scoreCounter.FadeIn();
+                    scoreCounter.Current.Value = score.TotalScore;
+
+                    double delay = 0;
+
+                    foreach (var stat in statisticDisplays)
+                    {
+                        using (BeginDelayedSequence(delay, true))
+                            stat.Appear();
+
+                        delay += 200;
+                    }
+                }
+            });
         }
     }
 }
diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
new file mode 100644
index 0000000000..87d9828707
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -0,0 +1,95 @@
+// 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.Globalization;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Game.Beatmaps;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Containers;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Screens.Ranking.Expanded
+{
+    public class StarRatingDisplay : CompositeDrawable
+    {
+        private readonly BeatmapInfo beatmap;
+
+        public StarRatingDisplay(BeatmapInfo beatmap)
+        {
+            this.beatmap = beatmap;
+            AutoSizeAxes = Axes.Both;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            var starRatingParts = beatmap.StarDifficulty.ToString("0.00", CultureInfo.InvariantCulture).Split('.');
+            string wholePart = starRatingParts[0];
+            string fractionPart = starRatingParts[1];
+            string separator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
+
+            InternalChildren = new Drawable[]
+            {
+                new CircularContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = colours.ForDifficultyRating(beatmap.DifficultyRating)
+                        },
+                    }
+                },
+                new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Padding = new MarginPadding { Horizontal = 8, Vertical = 4 },
+                    Direction = FillDirection.Horizontal,
+                    Spacing = new Vector2(2, 0),
+                    Children = new Drawable[]
+                    {
+                        new SpriteIcon
+                        {
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            Size = new Vector2(7),
+                            Icon = FontAwesome.Solid.Star,
+                            Colour = Color4.Black
+                        },
+                        new OsuTextFlowContainer(s => s.Font = OsuFont.Numeric.With(weight: FontWeight.Black))
+                        {
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            AutoSizeAxes = Axes.Both,
+                            Direction = FillDirection.Horizontal,
+                            TextAnchor = Anchor.BottomLeft,
+                        }.With(t =>
+                        {
+                            t.AddText($"{wholePart}", s =>
+                            {
+                                s.Colour = Color4.Black;
+                                s.Font = s.Font.With(size: 14);
+                                s.UseFullGlyphHeight = false;
+                            });
+
+                            t.AddText($"{separator}{fractionPart}", s =>
+                            {
+                                s.Colour = Color4.Black;
+                                s.Font = s.Font.With(size: 7);
+                                s.UseFullGlyphHeight = false;
+                            });
+                        })
+                    }
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs
new file mode 100644
index 0000000000..2f7fc3a4fd
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs
@@ -0,0 +1,51 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens.Ranking.Expanded.Accuracy;
+using osu.Game.Utils;
+using osuTK;
+
+namespace osu.Game.Screens.Ranking.Expanded.Statistics
+{
+    public class AccuracyStatistic : StatisticDisplay
+    {
+        private readonly double accuracy;
+
+        private RollingCounter<double> counter;
+
+        public AccuracyStatistic(double accuracy)
+            : base("accuracy")
+        {
+            this.accuracy = accuracy;
+        }
+
+        public override void Appear()
+        {
+            base.Appear();
+            counter.Current.Value = accuracy;
+        }
+
+        protected override Drawable CreateContent() => counter = new Counter();
+
+        private class Counter : RollingCounter<double>
+        {
+            protected override double RollingDuration => AccuracyCircle.ACCURACY_TRANSFORM_DURATION;
+
+            protected override Easing RollingEasing => AccuracyCircle.ACCURACY_TRANSFORM_EASING;
+
+            public Counter()
+            {
+                DisplayedCountSpriteText.Font = OsuFont.Torus.With(size: 20, fixedWidth: true);
+                DisplayedCountSpriteText.Spacing = new Vector2(-2, 0);
+            }
+
+            protected override string FormatCount(double count) => count.FormatAccuracy();
+
+            public override void Increment(double amount)
+                => Current.Value += amount;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/ComboStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/ComboStatistic.cs
new file mode 100644
index 0000000000..ce5a15da01
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/ComboStatistic.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 osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Screens.Ranking.Expanded.Accuracy;
+using osuTK;
+
+namespace osu.Game.Screens.Ranking.Expanded.Statistics
+{
+    public class ComboStatistic : CounterStatistic
+    {
+        private readonly bool isPerfect;
+
+        private Drawable perfectText;
+
+        public ComboStatistic(int combo, bool isPerfect)
+            : base("combo", combo)
+        {
+            this.isPerfect = isPerfect;
+        }
+
+        public override void Appear()
+        {
+            base.Appear();
+
+            if (isPerfect)
+            {
+                using (BeginDelayedSequence(AccuracyCircle.ACCURACY_TRANSFORM_DURATION / 2, true))
+                    perfectText.FadeIn(50);
+            }
+        }
+
+        protected override Drawable CreateContent()
+        {
+            return new FillFlowContainer
+            {
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Horizontal,
+                Spacing = new Vector2(10, 0),
+                Children = new[]
+                {
+                    base.CreateContent().With(d =>
+                    {
+                        Anchor = Anchor.CentreLeft;
+                        Origin = Anchor.CentreLeft;
+                    }),
+                    perfectText = new OsuSpriteText
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Text = "PERFECT",
+                        Font = OsuFont.Torus.With(size: 11, weight: FontWeight.SemiBold),
+                        Colour = ColourInfo.GradientVertical(Color4Extensions.FromHex("#66FFCC"), Color4Extensions.FromHex("#FF9AD7")),
+                        Alpha = 0,
+                        UseFullGlyphHeight = false,
+                    }
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
new file mode 100644
index 0000000000..ee07ea326d
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
@@ -0,0 +1,48 @@
+// 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.Graphics;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens.Ranking.Expanded.Accuracy;
+using osuTK;
+
+namespace osu.Game.Screens.Ranking.Expanded.Statistics
+{
+    public class CounterStatistic : StatisticDisplay
+    {
+        private readonly int count;
+
+        private RollingCounter<int> counter;
+
+        public CounterStatistic(string header, int count)
+            : base(header)
+        {
+            this.count = count;
+        }
+
+        public override void Appear()
+        {
+            base.Appear();
+            counter.Current.Value = count;
+        }
+
+        protected override Drawable CreateContent() => counter = new Counter();
+
+        private class Counter : RollingCounter<int>
+        {
+            protected override double RollingDuration => AccuracyCircle.ACCURACY_TRANSFORM_DURATION;
+
+            protected override Easing RollingEasing => AccuracyCircle.ACCURACY_TRANSFORM_EASING;
+
+            public Counter()
+            {
+                DisplayedCountSpriteText.Font = OsuFont.Torus.With(size: 20, fixedWidth: true);
+                DisplayedCountSpriteText.Spacing = new Vector2(-2, 0);
+            }
+
+            public override void Increment(int amount)
+                => Current.Value += amount;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/StatisticDisplay.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/StatisticDisplay.cs
new file mode 100644
index 0000000000..55015b432b
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/StatisticDisplay.cs
@@ -0,0 +1,82 @@
+// 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.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Screens.Ranking.Expanded.Statistics
+{
+    public abstract class StatisticDisplay : CompositeDrawable
+    {
+        private readonly string header;
+
+        private Drawable content;
+
+        protected StatisticDisplay(string header)
+        {
+            this.header = header;
+            RelativeSizeAxes = Axes.X;
+            AutoSizeAxes = Axes.Y;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChild = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Children = new[]
+                {
+                    new CircularContainer
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Height = 12,
+                        Masking = true,
+                        Children = new Drawable[]
+                        {
+                            new Box
+                            {
+                                RelativeSizeAxes = Axes.Both,
+                                Colour = Color4Extensions.FromHex("#222")
+                            },
+                            new OsuSpriteText
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold),
+                                Text = header.ToUpperInvariant(),
+                            }
+                        }
+                    },
+                    new Container
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        AutoSizeAxes = Axes.Both,
+                        Children = new[]
+                        {
+                            content = CreateContent().With(d =>
+                            {
+                                d.Anchor = Anchor.TopCentre;
+                                d.Origin = Anchor.TopCentre;
+                                d.Alpha = 0;
+                                d.AlwaysPresent = true;
+                            }),
+                        }
+                    }
+                }
+            };
+        }
+
+        public virtual void Appear() => content.FadeIn(100);
+
+        protected abstract Drawable CreateContent();
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Expanded/TotalScoreCounter.cs b/osu.Game/Screens/Ranking/Expanded/TotalScoreCounter.cs
new file mode 100644
index 0000000000..d230e56649
--- /dev/null
+++ b/osu.Game/Screens/Ranking/Expanded/TotalScoreCounter.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 osu.Framework.Graphics;
+using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens.Ranking.Expanded.Accuracy;
+using osuTK;
+
+namespace osu.Game.Screens.Ranking.Expanded
+{
+    public class TotalScoreCounter : RollingCounter<long>
+    {
+        protected override double RollingDuration => AccuracyCircle.ACCURACY_TRANSFORM_DURATION;
+
+        protected override Easing RollingEasing => AccuracyCircle.ACCURACY_TRANSFORM_EASING;
+
+        public TotalScoreCounter()
+        {
+            // Todo: AutoSize X removed here due to https://github.com/ppy/osu-framework/issues/3369
+            AutoSizeAxes = Axes.Y;
+            RelativeSizeAxes = Axes.X;
+            DisplayedCountSpriteText.Anchor = Anchor.TopCentre;
+            DisplayedCountSpriteText.Origin = Anchor.TopCentre;
+
+            DisplayedCountSpriteText.Font = OsuFont.Torus.With(size: 60, weight: FontWeight.Light, fixedWidth: true);
+            DisplayedCountSpriteText.Spacing = new Vector2(-5, 0);
+        }
+
+        protected override string FormatCount(long count) => count.ToString("N0");
+
+        public override void Increment(long amount)
+            => Current.Value += amount;
+    }
+}

From 2ee480f1d8aaaec127856a7f0a8234238c9391fa Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 17 Mar 2020 17:34:16 +0900
Subject: [PATCH 1119/1142] Add xmldocs / cleanup

---
 .../Expanded/ExpandedPanelMiddleContent.cs    |  7 +++
 .../Ranking/Expanded/StarRatingDisplay.cs     |  7 +++
 .../Expanded/Statistics/AccuracyStatistic.cs  |  7 +++
 .../Expanded/Statistics/ComboStatistic.cs     | 51 ++++++++++---------
 .../Expanded/Statistics/CounterStatistic.cs   |  8 +++
 .../Expanded/Statistics/StatisticDisplay.cs   | 13 +++++
 .../Ranking/Expanded/TotalScoreCounter.cs     |  3 ++
 7 files changed, 73 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 4f45b1c5d7..6d5d7e0d95 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -20,6 +20,9 @@ using osuTK;
 
 namespace osu.Game.Screens.Ranking.Expanded
 {
+    /// <summary>
+    /// The content that appears in the middle section of the <see cref="ScorePanel"/>.
+    /// </summary>
     public class ExpandedPanelMiddleContent : CompositeDrawable
     {
         private readonly ScoreInfo score;
@@ -27,6 +30,10 @@ namespace osu.Game.Screens.Ranking.Expanded
         private readonly List<StatisticDisplay> statisticDisplays = new List<StatisticDisplay>();
         private RollingCounter<long> scoreCounter;
 
+        /// <summary>
+        /// Creates a new <see cref="ExpandedPanelMiddleContent"/>.
+        /// </summary>
+        /// <param name="score">The score to display.</param>
         public ExpandedPanelMiddleContent(ScoreInfo score)
         {
             this.score = score;
diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index 87d9828707..74b58b9f8c 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -15,10 +15,17 @@ using osuTK.Graphics;
 
 namespace osu.Game.Screens.Ranking.Expanded
 {
+    /// <summary>
+    /// A pill that displays the star rating of a <see cref="BeatmapInfo"/>.
+    /// </summary>
     public class StarRatingDisplay : CompositeDrawable
     {
         private readonly BeatmapInfo beatmap;
 
+        /// <summary>
+        /// Creates a new <see cref="StarRatingDisplay"/>.
+        /// </summary>
+        /// <param name="beatmap">The <see cref="BeatmapInfo"/> to display the star difficulty of.</param>
         public StarRatingDisplay(BeatmapInfo beatmap)
         {
             this.beatmap = beatmap;
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs
index 2f7fc3a4fd..2a0e33aab7 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs
@@ -10,12 +10,19 @@ using osuTK;
 
 namespace osu.Game.Screens.Ranking.Expanded.Statistics
 {
+    /// <summary>
+    /// A <see cref="StatisticDisplay"/> to display the player's accuracy.
+    /// </summary>
     public class AccuracyStatistic : StatisticDisplay
     {
         private readonly double accuracy;
 
         private RollingCounter<double> counter;
 
+        /// <summary>
+        /// Creates a new <see cref="AccuracyStatistic"/>.
+        /// </summary>
+        /// <param name="accuracy">The accuracy to display.</param>
         public AccuracyStatistic(double accuracy)
             : base("accuracy")
         {
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/ComboStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/ComboStatistic.cs
index ce5a15da01..e13138c5a0 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/ComboStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/ComboStatistic.cs
@@ -12,12 +12,20 @@ using osuTK;
 
 namespace osu.Game.Screens.Ranking.Expanded.Statistics
 {
+    /// <summary>
+    /// A <see cref="StatisticDisplay"/> to display the player's combo.
+    /// </summary>
     public class ComboStatistic : CounterStatistic
     {
         private readonly bool isPerfect;
 
         private Drawable perfectText;
 
+        /// <summary>
+        /// Creates a new <see cref="ComboStatistic"/>.
+        /// </summary>
+        /// <param name="combo">The combo to be displayed.</param>
+        /// <param name="isPerfect">Whether this is a perfect combo.</param>
         public ComboStatistic(int combo, bool isPerfect)
             : base("combo", combo)
         {
@@ -35,32 +43,29 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
             }
         }
 
-        protected override Drawable CreateContent()
+        protected override Drawable CreateContent() => new FillFlowContainer
         {
-            return new FillFlowContainer
+            AutoSizeAxes = Axes.Both,
+            Direction = FillDirection.Horizontal,
+            Spacing = new Vector2(10, 0),
+            Children = new[]
             {
-                AutoSizeAxes = Axes.Both,
-                Direction = FillDirection.Horizontal,
-                Spacing = new Vector2(10, 0),
-                Children = new[]
+                base.CreateContent().With(d =>
                 {
-                    base.CreateContent().With(d =>
-                    {
-                        Anchor = Anchor.CentreLeft;
-                        Origin = Anchor.CentreLeft;
-                    }),
-                    perfectText = new OsuSpriteText
-                    {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        Text = "PERFECT",
-                        Font = OsuFont.Torus.With(size: 11, weight: FontWeight.SemiBold),
-                        Colour = ColourInfo.GradientVertical(Color4Extensions.FromHex("#66FFCC"), Color4Extensions.FromHex("#FF9AD7")),
-                        Alpha = 0,
-                        UseFullGlyphHeight = false,
-                    }
+                    Anchor = Anchor.CentreLeft;
+                    Origin = Anchor.CentreLeft;
+                }),
+                perfectText = new OsuSpriteText
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Text = "PERFECT",
+                    Font = OsuFont.Torus.With(size: 11, weight: FontWeight.SemiBold),
+                    Colour = ColourInfo.GradientVertical(Color4Extensions.FromHex("#66FFCC"), Color4Extensions.FromHex("#FF9AD7")),
+                    Alpha = 0,
+                    UseFullGlyphHeight = false,
                 }
-            };
-        }
+            }
+        };
     }
 }
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
index ee07ea326d..817cc9b8c2 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
@@ -9,12 +9,20 @@ using osuTK;
 
 namespace osu.Game.Screens.Ranking.Expanded.Statistics
 {
+    /// <summary>
+    /// A <see cref="StatisticDisplay"/> to display general numeric values.
+    /// </summary>
     public class CounterStatistic : StatisticDisplay
     {
         private readonly int count;
 
         private RollingCounter<int> counter;
 
+        /// <summary>
+        /// Creates a new <see cref="CounterStatistic"/>.
+        /// </summary>
+        /// <param name="header">The name of the statistic.</param>
+        /// <param name="count">The value to display.</param>
         public CounterStatistic(string header, int count)
             : base(header)
         {
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/StatisticDisplay.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/StatisticDisplay.cs
index 55015b432b..a653cc82d4 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/StatisticDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/StatisticDisplay.cs
@@ -11,12 +11,19 @@ using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Screens.Ranking.Expanded.Statistics
 {
+    /// <summary>
+    /// A statistic from the score to be displayed in the <see cref="ExpandedPanelMiddleContent"/>.
+    /// </summary>
     public abstract class StatisticDisplay : CompositeDrawable
     {
         private readonly string header;
 
         private Drawable content;
 
+        /// <summary>
+        /// Creates a new <see cref="StatisticDisplay"/>.
+        /// </summary>
+        /// <param name="header">The name of the statistic.</param>
         protected StatisticDisplay(string header)
         {
             this.header = header;
@@ -75,8 +82,14 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
             };
         }
 
+        /// <summary>
+        /// Shows the statistic value.
+        /// </summary>
         public virtual void Appear() => content.FadeIn(100);
 
+        /// <summary>
+        /// Creates the content for this <see cref="StatisticDisplay"/>.
+        /// </summary>
         protected abstract Drawable CreateContent();
     }
 }
diff --git a/osu.Game/Screens/Ranking/Expanded/TotalScoreCounter.cs b/osu.Game/Screens/Ranking/Expanded/TotalScoreCounter.cs
index d230e56649..cab04edb8b 100644
--- a/osu.Game/Screens/Ranking/Expanded/TotalScoreCounter.cs
+++ b/osu.Game/Screens/Ranking/Expanded/TotalScoreCounter.cs
@@ -9,6 +9,9 @@ using osuTK;
 
 namespace osu.Game.Screens.Ranking.Expanded
 {
+    /// <summary>
+    /// A counter for the player's total score to be displayed in the <see cref="ExpandedPanelMiddleContent"/>.
+    /// </summary>
     public class TotalScoreCounter : RollingCounter<long>
     {
         protected override double RollingDuration => AccuracyCircle.ACCURACY_TRANSFORM_DURATION;

From 6f801e1695c632a9a703ced501f4814f63ffacec Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 17 Mar 2020 17:35:14 +0900
Subject: [PATCH 1120/1142] Add xmldoc

---
 .../Screens/Ranking/Expanded/ExpandedPanelTopContent.cs    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelTopContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelTopContent.cs
index a9853c217c..5dfc43cc29 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelTopContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelTopContent.cs
@@ -12,10 +12,17 @@ using osuTK;
 
 namespace osu.Game.Screens.Ranking.Expanded
 {
+    /// <summary>
+    /// The content that appears in the middle section of the <see cref="ScorePanel"/>.
+    /// </summary>
     public class ExpandedPanelTopContent : CompositeDrawable
     {
         private readonly User user;
 
+        /// <summary>
+        /// Creates a new <see cref="ExpandedPanelTopContent"/>.
+        /// </summary>
+        /// <param name="user">The <see cref="User"/> to display.</param>
         public ExpandedPanelTopContent(User user)
         {
             this.user = user;

From 1c4296f5e7826689fd6ce4f483e13cafcea21988 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 17 Mar 2020 17:43:16 +0900
Subject: [PATCH 1121/1142] Implement the new results screen

---
 .../Background/TestSceneUserDimBackgrounds.cs |   5 +-
 .../Gameplay/TestSceneReplayDownloadButton.cs |   2 +-
 .../Multiplayer/TestSceneMatchResults.cs      | 106 -----
 .../TestSceneResultsScreen.cs}                |  15 +-
 .../Screens/Multi/Play/TimeshiftPlayer.cs     |   4 -
 .../Screens/Multi/Ranking/MatchResults.cs     |  26 --
 .../Ranking/Pages/RoomLeaderboardPage.cs      | 135 ------
 .../Ranking/Types/RoomLeaderboardPageInfo.cs  |  29 --
 osu.Game/Screens/Play/Player.cs               |   2 +-
 osu.Game/Screens/Play/SoloResults.cs          |  24 -
 osu.Game/Screens/Ranking/IResultPageInfo.cs   |  16 -
 .../Ranking/Pages/LocalLeaderboardPage.cs     |  43 --
 .../Screens/Ranking/Pages/ScoreResultsPage.cs | 428 ------------------
 .../{Pages => }/ReplayDownloadButton.cs       |   2 +-
 osu.Game/Screens/Ranking/ResultModeButton.cs  |  97 ----
 .../Screens/Ranking/ResultModeTabControl.cs   |  30 --
 osu.Game/Screens/Ranking/Results.cs           | 291 ------------
 osu.Game/Screens/Ranking/ResultsPage.cs       |  92 ----
 osu.Game/Screens/Ranking/ResultsScreen.cs     |  97 ++++
 .../Ranking/{Pages => }/RetryButton.cs        |   2 +-
 .../Ranking/Types/LocalLeaderboardPageInfo.cs |  28 --
 .../Ranking/Types/ScoreOverviewPageInfo.cs    |  30 --
 osu.Game/Screens/Select/PlaySongSelect.cs     |   3 +-
 23 files changed, 113 insertions(+), 1394 deletions(-)
 delete mode 100644 osu.Game.Tests/Visual/Multiplayer/TestSceneMatchResults.cs
 rename osu.Game.Tests/Visual/{Gameplay/TestSceneResults.cs => Ranking/TestSceneResultsScreen.cs} (91%)
 delete mode 100644 osu.Game/Screens/Multi/Ranking/MatchResults.cs
 delete mode 100644 osu.Game/Screens/Multi/Ranking/Pages/RoomLeaderboardPage.cs
 delete mode 100644 osu.Game/Screens/Multi/Ranking/Types/RoomLeaderboardPageInfo.cs
 delete mode 100644 osu.Game/Screens/Play/SoloResults.cs
 delete mode 100644 osu.Game/Screens/Ranking/IResultPageInfo.cs
 delete mode 100644 osu.Game/Screens/Ranking/Pages/LocalLeaderboardPage.cs
 delete mode 100644 osu.Game/Screens/Ranking/Pages/ScoreResultsPage.cs
 rename osu.Game/Screens/Ranking/{Pages => }/ReplayDownloadButton.cs (98%)
 delete mode 100644 osu.Game/Screens/Ranking/ResultModeButton.cs
 delete mode 100644 osu.Game/Screens/Ranking/ResultModeTabControl.cs
 delete mode 100644 osu.Game/Screens/Ranking/Results.cs
 delete mode 100644 osu.Game/Screens/Ranking/ResultsPage.cs
 create mode 100644 osu.Game/Screens/Ranking/ResultsScreen.cs
 rename osu.Game/Screens/Ranking/{Pages => }/RetryButton.cs (97%)
 delete mode 100644 osu.Game/Screens/Ranking/Types/LocalLeaderboardPageInfo.cs
 delete mode 100644 osu.Game/Screens/Ranking/Types/ScoreOverviewPageInfo.cs

diff --git a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
index 06a155e78b..b51555db3e 100644
--- a/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
+++ b/osu.Game.Tests/Visual/Background/TestSceneUserDimBackgrounds.cs
@@ -27,6 +27,7 @@ using osu.Game.Screens;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.PlayerSettings;
+using osu.Game.Screens.Ranking;
 using osu.Game.Screens.Select;
 using osu.Game.Tests.Resources;
 using osu.Game.Users;
@@ -203,7 +204,7 @@ namespace osu.Game.Tests.Visual.Background
         }
 
         /// <summary>
-        /// Check if the visual settings container removes user dim when suspending <see cref="Player"/> for <see cref="SoloResults"/>
+        /// Check if the visual settings container removes user dim when suspending <see cref="Player"/> for <see cref="ResultsScreen"/>
         /// </summary>
         [Test]
         public void TransitionTest()
@@ -335,7 +336,7 @@ namespace osu.Game.Tests.Visual.Background
             public bool IsBackgroundCurrent() => ((FadeAccessibleBackground)Background).IsCurrentScreen();
         }
 
-        private class FadeAccessibleResults : SoloResults
+        private class FadeAccessibleResults : ResultsScreen
         {
             public FadeAccessibleResults(ScoreInfo score)
                 : base(score)
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs
index 8cb44de8cb..c9561a70fa 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneReplayDownloadButton.cs
@@ -11,7 +11,7 @@ using System;
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Game.Rulesets;
-using osu.Game.Screens.Ranking.Pages;
+using osu.Game.Screens.Ranking;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchResults.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchResults.cs
deleted file mode 100644
index 58e9240026..0000000000
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchResults.cs
+++ /dev/null
@@ -1,106 +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 System;
-using System.Collections.Generic;
-using System.Linq;
-using osu.Framework.Allocation;
-using osu.Game.Beatmaps;
-using osu.Game.Online.API;
-using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Scoring;
-using osu.Game.Screens.Multi.Match.Components;
-using osu.Game.Screens.Multi.Ranking;
-using osu.Game.Screens.Multi.Ranking.Pages;
-using osu.Game.Screens.Multi.Ranking.Types;
-using osu.Game.Screens.Ranking;
-using osu.Game.Users;
-
-namespace osu.Game.Tests.Visual.Multiplayer
-{
-    public class TestSceneMatchResults : MultiplayerTestScene
-    {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(MatchResults),
-            typeof(RoomLeaderboardPageInfo),
-            typeof(RoomLeaderboardPage)
-        };
-
-        [Resolved]
-        private BeatmapManager beatmaps { get; set; }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            var beatmapInfo = beatmaps.QueryBeatmap(b => b.RulesetID == 0);
-            if (beatmapInfo != null)
-                Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmapInfo);
-
-            Room.RoomID.Value = 1;
-            Room.Name.Value = "an awesome room";
-
-            LoadScreen(new TestMatchResults(new ScoreInfo
-            {
-                User = new User { Id = 10 },
-            }));
-        }
-
-        private class TestMatchResults : MatchResults
-        {
-            public TestMatchResults(ScoreInfo score)
-                : base(score)
-            {
-            }
-
-            protected override IEnumerable<IResultPageInfo> CreateResultPages() => new[] { new TestRoomLeaderboardPageInfo(Score, Beatmap.Value) };
-        }
-
-        private class TestRoomLeaderboardPageInfo : RoomLeaderboardPageInfo
-        {
-            private readonly ScoreInfo score;
-            private readonly WorkingBeatmap beatmap;
-
-            public TestRoomLeaderboardPageInfo(ScoreInfo score, WorkingBeatmap beatmap)
-                : base(score, beatmap)
-            {
-                this.score = score;
-                this.beatmap = beatmap;
-            }
-
-            public override ResultsPage CreatePage() => new TestRoomLeaderboardPage(score, beatmap);
-        }
-
-        private class TestRoomLeaderboardPage : RoomLeaderboardPage
-        {
-            public TestRoomLeaderboardPage(ScoreInfo score, WorkingBeatmap beatmap)
-                : base(score, beatmap)
-            {
-            }
-
-            protected override MatchLeaderboard CreateLeaderboard() => new TestMatchLeaderboard();
-        }
-
-        private class TestMatchLeaderboard : RoomLeaderboardPage.ResultsMatchLeaderboard
-        {
-            protected override APIRequest FetchScores(Action<IEnumerable<APIUserScoreAggregate>> scoresCallback)
-            {
-                var scores = Enumerable.Range(0, 50).Select(createRoomScore).ToArray();
-
-                scoresCallback?.Invoke(scores);
-                ScoresLoaded?.Invoke(scores);
-
-                return null;
-            }
-
-            private APIUserScoreAggregate createRoomScore(int id) => new APIUserScoreAggregate
-            {
-                User = new User { Id = id, Username = $"User {id}" },
-                Accuracy = 0.98,
-                TotalScore = 987654,
-                TotalAttempts = 13,
-                CompletedBeatmaps = 5
-            };
-        }
-    }
-}
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneResults.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
similarity index 91%
rename from osu.Game.Tests/Visual/Gameplay/TestSceneResults.cs
rename to osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index 2b7a32ba17..bd5b039bc1 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneResults.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -10,29 +10,27 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osu.Game.Screens;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Ranking;
-using osu.Game.Screens.Ranking.Pages;
+using osu.Game.Tests.Beatmaps;
 using osu.Game.Users;
 
-namespace osu.Game.Tests.Visual.Gameplay
+namespace osu.Game.Tests.Visual.Ranking
 {
     [TestFixture]
-    public class TestSceneResults : ScreenTestScene
+    public class TestSceneResultsScreen : ScreenTestScene
     {
         private BeatmapManager beatmaps;
 
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
-            typeof(Results),
-            typeof(ResultsPage),
-            typeof(ScoreResultsPage),
+            typeof(ResultsScreen),
             typeof(RetryButton),
             typeof(ReplayDownloadButton),
-            typeof(LocalLeaderboardPage),
             typeof(TestPlayer)
         };
 
@@ -65,6 +63,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                 { HitResult.Meh, 50 },
                 { HitResult.Miss, 1 }
             },
+            Beatmap = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo,
             User = new User
             {
                 Username = "peppy",
@@ -119,7 +118,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             }
         }
 
-        private class TestSoloResults : SoloResults
+        private class TestSoloResults : ResultsScreen
         {
             public HotkeyRetryOverlay RetryOverlay;
 
diff --git a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
index 3afacf2f31..7f58de29fb 100644
--- a/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
+++ b/osu.Game/Screens/Multi/Play/TimeshiftPlayer.cs
@@ -14,9 +14,7 @@ using osu.Game.Online.API.Requests;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Rulesets;
 using osu.Game.Scoring;
-using osu.Game.Screens.Multi.Ranking;
 using osu.Game.Screens.Play;
-using osu.Game.Screens.Ranking;
 
 namespace osu.Game.Screens.Multi.Play
 {
@@ -115,7 +113,5 @@ namespace osu.Game.Screens.Multi.Play
 
             Exited = null;
         }
-
-        protected override Results CreateResults(ScoreInfo score) => new MatchResults(score);
     }
 }
diff --git a/osu.Game/Screens/Multi/Ranking/MatchResults.cs b/osu.Game/Screens/Multi/Ranking/MatchResults.cs
deleted file mode 100644
index fe68d7e849..0000000000
--- a/osu.Game/Screens/Multi/Ranking/MatchResults.cs
+++ /dev/null
@@ -1,26 +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 System.Collections.Generic;
-using osu.Game.Scoring;
-using osu.Game.Screens.Multi.Ranking.Types;
-using osu.Game.Screens.Ranking;
-using osu.Game.Screens.Ranking.Types;
-
-namespace osu.Game.Screens.Multi.Ranking
-{
-    public class MatchResults : Results
-    {
-        public MatchResults(ScoreInfo score)
-            : base(score)
-        {
-        }
-
-        protected override IEnumerable<IResultPageInfo> CreateResultPages() => new IResultPageInfo[]
-        {
-            new ScoreOverviewPageInfo(Score, Beatmap.Value),
-            new LocalLeaderboardPageInfo(Score, Beatmap.Value),
-            new RoomLeaderboardPageInfo(Score, Beatmap.Value),
-        };
-    }
-}
diff --git a/osu.Game/Screens/Multi/Ranking/Pages/RoomLeaderboardPage.cs b/osu.Game/Screens/Multi/Ranking/Pages/RoomLeaderboardPage.cs
deleted file mode 100644
index 0d31805774..0000000000
--- a/osu.Game/Screens/Multi/Ranking/Pages/RoomLeaderboardPage.cs
+++ /dev/null
@@ -1,135 +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 System.Collections.Generic;
-using Microsoft.EntityFrameworkCore.Internal;
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Lists;
-using osu.Game.Beatmaps;
-using osu.Game.Graphics;
-using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Online.Leaderboards;
-using osu.Game.Online.Multiplayer;
-using osu.Game.Scoring;
-using osu.Game.Screens.Multi.Match.Components;
-using osu.Game.Screens.Ranking;
-
-namespace osu.Game.Screens.Multi.Ranking.Pages
-{
-    public class RoomLeaderboardPage : ResultsPage
-    {
-        [Resolved]
-        private OsuColour colours { get; set; }
-
-        private TextFlowContainer rankText;
-
-        [Resolved(typeof(Room), nameof(Room.Name))]
-        private Bindable<string> name { get; set; }
-
-        public RoomLeaderboardPage(ScoreInfo score, WorkingBeatmap beatmap)
-            : base(score, beatmap)
-        {
-        }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            MatchLeaderboard leaderboard;
-
-            Children = new Drawable[]
-            {
-                new Box
-                {
-                    Colour = colours.Gray6,
-                    RelativeSizeAxes = Axes.Both,
-                },
-                new BufferedContainer
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    BackgroundColour = colours.Gray6,
-                    Child = leaderboard = CreateLeaderboard()
-                },
-                rankText = new TextFlowContainer
-                {
-                    Anchor = Anchor.TopCentre,
-                    Origin = Anchor.TopCentre,
-                    RelativeSizeAxes = Axes.X,
-                    Width = 0.5f,
-                    AutoSizeAxes = Axes.Y,
-                    Y = 50,
-                    TextAnchor = Anchor.TopCentre
-                },
-            };
-
-            leaderboard.Origin = Anchor.Centre;
-            leaderboard.Anchor = Anchor.Centre;
-            leaderboard.RelativeSizeAxes = Axes.Both;
-            leaderboard.Height = 0.8f;
-            leaderboard.Y = 55;
-            leaderboard.ScoresLoaded = scoresLoaded;
-        }
-
-        private void scoresLoaded(IEnumerable<APIUserScoreAggregate> scores)
-        {
-            void gray(SpriteText s) => s.Colour = colours.GrayC;
-
-            void white(SpriteText s)
-            {
-                s.Font = s.Font.With(size: s.Font.Size * 1.4f);
-                s.Colour = colours.GrayF;
-            }
-
-            rankText.AddText(name + "\n", white);
-            rankText.AddText("You are placed ", gray);
-
-            int index = scores.IndexOf(new APIUserScoreAggregate { User = Score.User }, new FuncEqualityComparer<APIUserScoreAggregate>((s1, s2) => s1.User.Id.Equals(s2.User.Id)));
-
-            rankText.AddText($"#{index + 1} ", s =>
-            {
-                s.Font = s.Font.With(Typeface.Torus, weight: FontWeight.Bold);
-                s.Colour = colours.YellowDark;
-            });
-
-            rankText.AddText("in the room!", gray);
-        }
-
-        protected virtual MatchLeaderboard CreateLeaderboard() => new ResultsMatchLeaderboard();
-
-        public class ResultsMatchLeaderboard : MatchLeaderboard
-        {
-            protected override bool FadeTop => true;
-
-            protected override LeaderboardScore CreateDrawableScore(APIUserScoreAggregate model, int index)
-                => new ResultsMatchLeaderboardScore(model, index);
-
-            protected override FillFlowContainer<LeaderboardScore> CreateScoreFlow()
-            {
-                var flow = base.CreateScoreFlow();
-                flow.Padding = new MarginPadding
-                {
-                    Top = LeaderboardScore.HEIGHT * 2,
-                    Bottom = LeaderboardScore.HEIGHT * 3,
-                };
-                return flow;
-            }
-
-            private class ResultsMatchLeaderboardScore : MatchLeaderboardScore
-            {
-                public ResultsMatchLeaderboardScore(APIUserScoreAggregate score, int rank)
-                    : base(score, rank)
-                {
-                }
-
-                [BackgroundDependencyLoader]
-                private void load()
-                {
-                }
-            }
-        }
-    }
-}
diff --git a/osu.Game/Screens/Multi/Ranking/Types/RoomLeaderboardPageInfo.cs b/osu.Game/Screens/Multi/Ranking/Types/RoomLeaderboardPageInfo.cs
deleted file mode 100644
index dcfad8458f..0000000000
--- a/osu.Game/Screens/Multi/Ranking/Types/RoomLeaderboardPageInfo.cs
+++ /dev/null
@@ -1,29 +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.Graphics.Sprites;
-using osu.Game.Beatmaps;
-using osu.Game.Scoring;
-using osu.Game.Screens.Multi.Ranking.Pages;
-using osu.Game.Screens.Ranking;
-
-namespace osu.Game.Screens.Multi.Ranking.Types
-{
-    public class RoomLeaderboardPageInfo : IResultPageInfo
-    {
-        private readonly ScoreInfo score;
-        private readonly WorkingBeatmap beatmap;
-
-        public RoomLeaderboardPageInfo(ScoreInfo score, WorkingBeatmap beatmap)
-        {
-            this.score = score;
-            this.beatmap = beatmap;
-        }
-
-        public IconUsage Icon => FontAwesome.Solid.Users;
-
-        public string Name => "Room Leaderboard";
-
-        public virtual ResultsPage CreatePage() => new RoomLeaderboardPage(score, beatmap);
-    }
-}
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index bcadba14af..7d945f9a31 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -416,7 +416,7 @@ namespace osu.Game.Screens.Play
 
         protected override bool OnScroll(ScrollEvent e) => mouseWheelDisabled.Value && !GameplayClockContainer.IsPaused.Value;
 
-        protected virtual Results CreateResults(ScoreInfo score) => new SoloResults(score);
+        protected virtual ResultsScreen CreateResults(ScoreInfo score) => new ResultsScreen(score);
 
         #region Fail Logic
 
diff --git a/osu.Game/Screens/Play/SoloResults.cs b/osu.Game/Screens/Play/SoloResults.cs
deleted file mode 100644
index 2b9aec257c..0000000000
--- a/osu.Game/Screens/Play/SoloResults.cs
+++ /dev/null
@@ -1,24 +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 System.Collections.Generic;
-using osu.Game.Scoring;
-using osu.Game.Screens.Ranking;
-using osu.Game.Screens.Ranking.Types;
-
-namespace osu.Game.Screens.Play
-{
-    public class SoloResults : Results
-    {
-        public SoloResults(ScoreInfo score)
-            : base(score)
-        {
-        }
-
-        protected override IEnumerable<IResultPageInfo> CreateResultPages() => new IResultPageInfo[]
-        {
-            new ScoreOverviewPageInfo(Score, Beatmap.Value),
-            new LocalLeaderboardPageInfo(Score, Beatmap.Value)
-        };
-    }
-}
diff --git a/osu.Game/Screens/Ranking/IResultPageInfo.cs b/osu.Game/Screens/Ranking/IResultPageInfo.cs
deleted file mode 100644
index cc86e7441a..0000000000
--- a/osu.Game/Screens/Ranking/IResultPageInfo.cs
+++ /dev/null
@@ -1,16 +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.Graphics.Sprites;
-
-namespace osu.Game.Screens.Ranking
-{
-    public interface IResultPageInfo
-    {
-        IconUsage Icon { get; }
-
-        string Name { get; }
-
-        ResultsPage CreatePage();
-    }
-}
diff --git a/osu.Game/Screens/Ranking/Pages/LocalLeaderboardPage.cs b/osu.Game/Screens/Ranking/Pages/LocalLeaderboardPage.cs
deleted file mode 100644
index c997dd6d30..0000000000
--- a/osu.Game/Screens/Ranking/Pages/LocalLeaderboardPage.cs
+++ /dev/null
@@ -1,43 +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.Shapes;
-using osu.Game.Beatmaps;
-using osu.Game.Graphics;
-using osu.Game.Scoring;
-using osu.Game.Screens.Select.Leaderboards;
-using osuTK;
-
-namespace osu.Game.Screens.Ranking.Pages
-{
-    public class LocalLeaderboardPage : ResultsPage
-    {
-        public LocalLeaderboardPage(ScoreInfo score, WorkingBeatmap beatmap = null)
-            : base(score, beatmap)
-        {
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            Children = new Drawable[]
-            {
-                new Box
-                {
-                    Colour = colours.Gray6,
-                    RelativeSizeAxes = Axes.Both,
-                },
-                new BeatmapLeaderboard
-                {
-                    Origin = Anchor.Centre,
-                    Anchor = Anchor.Centre,
-                    RelativeSizeAxes = Axes.Both,
-                    Beatmap = Beatmap.BeatmapInfo ?? Score.Beatmap,
-                    Scale = new Vector2(0.7f)
-                }
-            };
-        }
-    }
-}
diff --git a/osu.Game/Screens/Ranking/Pages/ScoreResultsPage.cs b/osu.Game/Screens/Ranking/Pages/ScoreResultsPage.cs
deleted file mode 100644
index 0aab067de1..0000000000
--- a/osu.Game/Screens/Ranking/Pages/ScoreResultsPage.cs
+++ /dev/null
@@ -1,428 +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 System;
-using System.Collections.Generic;
-using System.Linq;
-using osu.Framework.Allocation;
-using osu.Framework.Extensions;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Colour;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Textures;
-using osu.Framework.Localisation;
-using osu.Game.Beatmaps;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Online.Leaderboards;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Scoring;
-using osu.Game.Screens.Play;
-using osu.Game.Users;
-using osuTK;
-using osuTK.Graphics;
-
-namespace osu.Game.Screens.Ranking.Pages
-{
-    public class ScoreResultsPage : ResultsPage
-    {
-        private Container scoreContainer;
-        private ScoreCounter scoreCounter;
-
-        private readonly ScoreInfo score;
-
-        public ScoreResultsPage(ScoreInfo score, WorkingBeatmap beatmap)
-            : base(score, beatmap)
-        {
-            this.score = score;
-        }
-
-        private FillFlowContainer<DrawableScoreStatistic> statisticsContainer;
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            const float user_header_height = 120;
-
-            Children = new Drawable[]
-            {
-                new Container
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Padding = new MarginPadding { Top = user_header_height },
-                    Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = Color4.White,
-                        },
-                    }
-                },
-                new FillFlowContainer
-                {
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Direction = FillDirection.Vertical,
-                    Children = new Drawable[]
-                    {
-                        new DelayedLoadWrapper(new UserHeader(Score.User)
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                        })
-                        {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                            RelativeSizeAxes = Axes.X,
-                            Height = user_header_height,
-                        },
-                        new UpdateableRank(Score.Rank)
-                        {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                            Size = new Vector2(150, 60),
-                            Margin = new MarginPadding(20),
-                        },
-                        scoreContainer = new Container
-                        {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                            RelativeSizeAxes = Axes.X,
-                            Height = 60,
-                            Children = new Drawable[]
-                            {
-                                new SongProgressGraph
-                                {
-                                    RelativeSizeAxes = Axes.Both,
-                                    Alpha = 0.5f,
-                                    Objects = Beatmap.Beatmap.HitObjects,
-                                },
-                                scoreCounter = new SlowScoreCounter(6)
-                                {
-                                    Anchor = Anchor.Centre,
-                                    Origin = Anchor.Centre,
-                                    Colour = colours.PinkDarker,
-                                    Y = 10,
-                                    TextSize = 56,
-                                },
-                            }
-                        },
-                        new OsuSpriteText
-                        {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                            Colour = colours.PinkDarker,
-                            Shadow = false,
-                            Font = OsuFont.GetFont(weight: FontWeight.Bold),
-                            Text = "total score",
-                            Margin = new MarginPadding { Bottom = 15 },
-                        },
-                        new BeatmapDetails(Beatmap.BeatmapInfo)
-                        {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                            Margin = new MarginPadding { Bottom = 10 },
-                        },
-                        new DateTimeDisplay(Score.Date.LocalDateTime)
-                        {
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                        },
-                        new Container
-                        {
-                            RelativeSizeAxes = Axes.X,
-                            Size = new Vector2(0.75f, 1),
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                            Margin = new MarginPadding { Top = 10, Bottom = 10 },
-                            Children = new Drawable[]
-                            {
-                                new Box
-                                {
-                                    Colour = ColourInfo.GradientHorizontal(
-                                        colours.GrayC.Opacity(0),
-                                        colours.GrayC.Opacity(0.9f)),
-                                    RelativeSizeAxes = Axes.Both,
-                                    Size = new Vector2(0.5f, 1),
-                                },
-                                new Box
-                                {
-                                    Anchor = Anchor.TopRight,
-                                    Origin = Anchor.TopRight,
-                                    Colour = ColourInfo.GradientHorizontal(
-                                        colours.GrayC.Opacity(0.9f),
-                                        colours.GrayC.Opacity(0)),
-                                    RelativeSizeAxes = Axes.Both,
-                                    Size = new Vector2(0.5f, 1),
-                                },
-                            }
-                        },
-                        statisticsContainer = new FillFlowContainer<DrawableScoreStatistic>
-                        {
-                            AutoSizeAxes = Axes.Both,
-                            Anchor = Anchor.TopCentre,
-                            Origin = Anchor.TopCentre,
-                            Direction = FillDirection.Horizontal,
-                            LayoutDuration = 200,
-                            LayoutEasing = Easing.OutQuint
-                        },
-                    },
-                },
-                new FillFlowContainer
-                {
-                    Anchor = Anchor.BottomCentre,
-                    Origin = Anchor.BottomCentre,
-                    Margin = new MarginPadding { Bottom = 10 },
-                    Spacing = new Vector2(5),
-                    AutoSizeAxes = Axes.Both,
-                    Direction = FillDirection.Horizontal,
-                    Children = new Drawable[]
-                    {
-                        new ReplayDownloadButton(score),
-                        new RetryButton()
-                    }
-                },
-            };
-
-            statisticsContainer.ChildrenEnumerable = Score.SortedStatistics.Select(s => new DrawableScoreStatistic(s));
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            Schedule(() =>
-            {
-                scoreCounter.Increment(Score.TotalScore);
-
-                int delay = 0;
-
-                foreach (var s in statisticsContainer.Children)
-                {
-                    s.FadeOut()
-                     .Then(delay += 200)
-                     .FadeIn(300 + delay, Easing.Out);
-                }
-            });
-        }
-
-        protected override void UpdateAfterChildren()
-        {
-            base.UpdateAfterChildren();
-
-            scoreCounter.Scale = new Vector2(Math.Min(1f, (scoreContainer.DrawWidth - 20) / scoreCounter.DrawWidth));
-        }
-
-        private class DrawableScoreStatistic : Container
-        {
-            private readonly KeyValuePair<HitResult, int> statistic;
-
-            public DrawableScoreStatistic(KeyValuePair<HitResult, int> statistic)
-            {
-                this.statistic = statistic;
-
-                AutoSizeAxes = Axes.Both;
-                Margin = new MarginPadding { Left = 5, Right = 5 };
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                Children = new Drawable[]
-                {
-                    new OsuSpriteText
-                    {
-                        Text = statistic.Value.ToString().PadLeft(4, '0'),
-                        Colour = colours.Gray7,
-                        Font = OsuFont.GetFont(size: 30),
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
-                    },
-                    new OsuSpriteText
-                    {
-                        Text = statistic.Key.GetDescription(),
-                        Colour = colours.Gray7,
-                        Font = OsuFont.GetFont(weight: FontWeight.Bold),
-                        Y = 26,
-                        Anchor = Anchor.TopCentre,
-                        Origin = Anchor.TopCentre,
-                    },
-                };
-            }
-        }
-
-        private class DateTimeDisplay : Container
-        {
-            private readonly DateTime date;
-
-            public DateTimeDisplay(DateTime date)
-            {
-                this.date = date;
-
-                AutoSizeAxes = Axes.Both;
-
-                Masking = true;
-                CornerRadius = 5;
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                Children = new Drawable[]
-                {
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = colours.Gray6,
-                    },
-                    new FillFlowContainer
-                    {
-                        AutoSizeAxes = Axes.Both,
-                        Direction = FillDirection.Horizontal,
-                        Padding = new MarginPadding { Horizontal = 10, Vertical = 5 },
-                        Spacing = new Vector2(10),
-                        Children = new[]
-                        {
-                            new OsuSpriteText
-                            {
-                                Text = date.ToShortDateString(),
-                                Colour = Color4.White,
-                            },
-                            new OsuSpriteText
-                            {
-                                Text = date.ToShortTimeString(),
-                                Colour = Color4.White,
-                            }
-                        }
-                    },
-                };
-            }
-        }
-
-        private class BeatmapDetails : Container
-        {
-            private readonly BeatmapInfo beatmap;
-
-            private readonly OsuSpriteText title;
-            private readonly OsuSpriteText artist;
-            private readonly OsuSpriteText versionMapper;
-
-            public BeatmapDetails(BeatmapInfo beatmap)
-            {
-                this.beatmap = beatmap;
-
-                AutoSizeAxes = Axes.Both;
-
-                Children = new Drawable[]
-                {
-                    new FillFlowContainer
-                    {
-                        Direction = FillDirection.Vertical,
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Children = new Drawable[]
-                        {
-                            title = new OsuSpriteText
-                            {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
-                                Shadow = false,
-                                Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 24, italics: true),
-                            },
-                            artist = new OsuSpriteText
-                            {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
-                                Shadow = false,
-                                Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 20, italics: true),
-                            },
-                            versionMapper = new OsuSpriteText
-                            {
-                                Anchor = Anchor.TopCentre,
-                                Origin = Anchor.TopCentre,
-                                Shadow = false,
-                                Font = OsuFont.GetFont(weight: FontWeight.Bold),
-                            },
-                        }
-                    }
-                };
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                title.Colour = artist.Colour = colours.BlueDarker;
-                versionMapper.Colour = colours.Gray8;
-
-                var creator = beatmap.Metadata.Author?.Username;
-
-                if (!string.IsNullOrEmpty(creator))
-                {
-                    versionMapper.Text = $"mapped by {creator}";
-
-                    if (!string.IsNullOrEmpty(beatmap.Version))
-                        versionMapper.Text = $"{beatmap.Version} - " + versionMapper.Text;
-                }
-
-                title.Text = new LocalisedString((beatmap.Metadata.TitleUnicode, beatmap.Metadata.Title));
-                artist.Text = new LocalisedString((beatmap.Metadata.ArtistUnicode, beatmap.Metadata.Artist));
-            }
-        }
-
-        [LongRunningLoad]
-        private class UserHeader : Container
-        {
-            private readonly User user;
-            private readonly Sprite cover;
-
-            public UserHeader(User user)
-            {
-                this.user = user;
-                Children = new Drawable[]
-                {
-                    cover = new Sprite
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        FillMode = FillMode.Fill,
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                    },
-                    new OsuSpriteText
-                    {
-                        Anchor = Anchor.BottomCentre,
-                        Origin = Anchor.BottomCentre,
-                        Text = user.Username,
-                        Font = OsuFont.GetFont(size: 30, weight: FontWeight.Regular, italics: true),
-                        Padding = new MarginPadding { Bottom = 10 },
-                    }
-                };
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(LargeTextureStore textures)
-            {
-                if (!string.IsNullOrEmpty(user.CoverUrl))
-                    cover.Texture = textures.Get(user.CoverUrl);
-            }
-        }
-
-        private class SlowScoreCounter : ScoreCounter
-        {
-            protected override double RollingDuration => 3000;
-
-            protected override Easing RollingEasing => Easing.OutPow10;
-
-            public SlowScoreCounter(uint leading = 0)
-                : base(leading)
-            {
-                DisplayedCountSpriteText.Shadow = false;
-                DisplayedCountSpriteText.Font = DisplayedCountSpriteText.Font.With(Typeface.Venera, weight: FontWeight.Light);
-                UseCommaSeparator = true;
-            }
-        }
-    }
-}
diff --git a/osu.Game/Screens/Ranking/Pages/ReplayDownloadButton.cs b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
similarity index 98%
rename from osu.Game/Screens/Ranking/Pages/ReplayDownloadButton.cs
rename to osu.Game/Screens/Ranking/ReplayDownloadButton.cs
index 62213720aa..a36c86eafc 100644
--- a/osu.Game/Screens/Ranking/Pages/ReplayDownloadButton.cs
+++ b/osu.Game/Screens/Ranking/ReplayDownloadButton.cs
@@ -9,7 +9,7 @@ using osu.Game.Online;
 using osu.Game.Scoring;
 using osuTK;
 
-namespace osu.Game.Screens.Ranking.Pages
+namespace osu.Game.Screens.Ranking
 {
     public class ReplayDownloadButton : DownloadTrackingComposite<ScoreInfo, ScoreManager>
     {
diff --git a/osu.Game/Screens/Ranking/ResultModeButton.cs b/osu.Game/Screens/Ranking/ResultModeButton.cs
deleted file mode 100644
index d7eb5db125..0000000000
--- a/osu.Game/Screens/Ranking/ResultModeButton.cs
+++ /dev/null
@@ -1,97 +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.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Cursor;
-using osu.Framework.Graphics.Effects;
-using osu.Framework.Graphics.UserInterface;
-using osu.Game.Graphics;
-using osuTK;
-using osuTK.Graphics;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.Sprites;
-
-namespace osu.Game.Screens.Ranking
-{
-    public class ResultModeButton : TabItem<IResultPageInfo>, IHasTooltip
-    {
-        private readonly IconUsage icon;
-        private Color4 activeColour;
-        private Color4 inactiveColour;
-        private CircularContainer colouredPart;
-
-        public ResultModeButton(IResultPageInfo mode)
-            : base(mode)
-        {
-            icon = mode.Icon;
-            TooltipText = mode.Name;
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            Size = new Vector2(50);
-
-            Masking = true;
-
-            CornerRadius = 25;
-            CornerExponent = 2;
-
-            activeColour = colours.PinkDarker;
-            inactiveColour = OsuColour.Gray(0.8f);
-
-            EdgeEffect = new EdgeEffectParameters
-            {
-                Colour = Color4.Black.Opacity(0.4f),
-                Type = EdgeEffectType.Shadow,
-                Radius = 5,
-            };
-
-            Children = new Drawable[]
-            {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = Color4.White,
-                },
-                colouredPart = new CircularContainer
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    RelativeSizeAxes = Axes.Both,
-                    Size = new Vector2(0.8f),
-                    BorderThickness = 4,
-                    BorderColour = Color4.White,
-                    Colour = inactiveColour,
-                    Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            AlwaysPresent = true, //for border rendering
-                            RelativeSizeAxes = Axes.Both,
-                            Colour = Color4.Transparent,
-                        },
-                        new SpriteIcon
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Shadow = false,
-                            Colour = OsuColour.Gray(0.95f),
-                            Icon = icon,
-                            Size = new Vector2(20),
-                        }
-                    }
-                }
-            };
-        }
-
-        protected override void OnActivated() => colouredPart.FadeColour(activeColour, 200, Easing.OutQuint);
-
-        protected override void OnDeactivated() => colouredPart.FadeColour(inactiveColour, 200, Easing.OutQuint);
-
-        public string TooltipText { get; }
-    }
-}
diff --git a/osu.Game/Screens/Ranking/ResultModeTabControl.cs b/osu.Game/Screens/Ranking/ResultModeTabControl.cs
deleted file mode 100644
index b0d94a4be6..0000000000
--- a/osu.Game/Screens/Ranking/ResultModeTabControl.cs
+++ /dev/null
@@ -1,30 +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.Graphics;
-using osu.Framework.Graphics.UserInterface;
-using osuTK;
-
-namespace osu.Game.Screens.Ranking
-{
-    public class ResultModeTabControl : TabControl<IResultPageInfo>
-    {
-        public ResultModeTabControl()
-        {
-            TabContainer.Anchor = Anchor.BottomCentre;
-            TabContainer.Origin = Anchor.BottomCentre;
-            TabContainer.Spacing = new Vector2(15);
-
-            TabContainer.Masking = false;
-            TabContainer.Padding = new MarginPadding(5);
-        }
-
-        protected override Dropdown<IResultPageInfo> CreateDropdown() => null;
-
-        protected override TabItem<IResultPageInfo> CreateTabItem(IResultPageInfo value) => new ResultModeButton(value)
-        {
-            Anchor = TabContainer.Anchor,
-            Origin = TabContainer.Origin
-        };
-    }
-}
diff --git a/osu.Game/Screens/Ranking/Results.cs b/osu.Game/Screens/Ranking/Results.cs
deleted file mode 100644
index 05f1872be9..0000000000
--- a/osu.Game/Screens/Ranking/Results.cs
+++ /dev/null
@@ -1,291 +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 System.Collections.Generic;
-using System.Linq;
-using osu.Framework.Allocation;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Effects;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Screens;
-using osu.Game.Graphics.Containers;
-using osu.Game.Screens.Backgrounds;
-using osuTK;
-using osuTK.Graphics;
-using osu.Game.Graphics;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Scoring;
-using osu.Game.Screens.Play;
-
-namespace osu.Game.Screens.Ranking
-{
-    public abstract class Results : OsuScreen
-    {
-        protected const float BACKGROUND_BLUR = 20;
-
-        private Container circleOuterBackground;
-        private Container circleOuter;
-        private Container circleInner;
-
-        private ParallaxContainer backgroundParallax;
-
-        private ResultModeTabControl modeChangeButtons;
-
-        [Resolved(canBeNull: true)]
-        private Player player { get; set; }
-
-        public override bool DisallowExternalBeatmapRulesetChanges => true;
-
-        protected readonly ScoreInfo Score;
-
-        private Container currentPage;
-
-        protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap.Value);
-
-        private const float overscan = 1.3f;
-
-        private const float circle_outer_scale = 0.96f;
-
-        protected Results(ScoreInfo score)
-        {
-            Score = score;
-        }
-
-        private const float transition_time = 800;
-
-        private IEnumerable<Drawable> allCircles => new Drawable[] { circleOuterBackground, circleInner, circleOuter };
-
-        public override void OnEntering(IScreen last)
-        {
-            base.OnEntering(last);
-            ((BackgroundScreenBeatmap)Background).BlurAmount.Value = BACKGROUND_BLUR;
-            Background.ScaleTo(1.1f, transition_time, Easing.OutQuint);
-
-            allCircles.ForEach(c =>
-            {
-                c.FadeOut();
-                c.ScaleTo(0);
-            });
-
-            backgroundParallax.FadeOut();
-            modeChangeButtons.FadeOut();
-            currentPage?.FadeOut();
-
-            circleOuterBackground
-                .FadeIn(transition_time, Easing.OutQuint)
-                .ScaleTo(1, transition_time, Easing.OutQuint);
-
-            using (BeginDelayedSequence(transition_time * 0.25f, true))
-            {
-                circleOuter
-                    .FadeIn(transition_time, Easing.OutQuint)
-                    .ScaleTo(1, transition_time, Easing.OutQuint);
-
-                using (BeginDelayedSequence(transition_time * 0.3f, true))
-                {
-                    backgroundParallax.FadeIn(transition_time, Easing.OutQuint);
-
-                    circleInner
-                        .FadeIn(transition_time, Easing.OutQuint)
-                        .ScaleTo(1, transition_time, Easing.OutQuint);
-
-                    using (BeginDelayedSequence(transition_time * 0.4f, true))
-                    {
-                        modeChangeButtons.FadeIn(transition_time, Easing.OutQuint);
-                        currentPage?.FadeIn(transition_time, Easing.OutQuint);
-                    }
-                }
-            }
-        }
-
-        public override bool OnExiting(IScreen next)
-        {
-            allCircles.ForEach(c => c.ScaleTo(0, transition_time, Easing.OutSine));
-
-            Background.ScaleTo(1f, transition_time / 4, Easing.OutQuint);
-
-            this.FadeOut(transition_time / 4);
-
-            return base.OnExiting(next);
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            InternalChild = new AspectContainer
-            {
-                RelativeSizeAxes = Axes.Y,
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Height = overscan,
-                Children = new Drawable[]
-                {
-                    circleOuterBackground = new CircularContainer
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Masking = true,
-                        Children = new Drawable[]
-                        {
-                            new Box
-                            {
-                                Alpha = 0.2f,
-                                RelativeSizeAxes = Axes.Both,
-                                Colour = Color4.Black,
-                            }
-                        }
-                    },
-                    circleOuter = new CircularContainer
-                    {
-                        Size = new Vector2(circle_outer_scale),
-                        EdgeEffect = new EdgeEffectParameters
-                        {
-                            Colour = Color4.Black.Opacity(0.4f),
-                            Type = EdgeEffectType.Shadow,
-                            Radius = 15,
-                        },
-                        RelativeSizeAxes = Axes.Both,
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Masking = true,
-                        Children = new Drawable[]
-                        {
-                            new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Colour = Color4.White,
-                            },
-                            backgroundParallax = new ParallaxContainer
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                ParallaxAmount = 0.01f,
-                                Anchor = Anchor.Centre,
-                                Origin = Anchor.Centre,
-                                Children = new Drawable[]
-                                {
-                                    new Sprite
-                                    {
-                                        RelativeSizeAxes = Axes.Both,
-                                        Alpha = 0.2f,
-                                        Texture = Beatmap.Value.Background,
-                                        Anchor = Anchor.Centre,
-                                        Origin = Anchor.Centre,
-                                        FillMode = FillMode.Fill
-                                    }
-                                }
-                            },
-                            modeChangeButtons = new ResultModeTabControl
-                            {
-                                Anchor = Anchor.BottomCentre,
-                                Origin = Anchor.BottomCentre,
-                                RelativeSizeAxes = Axes.X,
-                                Height = 50,
-                                Margin = new MarginPadding { Bottom = 110 },
-                            },
-                            new OsuSpriteText
-                            {
-                                Anchor = Anchor.CentreLeft,
-                                Origin = Anchor.BottomCentre,
-                                Text = $"{Score.MaxCombo}x",
-                                RelativePositionAxes = Axes.X,
-                                Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 40),
-                                X = 0.1f,
-                                Colour = colours.BlueDarker,
-                            },
-                            new OsuSpriteText
-                            {
-                                Anchor = Anchor.CentreLeft,
-                                Origin = Anchor.TopCentre,
-                                Text = "max combo",
-                                Font = OsuFont.GetFont(size: 20),
-                                RelativePositionAxes = Axes.X,
-                                X = 0.1f,
-                                Colour = colours.Gray6,
-                            },
-                            new OsuSpriteText
-                            {
-                                Anchor = Anchor.CentreLeft,
-                                Origin = Anchor.BottomCentre,
-                                Text = Score.DisplayAccuracy,
-                                Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 40),
-                                RelativePositionAxes = Axes.X,
-                                X = 0.9f,
-                                Colour = colours.BlueDarker,
-                            },
-                            new OsuSpriteText
-                            {
-                                Anchor = Anchor.CentreLeft,
-                                Origin = Anchor.TopCentre,
-                                Text = "accuracy",
-                                Font = OsuFont.GetFont(size: 20),
-                                RelativePositionAxes = Axes.X,
-                                X = 0.9f,
-                                Colour = colours.Gray6,
-                            },
-                        }
-                    },
-                    circleInner = new CircularContainer
-                    {
-                        Size = new Vector2(0.6f),
-                        EdgeEffect = new EdgeEffectParameters
-                        {
-                            Colour = Color4.Black.Opacity(0.4f),
-                            Type = EdgeEffectType.Shadow,
-                            Radius = 15,
-                        },
-                        RelativeSizeAxes = Axes.Both,
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Masking = true,
-                        Children = new Drawable[]
-                        {
-                            new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Colour = Color4.White,
-                            },
-                        }
-                    }
-                }
-            };
-
-            if (player != null)
-            {
-                AddInternal(new HotkeyRetryOverlay
-                {
-                    Action = () =>
-                    {
-                        if (!this.IsCurrentScreen()) return;
-
-                        player?.Restart();
-                    },
-                });
-            }
-
-            var pages = CreateResultPages();
-
-            foreach (var p in pages)
-                modeChangeButtons.AddItem(p);
-
-            modeChangeButtons.Current.Value = pages.FirstOrDefault();
-
-            modeChangeButtons.Current.BindValueChanged(page =>
-            {
-                currentPage?.FadeOut();
-                currentPage?.Expire();
-
-                currentPage = page.NewValue?.CreatePage();
-
-                if (currentPage != null)
-                    LoadComponentAsync(currentPage, circleInner.Add);
-            }, true);
-        }
-
-        protected abstract IEnumerable<IResultPageInfo> CreateResultPages();
-    }
-}
diff --git a/osu.Game/Screens/Ranking/ResultsPage.cs b/osu.Game/Screens/Ranking/ResultsPage.cs
deleted file mode 100644
index 8776c599dd..0000000000
--- a/osu.Game/Screens/Ranking/ResultsPage.cs
+++ /dev/null
@@ -1,92 +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.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Effects;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Beatmaps;
-using osu.Game.Graphics;
-using osu.Game.Scoring;
-using osuTK;
-using osuTK.Graphics;
-
-namespace osu.Game.Screens.Ranking
-{
-    public abstract class ResultsPage : Container
-    {
-        protected readonly ScoreInfo Score;
-        protected readonly WorkingBeatmap Beatmap;
-        private CircularContainer content;
-        private Box fill;
-
-        protected override Container<Drawable> Content => content;
-
-        protected ResultsPage(ScoreInfo score, WorkingBeatmap beatmap)
-        {
-            Score = score;
-            Beatmap = beatmap;
-            RelativeSizeAxes = Axes.Both;
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-            fill.Delay(400).FadeInFromZero(600);
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            AddRangeInternal(new Drawable[]
-            {
-                fill = new Box
-                {
-                    Alpha = 0,
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = colours.Gray6
-                },
-                new CircularContainer
-                {
-                    EdgeEffect = new EdgeEffectParameters
-                    {
-                        Colour = colours.GrayF.Opacity(0.8f),
-                        Type = EdgeEffectType.Shadow,
-                        Radius = 1,
-                    },
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    BorderThickness = 20,
-                    BorderColour = Color4.White,
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Children = new Drawable[]
-                    {
-                        new Box
-                        {
-                            RelativeSizeAxes = Axes.Both,
-                            Alpha = 0,
-                            AlwaysPresent = true
-                        },
-                    }
-                },
-                content = new CircularContainer
-                {
-                    EdgeEffect = new EdgeEffectParameters
-                    {
-                        Colour = Color4.Black.Opacity(0.2f),
-                        Type = EdgeEffectType.Shadow,
-                        Radius = 15,
-                    },
-                    RelativeSizeAxes = Axes.Both,
-                    Masking = true,
-                    Size = new Vector2(0.88f),
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                }
-            });
-        }
-    }
-}
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
new file mode 100644
index 0000000000..d0e02329fe
--- /dev/null
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -0,0 +1,97 @@
+// 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.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Screens;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Scoring;
+using osu.Game.Screens.Backgrounds;
+using osuTK;
+
+namespace osu.Game.Screens.Ranking
+{
+    public class ResultsScreen : OsuScreen
+    {
+        protected const float BACKGROUND_BLUR = 20;
+
+        public override bool DisallowExternalBeatmapRulesetChanges => true;
+
+        // Temporary for now to stop dual transitions. Should respect the current toolbar mode, but there's no way to do so currently.
+        public override bool HideOverlaysOnEnter => true;
+
+        protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap.Value);
+
+        private readonly ScoreInfo score;
+
+        private Drawable bottomPanel;
+
+        public ResultsScreen(ScoreInfo score)
+        {
+            this.score = score;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            InternalChildren = new[]
+            {
+                new ScorePanel(score)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    State = PanelState.Expanded
+                },
+                bottomPanel = new Container
+                {
+                    Anchor = Anchor.BottomLeft,
+                    Origin = Anchor.BottomLeft,
+                    RelativeSizeAxes = Axes.X,
+                    Height = TwoLayerButton.SIZE_EXTENDED.Y,
+                    Alpha = 0,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Colour = Color4Extensions.FromHex("#333")
+                        },
+                        new FillFlowContainer
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            AutoSizeAxes = Axes.Both,
+                            Spacing = new Vector2(5),
+                            Direction = FillDirection.Horizontal,
+                            Children = new Drawable[]
+                            {
+                                new ReplayDownloadButton(score),
+                                new RetryButton()
+                            }
+                        }
+                    }
+                }
+            };
+        }
+
+        public override void OnEntering(IScreen last)
+        {
+            base.OnEntering(last);
+
+            ((BackgroundScreenBeatmap)Background).BlurAmount.Value = BACKGROUND_BLUR;
+
+            Background.FadeTo(0.5f, 250);
+            bottomPanel.FadeTo(1, 250);
+        }
+
+        public override bool OnExiting(IScreen next)
+        {
+            Background.FadeTo(1, 250);
+
+            return base.OnExiting(next);
+        }
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Pages/RetryButton.cs b/osu.Game/Screens/Ranking/RetryButton.cs
similarity index 97%
rename from osu.Game/Screens/Ranking/Pages/RetryButton.cs
rename to osu.Game/Screens/Ranking/RetryButton.cs
index 06d0440b30..59b69bc949 100644
--- a/osu.Game/Screens/Ranking/Pages/RetryButton.cs
+++ b/osu.Game/Screens/Ranking/RetryButton.cs
@@ -10,7 +10,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Play;
 using osuTK;
 
-namespace osu.Game.Screens.Ranking.Pages
+namespace osu.Game.Screens.Ranking
 {
     public class RetryButton : OsuAnimatedButton
     {
diff --git a/osu.Game/Screens/Ranking/Types/LocalLeaderboardPageInfo.cs b/osu.Game/Screens/Ranking/Types/LocalLeaderboardPageInfo.cs
deleted file mode 100644
index fe183c5f89..0000000000
--- a/osu.Game/Screens/Ranking/Types/LocalLeaderboardPageInfo.cs
+++ /dev/null
@@ -1,28 +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.Graphics.Sprites;
-using osu.Game.Beatmaps;
-using osu.Game.Scoring;
-using osu.Game.Screens.Ranking.Pages;
-
-namespace osu.Game.Screens.Ranking.Types
-{
-    public class LocalLeaderboardPageInfo : IResultPageInfo
-    {
-        private readonly ScoreInfo score;
-        private readonly WorkingBeatmap beatmap;
-
-        public LocalLeaderboardPageInfo(ScoreInfo score, WorkingBeatmap beatmap)
-        {
-            this.score = score;
-            this.beatmap = beatmap;
-        }
-
-        public IconUsage Icon => FontAwesome.Solid.User;
-
-        public string Name => @"Local Leaderboard";
-
-        public ResultsPage CreatePage() => new LocalLeaderboardPage(score, beatmap);
-    }
-}
diff --git a/osu.Game/Screens/Ranking/Types/ScoreOverviewPageInfo.cs b/osu.Game/Screens/Ranking/Types/ScoreOverviewPageInfo.cs
deleted file mode 100644
index 424dbff6f6..0000000000
--- a/osu.Game/Screens/Ranking/Types/ScoreOverviewPageInfo.cs
+++ /dev/null
@@ -1,30 +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.Graphics.Sprites;
-using osu.Game.Beatmaps;
-using osu.Game.Scoring;
-using osu.Game.Screens.Ranking.Pages;
-
-namespace osu.Game.Screens.Ranking.Types
-{
-    public class ScoreOverviewPageInfo : IResultPageInfo
-    {
-        public IconUsage Icon => FontAwesome.Solid.Asterisk;
-
-        public string Name => "Overview";
-        private readonly ScoreInfo score;
-        private readonly WorkingBeatmap beatmap;
-
-        public ScoreOverviewPageInfo(ScoreInfo score, WorkingBeatmap beatmap)
-        {
-            this.score = score;
-            this.beatmap = beatmap;
-        }
-
-        public ResultsPage CreatePage()
-        {
-            return new ScoreResultsPage(score, beatmap);
-        }
-    }
-}
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index af113781e5..9e2f5761dd 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -8,6 +8,7 @@ using osu.Framework.Input.Events;
 using osu.Framework.Screens;
 using osu.Game.Graphics;
 using osu.Game.Screens.Play;
+using osu.Game.Screens.Ranking;
 using osu.Game.Users;
 using osuTK.Input;
 
@@ -31,7 +32,7 @@ namespace osu.Game.Screens.Select
                 Edit();
             }, Key.Number4);
 
-            ((PlayBeatmapDetailArea)BeatmapDetails).Leaderboard.ScoreSelected += score => this.Push(new SoloResults(score));
+            ((PlayBeatmapDetailArea)BeatmapDetails).Leaderboard.ScoreSelected += score => this.Push(new ResultsScreen(score));
         }
 
         protected override BeatmapDetailArea CreateBeatmapDetailArea() => new PlayBeatmapDetailArea();

From 86a336d58537c8c3abbe550ea260a127703f3863 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 17 Mar 2020 17:45:25 +0900
Subject: [PATCH 1122/1142] Add back retry overlay

---
 osu.Game/Screens/Ranking/ResultsScreen.cs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index d0e02329fe..89547fc5dc 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -10,6 +10,7 @@ using osu.Framework.Screens;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Scoring;
 using osu.Game.Screens.Backgrounds;
+using osu.Game.Screens.Play;
 using osuTK;
 
 namespace osu.Game.Screens.Ranking
@@ -25,6 +26,9 @@ namespace osu.Game.Screens.Ranking
 
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenBeatmap(Beatmap.Value);
 
+        [Resolved(CanBeNull = true)]
+        private Player player { get; set; }
+
         private readonly ScoreInfo score;
 
         private Drawable bottomPanel;
@@ -75,6 +79,19 @@ namespace osu.Game.Screens.Ranking
                     }
                 }
             };
+
+            if (player != null)
+            {
+                AddInternal(new HotkeyRetryOverlay
+                {
+                    Action = () =>
+                    {
+                        if (!this.IsCurrentScreen()) return;
+
+                        player?.Restart();
+                    },
+                });
+            }
         }
 
         public override void OnEntering(IScreen last)

From 6f569d148515b6276c51fabd742bffaa6c7b7cd0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 17 Mar 2020 18:01:46 +0900
Subject: [PATCH 1123/1142] Fix colour conflicts for expert-plus

---
 .../Ranking/TestSceneStarRatingDisplay.cs     | 32 +++++++++++++++++++
 .../Ranking/Expanded/StarRatingDisplay.cs     |  8 ++++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
new file mode 100644
index 0000000000..d12f32e470
--- /dev/null
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneStarRatingDisplay.cs
@@ -0,0 +1,32 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
+using osu.Game.Screens.Ranking.Expanded;
+
+namespace osu.Game.Tests.Visual.Ranking
+{
+    public class TestSceneStarRatingDisplay : OsuTestScene
+    {
+        public TestSceneStarRatingDisplay()
+        {
+            Child = new FillFlowContainer
+            {
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Children = new Drawable[]
+                {
+                    new StarRatingDisplay(new BeatmapInfo { StarDifficulty = 1.23 }),
+                    new StarRatingDisplay(new BeatmapInfo { StarDifficulty = 2.34 }),
+                    new StarRatingDisplay(new BeatmapInfo { StarDifficulty = 3.45 }),
+                    new StarRatingDisplay(new BeatmapInfo { StarDifficulty = 4.56 }),
+                    new StarRatingDisplay(new BeatmapInfo { StarDifficulty = 5.67 }),
+                    new StarRatingDisplay(new BeatmapInfo { StarDifficulty = 6.78 }),
+                    new StarRatingDisplay(new BeatmapInfo { StarDifficulty = 10.11 }),
+                }
+            };
+        }
+    }
+}
diff --git a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
index 74b58b9f8c..4b38b298f1 100644
--- a/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
+++ b/osu.Game/Screens/Ranking/Expanded/StarRatingDisplay.cs
@@ -3,7 +3,9 @@
 
 using System.Globalization;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
@@ -40,6 +42,10 @@ namespace osu.Game.Screens.Ranking.Expanded
             string fractionPart = starRatingParts[1];
             string separator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
 
+            ColourInfo backgroundColour = beatmap.DifficultyRating == DifficultyRating.ExpertPlus
+                ? ColourInfo.GradientVertical(Color4Extensions.FromHex("#C1C1C1"), Color4Extensions.FromHex("#595959"))
+                : (ColourInfo)colours.ForDifficultyRating(beatmap.DifficultyRating);
+
             InternalChildren = new Drawable[]
             {
                 new CircularContainer
@@ -51,7 +57,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                         new Box
                         {
                             RelativeSizeAxes = Axes.Both,
-                            Colour = colours.ForDifficultyRating(beatmap.DifficultyRating)
+                            Colour = backgroundColour
                         },
                     }
                 },

From f06c170d63d5d7b69ed2717eac3fb4e08be787ef Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Mar 2020 18:04:15 +0900
Subject: [PATCH 1124/1142] Display SS badge earlier (when entering virtual ss
 area)

---
 osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
index 873c20cc2b..4b6f777283 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
@@ -222,7 +222,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
                     if (badge.Accuracy > score.Accuracy)
                         continue;
 
-                    using (BeginDelayedSequence(inverseEasing(ACCURACY_TRANSFORM_EASING, badge.Accuracy / targetAccuracy) * ACCURACY_TRANSFORM_DURATION, true))
+                    using (BeginDelayedSequence(inverseEasing(ACCURACY_TRANSFORM_EASING, Math.Min(1 - virtual_ss_percentage, badge.Accuracy) / targetAccuracy) * ACCURACY_TRANSFORM_DURATION, true))
                         badge.Appear();
                 }
 

From df119eb95a8177093be99e7c039053aa50cd56ca Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Mar 2020 18:04:32 +0900
Subject: [PATCH 1125/1142] Adjust animations

---
 .../Ranking/Expanded/Accuracy/RankText.cs     | 66 +++++++++++++++++--
 1 file changed, 60 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/Accuracy/RankText.cs b/osu.Game/Screens/Ranking/Expanded/Accuracy/RankText.cs
index b803fe6022..8343716e7e 100644
--- a/osu.Game/Screens/Ranking/Expanded/Accuracy/RankText.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Accuracy/RankText.cs
@@ -4,11 +4,13 @@
 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 osu.Game.Online.Leaderboards;
 using osu.Game.Scoring;
 using osuTK;
+using osuTK.Graphics;
 
 namespace osu.Game.Screens.Ranking.Expanded.Accuracy
 {
@@ -19,7 +21,9 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
     {
         private readonly ScoreRank rank;
 
-        private Drawable flash;
+        private BufferedContainer flash;
+        private BufferedContainer superFlash;
+        private GlowingSpriteText rankText;
 
         public RankText(ScoreRank rank)
         {
@@ -35,17 +39,38 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChildren = new[]
+            InternalChildren = new Drawable[]
             {
-                new GlowingSpriteText
+                rankText = new GlowingSpriteText
                 {
                     Anchor = Anchor.Centre,
                     Origin = Anchor.Centre,
+                    GlowColour = OsuColour.ForRank(rank),
                     Spacing = new Vector2(-15, 0),
                     Text = DrawableRank.GetRankName(rank),
                     Font = OsuFont.Numeric.With(size: 76),
                     UseFullGlyphHeight = false
                 },
+                superFlash = new BufferedContainer
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    BlurSigma = new Vector2(85),
+                    Size = new Vector2(600),
+                    CacheDrawnFrameBuffer = true,
+                    Blending = BlendingParameters.Additive,
+                    Alpha = 0,
+                    Children = new[]
+                    {
+                        new Box
+                        {
+                            Colour = Color4.White,
+                            Size = new Vector2(150),
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                        },
+                    },
+                },
                 flash = new BufferedContainer
                 {
                     Anchor = Anchor.Centre,
@@ -53,8 +78,10 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
                     BlurSigma = new Vector2(35),
                     BypassAutoSizeAxes = Axes.Both,
                     RelativeSizeAxes = Axes.Both,
+                    CacheDrawnFrameBuffer = true,
                     Blending = BlendingParameters.Additive,
-                    Size = new Vector2(2f),
+                    Alpha = 0,
+                    Size = new Vector2(2f), // increase buffer size to allow for scale
                     Scale = new Vector2(1.8f),
                     Children = new[]
                     {
@@ -75,9 +102,36 @@ namespace osu.Game.Screens.Ranking.Expanded.Accuracy
 
         public void Appear()
         {
-            this.FadeIn(0, Easing.In);
+            this.FadeIn();
 
-            flash.FadeIn(0, Easing.In).Then().FadeOut(800, Easing.OutQuint);
+            if (rank < ScoreRank.A)
+            {
+                this
+                    .MoveToOffset(new Vector2(0, -20))
+                    .MoveToOffset(new Vector2(0, 20), 200, Easing.OutBounce);
+
+                if (rank <= ScoreRank.D)
+                {
+                    this.Delay(700)
+                        .RotateTo(5, 150, Easing.In)
+                        .MoveToOffset(new Vector2(0, 3), 150, Easing.In);
+                }
+
+                this.FadeInFromZero(200, Easing.OutQuint);
+                return;
+            }
+
+            flash.Colour = OsuColour.ForRank(rank);
+            flash.FadeIn().Then().FadeOut(1200, Easing.OutQuint);
+
+            if (rank >= ScoreRank.S)
+                rankText.ScaleTo(1.05f).ScaleTo(1, 3000, Easing.OutQuint);
+
+            if (rank >= ScoreRank.X)
+            {
+                flash.FadeIn().Then().FadeOut(3000);
+                superFlash.FadeIn().Then().FadeOut(800, Easing.OutQuint);
+            }
         }
     }
 }

From 370ff70dd441aa1d02d82b872bb339eb468048e5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Mar 2020 18:32:30 +0900
Subject: [PATCH 1126/1142] Fix incorrect host name specification

---
 osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
index c1bd73ef05..c6095ae404 100644
--- a/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
+++ b/osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
@@ -417,7 +417,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Test]
         public async Task TestImportWithDuplicateHashes()
         {
-            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportNestedStructure)))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestImportWithDuplicateHashes)))
             {
                 try
                 {

From 48cbec7a319383a892d1dc12d99c8d33a5748d3e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Mar 2020 22:21:16 +0900
Subject: [PATCH 1127/1142] Add scroll view because

---
 osu.Game/Screens/Ranking/ResultsScreen.cs | 36 ++++++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 89547fc5dc..6f8b5d19df 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Screens;
+using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Scoring;
 using osu.Game.Screens.Backgrounds;
@@ -43,11 +44,14 @@ namespace osu.Game.Screens.Ranking
         {
             InternalChildren = new[]
             {
-                new ScorePanel(score)
+                new ResultsScrollContainer
                 {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    State = PanelState.Expanded
+                    Child = new ScorePanel(score)
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        State = PanelState.Expanded
+                    },
                 },
                 bottomPanel = new Container
                 {
@@ -110,5 +114,29 @@ namespace osu.Game.Screens.Ranking
 
             return base.OnExiting(next);
         }
+
+        private class ResultsScrollContainer : OsuScrollContainer
+        {
+            private readonly Container content;
+
+            protected override Container<Drawable> Content => content;
+
+            public ResultsScrollContainer()
+            {
+                base.Content.Add(content = new Container
+                {
+                    RelativeSizeAxes = Axes.X
+                });
+
+                RelativeSizeAxes = Axes.Both;
+                ScrollbarVisible = false;
+            }
+
+            protected override void Update()
+            {
+                base.Update();
+                content.Height = DrawHeight;
+            }
+        }
     }
 }

From 24b944fc8e4ba12346052376f7d5ff982544f31d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Mar 2020 22:24:28 +0900
Subject: [PATCH 1128/1142] Make footer buttons wider

---
 osu.Game/Screens/Ranking/ResultsScreen.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 6f8b5d19df..0952ba1f70 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -76,8 +76,8 @@ namespace osu.Game.Screens.Ranking
                             Direction = FillDirection.Horizontal,
                             Children = new Drawable[]
                             {
-                                new ReplayDownloadButton(score),
-                                new RetryButton()
+                                new ReplayDownloadButton(score) { Width = 300 },
+                                new RetryButton { Width = 300 },
                             }
                         }
                     }

From 27cc68152d426af6025321414361423437321f91 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Mar 2020 22:54:02 +0900
Subject: [PATCH 1129/1142] Fix potentially missing metadata on local score
 display

---
 .../Expanded/ExpandedPanelMiddleContent.cs        | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 6d5d7e0d95..cc376d7dcc 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -8,6 +8,7 @@ using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Localisation;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
@@ -45,8 +46,16 @@ namespace osu.Game.Screens.Ranking.Expanded
         }
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(BeatmapManager beatmaps)
         {
+            var metadata = score.Beatmap.Metadata;
+
+            if (metadata == null)
+            {
+                var beatmap = beatmaps.QueryBeatmap(b => b.ID == score.BeatmapInfoID);
+                metadata = beatmap.Metadata ?? beatmap.BeatmapSet.Metadata;
+            }
+
             var topStatistics = new List<StatisticDisplay>
             {
                 new AccuracyStatistic(score.Accuracy),
@@ -81,14 +90,14 @@ namespace osu.Game.Screens.Ranking.Expanded
                             {
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
-                                Text = new LocalisedString((score.Beatmap.Metadata.Title, score.Beatmap.Metadata.TitleUnicode)),
+                                Text = new LocalisedString((metadata.Title, metadata.TitleUnicode)),
                                 Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
                             },
                             new OsuSpriteText
                             {
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
-                                Text = new LocalisedString((score.Beatmap.Metadata.Artist, score.Beatmap.Metadata.ArtistUnicode)),
+                                Text = new LocalisedString((metadata.Artist, metadata.ArtistUnicode)),
                                 Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold)
                             },
                             new Container

From dd3a6c5673fc25ede3838a56c03399a5ceeb0dfe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 17 Mar 2020 23:13:31 +0900
Subject: [PATCH 1130/1142] Use working beatmap to retrieve metadata for now

---
 .../Expanded/ExpandedPanelMiddleContent.cs       | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index cc376d7dcc..6b7e4c9cb4 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -46,15 +47,10 @@ namespace osu.Game.Screens.Ranking.Expanded
         }
 
         [BackgroundDependencyLoader]
-        private void load(BeatmapManager beatmaps)
+        private void load(Bindable<WorkingBeatmap> working)
         {
-            var metadata = score.Beatmap.Metadata;
-
-            if (metadata == null)
-            {
-                var beatmap = beatmaps.QueryBeatmap(b => b.ID == score.BeatmapInfoID);
-                metadata = beatmap.Metadata ?? beatmap.BeatmapSet.Metadata;
-            }
+            var beatmap = working.Value.BeatmapInfo;
+            var metadata = beatmap.Metadata;
 
             var topStatistics = new List<StatisticDisplay>
             {
@@ -129,7 +125,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                                 AutoSizeAxes = Axes.Both,
                                 Children = new Drawable[]
                                 {
-                                    new StarRatingDisplay(score.Beatmap)
+                                    new StarRatingDisplay(beatmap)
                                     {
                                         Anchor = Anchor.CentreLeft,
                                         Origin = Anchor.CentreLeft
@@ -157,7 +153,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                                     {
                                         Anchor = Anchor.TopCentre,
                                         Origin = Anchor.TopCentre,
-                                        Text = score.Beatmap.Version,
+                                        Text = beatmap.Version,
                                         Font = OsuFont.Torus.With(size: 16, weight: FontWeight.SemiBold),
                                     },
                                     new OsuTextFlowContainer(s => s.Font = OsuFont.Torus.With(size: 12))

From 592d8cbd1343d4a38c64c0e47fa5b12edf4b4cb8 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Tue, 17 Mar 2020 22:45:28 +0700
Subject: [PATCH 1131/1142] Fix mapper name in score panel

---
 osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 6b7e4c9cb4..837467d648 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -163,7 +163,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                                     }.With(t =>
                                     {
                                         t.AddText("mapped by ");
-                                        t.AddText(score.UserString, s => s.Font = s.Font.With(weight: FontWeight.SemiBold));
+                                        t.AddText(score.Beatmap.Metadata.Author.Username, s => s.Font = s.Font.With(weight: FontWeight.SemiBold));
                                     })
                                 }
                             },

From 99409fb7d1c6596c0aa5d4e8435907b4d92c9b19 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Tue, 17 Mar 2020 23:02:39 +0700
Subject: [PATCH 1132/1142] Fix mapper info alignment in score panel

---
 osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 6b7e4c9cb4..d542a6f033 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -158,6 +158,8 @@ namespace osu.Game.Screens.Ranking.Expanded
                                     },
                                     new OsuTextFlowContainer(s => s.Font = OsuFont.Torus.With(size: 12))
                                     {
+                                        Anchor = Anchor.TopCentre,
+                                        Origin = Anchor.TopCentre,
                                         AutoSizeAxes = Axes.Both,
                                         Direction = FillDirection.Horizontal,
                                     }.With(t =>

From d18b21ba329f5fe7988605791cf6c01a99ab3ead Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Tue, 17 Mar 2020 23:23:51 +0700
Subject: [PATCH 1133/1142] Use local variable for metadata instead

---
 osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 837467d648..f92c8df012 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -163,7 +163,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                                     }.With(t =>
                                     {
                                         t.AddText("mapped by ");
-                                        t.AddText(score.Beatmap.Metadata.Author.Username, s => s.Font = s.Font.With(weight: FontWeight.SemiBold));
+                                        t.AddText(metadata.Author.Username, s => s.Font = s.Font.With(weight: FontWeight.SemiBold));
                                     })
                                 }
                             },

From 431571dfa07c8c1b5cb6a932ecbdcf5874f6a874 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Wed, 18 Mar 2020 00:15:43 +0700
Subject: [PATCH 1134/1142] Check nulls

---
 .../Ranking/Expanded/ExpandedPanelMiddleContent.cs        | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index f92c8df012..eb5da19303 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -51,6 +51,7 @@ namespace osu.Game.Screens.Ranking.Expanded
         {
             var beatmap = working.Value.BeatmapInfo;
             var metadata = beatmap.Metadata;
+            var creator = beatmap.Metadata.Author?.Username;
 
             var topStatistics = new List<StatisticDisplay>
             {
@@ -162,8 +163,11 @@ namespace osu.Game.Screens.Ranking.Expanded
                                         Direction = FillDirection.Horizontal,
                                     }.With(t =>
                                     {
-                                        t.AddText("mapped by ");
-                                        t.AddText(metadata.Author.Username, s => s.Font = s.Font.With(weight: FontWeight.SemiBold));
+                                        if (!string.IsNullOrEmpty(creator))
+                                        {
+                                            t.AddText("mapped by ");
+                                            t.AddText(creator, s => s.Font = s.Font.With(weight: FontWeight.SemiBold));
+                                        }
                                     })
                                 }
                             },

From 139ae2bc1e3c65157ba228b69b459f688a102ae8 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Wed, 18 Mar 2020 01:24:58 +0700
Subject: [PATCH 1135/1142] Use existing variables instead

---
 osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index eb5da19303..82a2bd87ec 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -51,7 +51,7 @@ namespace osu.Game.Screens.Ranking.Expanded
         {
             var beatmap = working.Value.BeatmapInfo;
             var metadata = beatmap.Metadata;
-            var creator = beatmap.Metadata.Author?.Username;
+            var creator = metadata.Author?.Username;
 
             var topStatistics = new List<StatisticDisplay>
             {

From dc73105a106473d4a98c854cdea4cd93eb72e112 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Wed, 18 Mar 2020 01:33:01 +0700
Subject: [PATCH 1136/1142] Add tests for beatmaps with(out) null mappers

---
 .../TestSceneExpandedPanelMiddleContent.cs    | 43 +++++++++++++++++--
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
index 665b3ad455..fb8c438fa4 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
@@ -3,10 +3,13 @@
 
 using System;
 using System.Collections.Generic;
+using NUnit.Framework;
+using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
@@ -23,6 +26,11 @@ namespace osu.Game.Tests.Visual.Ranking
 {
     public class TestSceneExpandedPanelMiddleContent : OsuTestScene
     {
+        [Resolved]
+        private BeatmapManager beatmaps { get; set; }
+
+        private User author;
+
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(ExpandedPanelMiddleContent),
@@ -35,8 +43,37 @@ namespace osu.Game.Tests.Visual.Ranking
             typeof(TotalScoreCounter)
         };
 
-        public TestSceneExpandedPanelMiddleContent()
+        protected override void LoadComplete()
         {
+            base.LoadComplete();
+
+            var beatmapInfo = beatmaps.QueryBeatmap(b => b.RulesetID == 0);
+            if (beatmapInfo != null)
+            {
+                Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmapInfo);
+                author = Beatmap.Value.Metadata.Author;
+            }
+        }
+
+        [Test]
+        public void TestExampleScore()
+        {
+            addScoreStep(createTestScore());
+        }
+
+        [Test]
+        public void TestScoreWithNullAuthor()
+        {
+            AddStep("set author to null", () => {
+                Beatmap.Value.Metadata.Author = null;
+            });
+            addScoreStep(createTestScore());
+            AddStep("set author to not null", () => {
+                Beatmap.Value.Metadata.Author = author;
+            });
+        }
+
+        private void addScoreStep(ScoreInfo score) => AddStep("add panel", () => {
             Child = new Container
             {
                 Anchor = Anchor.Centre,
@@ -49,10 +86,10 @@ namespace osu.Game.Tests.Visual.Ranking
                         RelativeSizeAxes = Axes.Both,
                         Colour = Color4Extensions.FromHex("#444"),
                     },
-                    new ExpandedPanelMiddleContent(createTestScore())
+                    new ExpandedPanelMiddleContent(score)
                 }
             };
-        }
+        });
 
         private ScoreInfo createTestScore() => new ScoreInfo
         {

From 7186e3466bd36dce2e1433bab1f3666ad5d9f6a8 Mon Sep 17 00:00:00 2001
From: recapitalverb <41869184+recapitalverb@users.noreply.github.com>
Date: Wed, 18 Mar 2020 01:39:19 +0700
Subject: [PATCH 1137/1142] Fix formatting issues

---
 .../Ranking/TestSceneExpandedPanelMiddleContent.cs     | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
index fb8c438fa4..7a20ba6fd0 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
@@ -48,6 +48,7 @@ namespace osu.Game.Tests.Visual.Ranking
             base.LoadComplete();
 
             var beatmapInfo = beatmaps.QueryBeatmap(b => b.RulesetID == 0);
+
             if (beatmapInfo != null)
             {
                 Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmapInfo);
@@ -64,16 +65,19 @@ namespace osu.Game.Tests.Visual.Ranking
         [Test]
         public void TestScoreWithNullAuthor()
         {
-            AddStep("set author to null", () => {
+            AddStep("set author to null", () =>
+            {
                 Beatmap.Value.Metadata.Author = null;
             });
             addScoreStep(createTestScore());
-            AddStep("set author to not null", () => {
+            AddStep("set author to not null", () =>
+            {
                 Beatmap.Value.Metadata.Author = author;
             });
         }
 
-        private void addScoreStep(ScoreInfo score) => AddStep("add panel", () => {
+        private void addScoreStep(ScoreInfo score) => AddStep("add panel", () =>
+        {
             Child = new Container
             {
                 Anchor = Anchor.Centre,

From 944f0b0285e51e32f9588d699d1f08c4fbda4f54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 17 Mar 2020 20:45:48 +0100
Subject: [PATCH 1138/1142] Rewrite tests

* Use [Cached] injection instead of modifying beatmaps read from store.
* Add assertion steps verifying the presence of mapper name (or lack
  thereof).
---
 .../TestSceneExpandedPanelMiddleContent.cs    | 91 ++++++++++---------
 1 file changed, 50 insertions(+), 41 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
index 7a20ba6fd0..52d8ea0480 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneExpandedPanelMiddleContent.cs
@@ -3,13 +3,18 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Testing;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
@@ -27,9 +32,7 @@ namespace osu.Game.Tests.Visual.Ranking
     public class TestSceneExpandedPanelMiddleContent : OsuTestScene
     {
         [Resolved]
-        private BeatmapManager beatmaps { get; set; }
-
-        private User author;
+        private RulesetStore rulesetStore { get; set; }
 
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -43,57 +46,37 @@ namespace osu.Game.Tests.Visual.Ranking
             typeof(TotalScoreCounter)
         };
 
-        protected override void LoadComplete()
+        [Test]
+        public void TestMapWithKnownMapper()
         {
-            base.LoadComplete();
+            var author = new User { Username = "mapper_name" };
 
-            var beatmapInfo = beatmaps.QueryBeatmap(b => b.RulesetID == 0);
+            AddStep("show example score", () => showPanel(createTestBeatmap(author), createTestScore()));
 
-            if (beatmapInfo != null)
-            {
-                Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmapInfo);
-                author = Beatmap.Value.Metadata.Author;
-            }
+            AddAssert("mapper name present", () => this.ChildrenOfType<OsuSpriteText>().Any(spriteText => spriteText.Text == "mapper_name"));
         }
 
         [Test]
-        public void TestExampleScore()
+        public void TestMapWithUnknownMapper()
         {
-            addScoreStep(createTestScore());
+            AddStep("show example score", () => showPanel(createTestBeatmap(null), createTestScore()));
+
+            AddAssert("mapped by text not present", () =>
+                this.ChildrenOfType<OsuSpriteText>().All(spriteText => !containsAny(spriteText.Text, "mapped", "by")));
         }
 
-        [Test]
-        public void TestScoreWithNullAuthor()
+        private void showPanel(WorkingBeatmap workingBeatmap, ScoreInfo score)
         {
-            AddStep("set author to null", () =>
-            {
-                Beatmap.Value.Metadata.Author = null;
-            });
-            addScoreStep(createTestScore());
-            AddStep("set author to not null", () =>
-            {
-                Beatmap.Value.Metadata.Author = author;
-            });
+            Child = new ExpandedPanelMiddleContentContainer(workingBeatmap, score);
         }
 
-        private void addScoreStep(ScoreInfo score) => AddStep("add panel", () =>
+        private WorkingBeatmap createTestBeatmap(User author)
         {
-            Child = new Container
-            {
-                Anchor = Anchor.Centre,
-                Origin = Anchor.Centre,
-                Size = new Vector2(500, 700),
-                Children = new Drawable[]
-                {
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = Color4Extensions.FromHex("#444"),
-                    },
-                    new ExpandedPanelMiddleContent(score)
-                }
-            };
-        });
+            var beatmap = new TestBeatmap(rulesetStore.GetRuleset(0));
+            beatmap.Metadata.Author = author;
+
+            return new TestWorkingBeatmap(beatmap);
+        }
 
         private ScoreInfo createTestScore() => new ScoreInfo
         {
@@ -117,5 +100,31 @@ namespace osu.Game.Tests.Visual.Ranking
                 { HitResult.Great, 300 },
             }
         };
+
+        private bool containsAny(string text, params string[] stringsToMatch) => stringsToMatch.Any(text.Contains);
+
+        private class ExpandedPanelMiddleContentContainer : Container
+        {
+            [Cached]
+            private Bindable<WorkingBeatmap> workingBeatmap { get; set; }
+
+            public ExpandedPanelMiddleContentContainer(WorkingBeatmap beatmap, ScoreInfo score)
+            {
+                workingBeatmap = new Bindable<WorkingBeatmap>(beatmap);
+
+                Anchor = Anchor.Centre;
+                Origin = Anchor.Centre;
+                Size = new Vector2(500, 700);
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Colour = Color4Extensions.FromHex("#444"),
+                    },
+                    new ExpandedPanelMiddleContent(score)
+                };
+            }
+        }
     }
 }

From a5c0da392edd913928371f4e2e7ea072518cb80a Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Tue, 17 Mar 2020 18:22:29 -0400
Subject: [PATCH 1139/1142] fix 'good first issue' link in readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 77c7eb9d2d..b44a529f2b 100644
--- a/README.md
+++ b/README.md
@@ -93,7 +93,7 @@ JetBrains ReSharper InspectCode is also used for wider rule sets. You can run it
 
 We welcome all contributions, but keep in mind that we already have a lot of the UI designed. If you wish to work on something with the intention of having it included in the official distribution, please open an issue for discussion and we will give you what you need from a design perspective to proceed. If you want to make *changes* to the design, we recommend you open an issue with your intentions before spending too much time to ensure no effort is wasted.
 
-If you're unsure of what you can help with, check out the [list of open issues](https://github.com/ppy/osu/issues) (especially those with the ["good first issue"](https://github.com/ppy/osu/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3A%22good+first+issue%22) label).
+If you're unsure of what you can help with, check out the [list of open issues](https://github.com/ppy/osu/issues) (especially those with the ["good first issue"](https://github.com/ppy/osu/labels/good-first-issue) label).
 
 Before starting, please make sure you are familiar with the [development and testing](https://github.com/ppy/osu-framework/wiki/Development-and-Testing) procedure we have set up. New component development, and where possible, bug fixing and debugging existing components **should always be done under VisualTests**.
 

From 23e698c8a5d025221dc6fad9d183b2633ef14840 Mon Sep 17 00:00:00 2001
From: Liam DeVoe <orionldevoe@gmail.com>
Date: Tue, 17 Mar 2020 18:26:41 -0400
Subject: [PATCH 1140/1142] sort by most recently updated

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b44a529f2b..59d72247f5 100644
--- a/README.md
+++ b/README.md
@@ -93,7 +93,7 @@ JetBrains ReSharper InspectCode is also used for wider rule sets. You can run it
 
 We welcome all contributions, but keep in mind that we already have a lot of the UI designed. If you wish to work on something with the intention of having it included in the official distribution, please open an issue for discussion and we will give you what you need from a design perspective to proceed. If you want to make *changes* to the design, we recommend you open an issue with your intentions before spending too much time to ensure no effort is wasted.
 
-If you're unsure of what you can help with, check out the [list of open issues](https://github.com/ppy/osu/issues) (especially those with the ["good first issue"](https://github.com/ppy/osu/labels/good-first-issue) label).
+If you're unsure of what you can help with, check out the [list of open issues](https://github.com/ppy/osu/issues) (especially those with the ["good first issue"](https://github.com/ppy/osu/issues?q=is%3Aopen+label%3Agood-first-issue+sort%3Aupdated-desc) label).
 
 Before starting, please make sure you are familiar with the [development and testing](https://github.com/ppy/osu-framework/wiki/Development-and-Testing) procedure we have set up. New component development, and where possible, bug fixing and debugging existing components **should always be done under VisualTests**.
 

From 3c07f73c7b1b559e848419d3af6fc0b047db56ec Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Tue, 17 Mar 2020 17:32:58 -0700
Subject: [PATCH 1141/1142] Fix results' beatmap title and artist language
 setting being swapped

---
 .../Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
index 82a2bd87ec..d64008e6db 100644
--- a/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
+++ b/osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs
@@ -87,14 +87,14 @@ namespace osu.Game.Screens.Ranking.Expanded
                             {
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
-                                Text = new LocalisedString((metadata.Title, metadata.TitleUnicode)),
+                                Text = new LocalisedString((metadata.TitleUnicode, metadata.Title)),
                                 Font = OsuFont.Torus.With(size: 20, weight: FontWeight.SemiBold),
                             },
                             new OsuSpriteText
                             {
                                 Anchor = Anchor.TopCentre,
                                 Origin = Anchor.TopCentre,
-                                Text = new LocalisedString((metadata.Artist, metadata.ArtistUnicode)),
+                                Text = new LocalisedString((metadata.ArtistUnicode, metadata.Artist)),
                                 Font = OsuFont.Torus.With(size: 14, weight: FontWeight.SemiBold)
                             },
                             new Container

From 044707adb7d1f1d17625e46bcfd242f728b3b699 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Mar 2020 12:10:51 +0900
Subject: [PATCH 1142/1142] Update incorrect file path causing error on rider
 solution load

---
 .idea/.idea.osu.Desktop/.idea/modules.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.idea/.idea.osu.Desktop/.idea/modules.xml b/.idea/.idea.osu.Desktop/.idea/modules.xml
index fe63f5faf3..366f172c30 100644
--- a/.idea/.idea.osu.Desktop/.idea/modules.xml
+++ b/.idea/.idea.osu.Desktop/.idea/modules.xml
@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/.idea.osu.Desktop/.idea/.idea.osu.Desktop.iml" filepath="$PROJECT_DIR$/.idea/.idea.osu.Desktop/.idea/.idea.osu.Desktop.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/.idea.osu.Desktop/riderModule.iml" filepath="$PROJECT_DIR$/.idea/.idea.osu.Desktop/riderModule.iml" />
     </modules>
   </component>